diff --git a/erpnext/__init__.py b/erpnext/__init__.py
index ce9731e..686d549 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__ = '12.1.5'
+__version__ = '12.1.6'
 
 def get_default_company(user=None):
 	'''Get default company for user'''
diff --git a/erpnext/accounts/doctype/bank_account/bank_account.js b/erpnext/accounts/doctype/bank_account/bank_account.js
index f22dd81..0598190 100644
--- a/erpnext/accounts/doctype/bank_account/bank_account.js
+++ b/erpnext/accounts/doctype/bank_account/bank_account.js
@@ -20,7 +20,7 @@
 	},
 	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) {
@@ -37,5 +37,9 @@
 				});
 			});
 		}
+	},
+
+	is_company_account: function(frm) {
+		frm.set_df_property('account', 'reqd', frm.doc.is_company_account);
 	}
 });
diff --git a/erpnext/accounts/doctype/bank_account/bank_account.json b/erpnext/accounts/doctype/bank_account/bank_account.json
index 076b320..8e30b85 100644
--- a/erpnext/accounts/doctype/bank_account/bank_account.json
+++ b/erpnext/accounts/doctype/bank_account/bank_account.json
@@ -1,1019 +1,250 @@
 {
-   "allow_copy": 0,
-   "allow_events_in_timeline": 0,
-   "allow_guest_to_view": 0,
-   "allow_import": 1,
-   "allow_rename": 1,
-   "autoname": "",
-   "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": 0,
-     "set_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": "GL 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": "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": "account_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": "Account Type",
-     "length": 0,
-     "no_copy": 0,
-     "options": "Account 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": "account_subtype",
-     "fieldtype": "Link",
-     "hidden": 0,
-     "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 Subtype",
-     "length": 0,
-     "no_copy": 0,
-     "options": "Account Subtype",
-     "permlevel": 0,
-     "precision": "",
-     "print_hide": 0,
-     "print_hide_if_no_value": 0,
-     "read_only": 0,
-     "remember_last_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_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": "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 the Default 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_in_quick_entry": 0,
-     "allow_on_submit": 0,
-     "bold": 0,
-     "collapsible": 0,
-     "columns": 0,
-     "fieldname": "is_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": "Is 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_in_quick_entry": 0,
-     "allow_on_submit": 0,
-     "bold": 0,
-     "collapsible": 0,
-     "columns": 0,
-     "depends_on": "is_company_account",
-     "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": 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_company_account",
-     "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": "Party 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": "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_in_quick_entry": 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_in_quick_entry": 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_in_quick_entry": 0,
-     "allow_on_submit": 0,
-     "bold": 0,
-     "collapsible": 0,
-     "columns": 0,
-     "fieldname": "account_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": "Account 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": "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": 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": "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": "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": "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_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": "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
-    },
-    {
-     "allow_bulk_edit": 0,
-     "allow_in_quick_entry": 0,
-     "allow_on_submit": 0,
-     "bold": 0,
-     "collapsible": 0,
-     "columns": 0,
-     "fieldname": "integration_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": "Integration 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": "integration_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": "Integration ID",
-     "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": 1
-    },
-    {
-     "allow_bulk_edit": 0,
-     "allow_in_quick_entry": 0,
-     "allow_on_submit": 0,
-     "bold": 0,
-     "collapsible": 0,
-     "columns": 0,
-     "description": "Change this date manually to setup the next synchronization start date",
-     "fieldname": "last_integration_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": "Last Integration 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_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_in_quick_entry": 0,
-     "allow_on_submit": 0,
-     "bold": 0,
-     "collapsible": 0,
-     "columns": 0,
-     "fieldname": "mask",
-     "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": "Mask",
-     "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": 0,
-   "max_attachments": 0,
-   "modified": "2019-03-06 17:56:05.103238",
-   "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": 1,
-     "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,
-   "track_views": 0
-  }
\ No newline at end of file
+ "allow_import": 1,
+ "allow_rename": 1,
+ "creation": "2017-05-29 21:35:13.136357",
+ "doctype": "DocType",
+ "document_type": "Setup",
+ "engine": "InnoDB",
+ "field_order": [
+  "account_name",
+  "account",
+  "bank",
+  "account_type",
+  "account_subtype",
+  "column_break_7",
+  "is_default",
+  "is_company_account",
+  "company",
+  "section_break_11",
+  "party_type",
+  "column_break_14",
+  "party",
+  "account_details_section",
+  "iban",
+  "column_break_12",
+  "bank_account_no",
+  "branch_code",
+  "swift_number",
+  "address_and_contact",
+  "address_html",
+  "website",
+  "column_break_13",
+  "contact_html",
+  "integration_details_section",
+  "integration_id",
+  "last_integration_date",
+  "column_break_27",
+  "mask"
+ ],
+ "fields": [
+  {
+   "fieldname": "account_name",
+   "fieldtype": "Data",
+   "in_global_search": 1,
+   "in_list_view": 1,
+   "in_standard_filter": 1,
+   "label": "Account Name",
+   "reqd": 1
+  },
+  {
+   "depends_on": "is_company_account",
+   "fieldname": "account",
+   "fieldtype": "Link",
+   "in_list_view": 1,
+   "label": "Company Account",
+   "options": "Account"
+  },
+  {
+   "fieldname": "bank",
+   "fieldtype": "Link",
+   "label": "Bank",
+   "options": "Bank",
+   "reqd": 1
+  },
+  {
+   "fieldname": "account_type",
+   "fieldtype": "Link",
+   "label": "Account Type",
+   "options": "Account Type"
+  },
+  {
+   "fieldname": "account_subtype",
+   "fieldtype": "Link",
+   "label": "Account Subtype",
+   "options": "Account Subtype"
+  },
+  {
+   "fieldname": "column_break_7",
+   "fieldtype": "Column Break",
+   "search_index": 1
+  },
+  {
+   "default": "0",
+   "fieldname": "is_default",
+   "fieldtype": "Check",
+   "label": "Is the Default Account"
+  },
+  {
+   "default": "0",
+   "fieldname": "is_company_account",
+   "fieldtype": "Check",
+   "label": "Is Company Account"
+  },
+  {
+   "depends_on": "is_company_account",
+   "fieldname": "company",
+   "fieldtype": "Link",
+   "in_list_view": 1,
+   "in_standard_filter": 1,
+   "label": "Company",
+   "options": "Company"
+  },
+  {
+   "depends_on": "eval:!doc.is_company_account",
+   "fieldname": "section_break_11",
+   "fieldtype": "Section Break",
+   "label": "Party Details"
+  },
+  {
+   "fieldname": "party_type",
+   "fieldtype": "Link",
+   "label": "Party Type",
+   "options": "DocType"
+  },
+  {
+   "fieldname": "column_break_14",
+   "fieldtype": "Column Break"
+  },
+  {
+   "fieldname": "party",
+   "fieldtype": "Dynamic Link",
+   "label": "Party",
+   "options": "party_type"
+  },
+  {
+   "fieldname": "account_details_section",
+   "fieldtype": "Section Break",
+   "label": "Account Details"
+  },
+  {
+   "fieldname": "iban",
+   "fieldtype": "Data",
+   "in_list_view": 1,
+   "label": "IBAN",
+   "length": 30
+  },
+  {
+   "fieldname": "column_break_12",
+   "fieldtype": "Column Break"
+  },
+  {
+   "fieldname": "bank_account_no",
+   "fieldtype": "Data",
+   "in_list_view": 1,
+   "label": "Bank Account No",
+   "length": 30
+  },
+  {
+   "fieldname": "branch_code",
+   "fieldtype": "Data",
+   "in_list_view": 1,
+   "label": "Branch Code"
+  },
+  {
+   "fieldname": "swift_number",
+   "fieldtype": "Data",
+   "label": "SWIFT number"
+  },
+  {
+   "fieldname": "address_and_contact",
+   "fieldtype": "Section Break",
+   "label": "Address and Contact",
+   "options": "fa fa-map-marker"
+  },
+  {
+   "fieldname": "address_html",
+   "fieldtype": "HTML",
+   "label": "Address HTML"
+  },
+  {
+   "fieldname": "website",
+   "fieldtype": "Data",
+   "label": "Website"
+  },
+  {
+   "fieldname": "column_break_13",
+   "fieldtype": "Column Break"
+  },
+  {
+   "fieldname": "contact_html",
+   "fieldtype": "HTML",
+   "label": "Contact HTML"
+  },
+  {
+   "fieldname": "integration_details_section",
+   "fieldtype": "Section Break",
+   "label": "Integration Details"
+  },
+  {
+   "fieldname": "integration_id",
+   "fieldtype": "Data",
+   "hidden": 1,
+   "label": "Integration ID",
+   "no_copy": 1,
+   "read_only": 1,
+   "unique": 1
+  },
+  {
+   "description": "Change this date manually to setup the next synchronization start date",
+   "fieldname": "last_integration_date",
+   "fieldtype": "Date",
+   "label": "Last Integration Date"
+  },
+  {
+   "fieldname": "column_break_27",
+   "fieldtype": "Column Break"
+  },
+  {
+   "fieldname": "mask",
+   "fieldtype": "Data",
+   "label": "Mask",
+   "read_only": 1
+  }
+ ],
+ "modified": "2019-10-02 01:34:12.417601",
+ "modified_by": "Administrator",
+ "module": "Accounts",
+ "name": "Bank Account",
+ "owner": "Administrator",
+ "permissions": [
+  {
+   "create": 1,
+   "delete": 1,
+   "email": 1,
+   "export": 1,
+   "import": 1,
+   "print": 1,
+   "read": 1,
+   "report": 1,
+   "role": "Accounts Manager",
+   "share": 1,
+   "write": 1
+  },
+  {
+   "create": 1,
+   "delete": 1,
+   "email": 1,
+   "export": 1,
+   "print": 1,
+   "read": 1,
+   "report": 1,
+   "role": "Accounts User",
+   "share": 1,
+   "write": 1
+  }
+ ],
+ "search_fields": "bank,account",
+ "sort_field": "modified",
+ "sort_order": "DESC",
+ "track_changes": 1
+}
\ No newline at end of file
diff --git a/erpnext/accounts/doctype/payment_entry/payment_entry.py b/erpnext/accounts/doctype/payment_entry/payment_entry.py
index 3529900..789bc8a 100644
--- a/erpnext/accounts/doctype/payment_entry/payment_entry.py
+++ b/erpnext/accounts/doctype/payment_entry/payment_entry.py
@@ -940,6 +940,10 @@
 	bank = get_default_bank_cash_account(doc.company, "Bank", mode_of_payment=doc.get("mode_of_payment"),
 		account=bank_account)
 
+	if not bank:
+		bank = get_default_bank_cash_account(doc.company, "Cash", mode_of_payment=doc.get("mode_of_payment"),
+			account=bank_account)
+
 	paid_amount = received_amount = 0
 	if party_account_currency == bank.account_currency:
 		paid_amount = received_amount = abs(outstanding_amount)
diff --git a/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py b/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py
index bc9c178..4ea9b1c 100644
--- a/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py
+++ b/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py
@@ -880,6 +880,17 @@
 		# calculate totals again after applying TDS
 		self.calculate_taxes_and_totals()
 
+def get_list_context(context=None):
+	from erpnext.controllers.website_list_for_contact import get_list_context
+	list_context = get_list_context(context)
+	list_context.update({
+		'show_sidebar': True,
+		'show_search': True,
+		'no_breadcrumbs': True,
+		'title': _('Purchase Invoices'),
+	})
+	return list_context
+
 @frappe.whitelist()
 def make_debit_note(source_name, target_doc=None):
 	from erpnext.controllers.sales_and_purchase_return import make_return_doc
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 350e081..b90a7a9 100644
--- a/erpnext/accounts/report/accounts_receivable_summary/accounts_receivable_summary.py
+++ b/erpnext/accounts/report/accounts_receivable_summary/accounts_receivable_summary.py
@@ -3,7 +3,7 @@
 
 from __future__ import unicode_literals
 import frappe
-from frappe import _
+from frappe import _, scrub
 from frappe.utils import flt, cint
 from erpnext.accounts.party import get_partywise_advanced_payment_amount
 from erpnext.accounts.report.accounts_receivable.accounts_receivable import ReceivablePayableReport
@@ -40,7 +40,7 @@
 
 			row.party = party
 			if self.party_naming_by == "Naming Series":
-				row.party_name = frappe.get_cached_value(self.party_type, party, [self.party_type + "_name"])
+				row.party_name = frappe.get_cached_value(self.party_type, party, scrub(self.party_type) + "_name")
 
 			row.update(party_dict)
 
diff --git a/erpnext/accounts/report/sales_register/sales_register.py b/erpnext/accounts/report/sales_register/sales_register.py
index 1d13ed1..0e2821a 100644
--- a/erpnext/accounts/report/sales_register/sales_register.py
+++ b/erpnext/accounts/report/sales_register/sales_register.py
@@ -274,4 +274,4 @@
 		for d in inv_mop:
 			mode_of_payments.setdefault(d.parent, []).append(d.mode_of_payment)
 
-	return mode_of_payments
\ No newline at end of file
+	return mode_of_payments
diff --git a/erpnext/utilities/page/__init__.py b/erpnext/assets/report/fixed_asset_register/__init__.py
similarity index 100%
rename from erpnext/utilities/page/__init__.py
rename to erpnext/assets/report/fixed_asset_register/__init__.py
diff --git a/erpnext/assets/report/fixed_asset_register/fixed_asset_register.js b/erpnext/assets/report/fixed_asset_register/fixed_asset_register.js
new file mode 100644
index 0000000..5e994b5
--- /dev/null
+++ b/erpnext/assets/report/fixed_asset_register/fixed_asset_register.js
@@ -0,0 +1,30 @@
+// Copyright (c) 2016, Frappe Technologies Pvt. Ltd. and contributors
+// For license information, please see license.txt
+/* eslint-disable */
+
+frappe.query_reports["Fixed Asset Register"] = {
+	"filters": [
+		{
+			fieldname:"company",
+			label: __("Company"),
+			fieldtype: "Link",
+			options: "Company",
+			default: frappe.defaults.get_user_default("Company"),
+			reqd: 1
+		},
+		{
+			fieldname:"status",
+			label: __("Status"),
+			fieldtype: "Select",
+			options: "In Store\nDisposed",
+			default: 'In Store',
+			reqd: 1
+		},
+		{
+			fieldname:"finance_book",
+			label: __("Finance Book"),
+			fieldtype: "Link",
+			options: "Finance Book"
+		},
+	]
+};
diff --git a/erpnext/assets/report/fixed_asset_register/fixed_asset_register.json b/erpnext/assets/report/fixed_asset_register/fixed_asset_register.json
new file mode 100644
index 0000000..ae2aa54
--- /dev/null
+++ b/erpnext/assets/report/fixed_asset_register/fixed_asset_register.json
@@ -0,0 +1,27 @@
+{
+ "add_total_row": 0,
+ "creation": "2019-09-23 16:35:02.836134",
+ "disable_prepared_report": 0,
+ "disabled": 0,
+ "docstatus": 0,
+ "doctype": "Report",
+ "idx": 0,
+ "is_standard": "Yes",
+ "modified": "2019-09-23 16:35:02.836134",
+ "modified_by": "Administrator",
+ "module": "Assets",
+ "name": "Fixed Asset Register",
+ "owner": "Administrator",
+ "prepared_report": 0,
+ "ref_doctype": "Asset",
+ "report_name": "Fixed Asset Register",
+ "report_type": "Script Report",
+ "roles": [
+  {
+   "role": "Accounts User"
+  },
+  {
+   "role": "Quality Manager"
+  }
+ ]
+}
\ No newline at end of file
diff --git a/erpnext/assets/report/fixed_asset_register/fixed_asset_register.py b/erpnext/assets/report/fixed_asset_register/fixed_asset_register.py
new file mode 100644
index 0000000..eac0e2a
--- /dev/null
+++ b/erpnext/assets/report/fixed_asset_register/fixed_asset_register.py
@@ -0,0 +1,172 @@
+# 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):
+	filters = frappe._dict(filters or {})
+	columns = get_columns(filters)
+	data = get_data(filters)
+	return columns, data
+
+def get_columns(filters):
+	return [
+		{
+			"label": _("Asset Id"),
+			"fieldtype": "Link",
+			"fieldname": "asset_id",
+			"options": "Asset",
+			"width": 100
+		},
+		{
+			"label": _("Asset Name"),
+			"fieldtype": "Data",
+			"fieldname": "asset_name",
+			"width": 140
+		},
+		{
+			"label": _("Asset Category"),
+			"fieldtype": "Link",
+			"fieldname": "asset_category",
+			"options": "Asset Category",
+			"width": 100
+		},
+		{
+			"label": _("Status"),
+			"fieldtype": "Data",
+			"fieldname": "status",
+			"width": 90
+		},
+		{
+			"label": _("Cost Center"),
+			"fieldtype": "Link",
+			"fieldname": "cost_center",
+			"options": "Cost Center",
+			"width": 100
+		},
+		{
+			"label": _("Department"),
+			"fieldtype": "Link",
+			"fieldname": "department",
+			"options": "Department",
+			"width": 100
+		},
+		{
+			"label": _("Location"),
+			"fieldtype": "Link",
+			"fieldname": "location",
+			"options": "Location",
+			"width": 100
+		},
+		{
+			"label": _("Purchase Date"),
+			"fieldtype": "Date",
+			"fieldname": "purchase_date",
+			"width": 90
+		},
+		{
+			"label": _("Gross Purchase Amount"),
+			"fieldname": "gross_purchase_amount",
+			"options": "Currency",
+			"width": 90
+		},
+		{
+			"label": _("Vendor Name"),
+			"fieldtype": "Data",
+			"fieldname": "vendor_name",
+			"width": 100
+		},
+		{
+			"label": _("Available For Use Date"),
+			"fieldtype": "Date",
+			"fieldname": "available_for_use_date",
+			"width": 90
+		},
+		{
+			"label": _("Current Value"),
+			"fieldname": "current_value",
+			"options": "Currency",
+			"width": 90
+		},
+	]
+
+def get_conditions(filters):
+	conditions = {'docstatus': 1}
+	status = filters.status
+
+	if filters.company:
+		conditions["company"] = filters.company
+
+	# In Store assets are those that are not sold or scrapped
+	operand = 'not in'
+	if status not in 'In Store':
+		operand = 'in'
+
+	conditions['status'] = (operand, ['Sold', 'Scrapped'])
+
+	return conditions
+
+def get_data(filters):
+
+	data = []
+
+	conditions = get_conditions(filters)
+	current_value_map = get_finance_book_value_map(filters.finance_book)
+	pr_supplier_map = get_purchase_receipt_supplier_map()
+	pi_supplier_map = get_purchase_invoice_supplier_map()
+
+	assets_record = frappe.db.get_all("Asset",
+		filters=conditions,
+		fields=["name", "asset_name", "department", "cost_center", "purchase_receipt",
+			"asset_category", "purchase_date", "gross_purchase_amount", "location",
+			"available_for_use_date", "status", "purchase_invoice"])
+
+	for asset in assets_record:
+		if current_value_map.get(asset.name) is not None:
+			row = {
+				"asset_id": asset.name,
+				"asset_name": asset.asset_name,
+				"status": asset.status,
+				"department": asset.department,
+				"cost_center": asset.cost_center,
+				"vendor_name": pr_supplier_map.get(asset.purchase_receipt) or pi_supplier_map.get(asset.purchase_invoice),
+				"gross_purchase_amount": asset.gross_purchase_amount,
+				"available_for_use_date": asset.available_for_use_date,
+				"location": asset.location,
+				"asset_category": asset.asset_category,
+				"purchase_date": asset.purchase_date,
+				"current_value": current_value_map.get(asset.name)
+			}
+			data.append(row)
+
+	return data
+
+def get_finance_book_value_map(finance_book=''):
+	return frappe._dict(frappe.db.sql(''' Select
+		parent, value_after_depreciation
+		FROM `tabAsset Finance Book`
+		WHERE
+			parentfield='finance_books'
+			AND finance_book=%s''', (finance_book)))
+
+def get_purchase_receipt_supplier_map():
+	return frappe._dict(frappe.db.sql(''' Select
+		pr.name, pr.supplier
+		FROM `tabPurchase Receipt` pr, `tabPurchase Receipt Item` pri 
+		WHERE
+			pri.parent = pr.name
+			AND pri.is_fixed_asset=1
+			AND pr.docstatus=1
+			AND pr.is_return=0'''))
+
+def get_purchase_invoice_supplier_map():
+	return frappe._dict(frappe.db.sql(''' Select
+		pi.name, pi.supplier
+		FROM `tabPurchase Invoice` pi, `tabPurchase Invoice Item` pii 
+		WHERE
+			pii.parent = pi.name
+			AND pii.is_fixed_asset=1
+			AND pi.docstatus=1
+			AND pi.is_return=0'''))
diff --git a/erpnext/buying/doctype/purchase_order/purchase_order.py b/erpnext/buying/doctype/purchase_order/purchase_order.py
index e3e2f1e..845ff74 100644
--- a/erpnext/buying/doctype/purchase_order/purchase_order.py
+++ b/erpnext/buying/doctype/purchase_order/purchase_order.py
@@ -386,7 +386,21 @@
 
 @frappe.whitelist()
 def make_purchase_invoice(source_name, target_doc=None):
+	return get_mapped_purchase_invoice(source_name, target_doc)
+
+@frappe.whitelist()
+def make_purchase_invoice_from_portal(purchase_order_name):
+	doc = get_mapped_purchase_invoice(purchase_order_name, ignore_permissions=True)
+	if doc.contact_email != frappe.session.user:
+		frappe.throw(_('Not Permitted'), frappe.PermissionError)
+	doc.save()
+	frappe.db.commit()
+	frappe.response['type'] = 'redirect'
+	frappe.response.location = '/purchase-invoices/' + doc.name
+
+def get_mapped_purchase_invoice(source_name, target_doc=None, ignore_permissions=False):
 	def postprocess(source, target):
+		target.flags.ignore_permissions = ignore_permissions
 		set_missing_values(source, target)
 		#Get the advance paid Journal Entries in Purchase Invoice Advance
 
@@ -437,7 +451,8 @@
 			"add_if_empty": True
 		}
 
-	doc = get_mapped_doc("Purchase Order", source_name,	fields, target_doc, postprocess)
+	doc = get_mapped_doc("Purchase Order", source_name,	fields,
+		target_doc, postprocess, ignore_permissions=ignore_permissions)
 
 	return doc
 
@@ -501,6 +516,17 @@
 
 	return item_details
 
+def get_list_context(context=None):
+	from erpnext.controllers.website_list_for_contact import get_list_context
+	list_context = get_list_context(context)
+	list_context.update({
+		'show_sidebar': True,
+		'show_search': True,
+		'no_breadcrumbs': True,
+		'title': _('Purchase Orders'),
+	})
+	return list_context
+
 @frappe.whitelist()
 def update_status(status, name):
 	po = frappe.get_doc("Purchase Order", name)
diff --git a/erpnext/controllers/trends.py b/erpnext/controllers/trends.py
index da44325..092baa4 100644
--- a/erpnext/controllers/trends.py
+++ b/erpnext/controllers/trends.py
@@ -140,6 +140,8 @@
 
 	if trans in ['Purchase Receipt', 'Delivery Note', 'Purchase Invoice', 'Sales Invoice']:
 		trans_date = 'posting_date'
+		if filters.period_based_on:
+			trans_date = filters.period_based_on
 	else:
 		trans_date = 'transaction_date'
 
diff --git a/erpnext/controllers/website_list_for_contact.py b/erpnext/controllers/website_list_for_contact.py
index 0738fd5..ed37938 100644
--- a/erpnext/controllers/website_list_for_contact.py
+++ b/erpnext/controllers/website_list_for_contact.py
@@ -25,7 +25,7 @@
 
 	if not filters: filters = []
 
-	if doctype == 'Supplier Quotation':
+	if doctype in ['Supplier Quotation', 'Purchase Invoice']:
 		filters.append((doctype, 'docstatus', '<', 2))
 	else:
 		filters.append((doctype, 'docstatus', '=', 1))
@@ -175,4 +175,4 @@
 	if doctype == 'Quotation':
 		return 'party_name'
 	else:
-		return 'customer'
\ No newline at end of file
+		return 'customer'
diff --git a/erpnext/crm/doctype/contract/contract.json b/erpnext/crm/doctype/contract/contract.json
index d48cc37..e04ad30 100755
--- a/erpnext/crm/doctype/contract/contract.json
+++ b/erpnext/crm/doctype/contract/contract.json
@@ -1,1034 +1,301 @@
 {
- "allow_copy": 0, 
- "allow_guest_to_view": 0, 
- "allow_import": 1, 
- "allow_rename": 1, 
- "autoname": "", 
- "beta": 0, 
- "creation": "2018-04-12 06:32:04.582486", 
- "custom": 0, 
- "docstatus": 0, 
- "doctype": "DocType", 
- "document_type": "", 
- "editable_grid": 1, 
- "engine": "InnoDB", 
+ "allow_import": 1,
+ "allow_rename": 1,
+ "creation": "2018-04-12 06:32:04.582486",
+ "doctype": "DocType",
+ "editable_grid": 1,
+ "engine": "InnoDB",
+ "field_order": [
+  "party_type",
+  "is_signed",
+  "cb_party",
+  "party_name",
+  "party_user",
+  "status",
+  "fulfilment_status",
+  "sb_terms",
+  "start_date",
+  "cb_date",
+  "end_date",
+  "sb_signee",
+  "signee",
+  "signed_on",
+  "cb_user",
+  "ip_address",
+  "sb_contract",
+  "contract_template",
+  "contract_terms",
+  "sb_fulfilment",
+  "requires_fulfilment",
+  "fulfilment_deadline",
+  "fulfilment_terms",
+  "sb_references",
+  "document_type",
+  "cb_links",
+  "document_name",
+  "amended_from"
+ ],
  "fields": [
   {
-   "allow_bulk_edit": 0, 
-   "allow_in_quick_entry": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "default": "Customer", 
-   "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\nEmployee", 
-   "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
-  }, 
+   "default": "Customer",
+   "fieldname": "party_type",
+   "fieldtype": "Select",
+   "label": "Party Type",
+   "options": "Customer\nSupplier\nEmployee",
+   "reqd": 1
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_in_quick_entry": 0, 
-   "allow_on_submit": 1, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "is_signed", 
-   "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": "Signed", 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_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": 1,
+   "default": "0",
+   "fieldname": "is_signed",
+   "fieldtype": "Check",
+   "label": "Signed",
+   "no_copy": 1
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_in_quick_entry": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "cb_party", 
-   "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
-  }, 
+   "fieldname": "cb_party",
+   "fieldtype": "Column Break"
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_in_quick_entry": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "party_name", 
-   "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": 1, 
-   "label": "Party Name", 
-   "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": 1, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "translatable": 0, 
-   "unique": 0
-  }, 
+   "fieldname": "party_name",
+   "fieldtype": "Dynamic Link",
+   "in_standard_filter": 1,
+   "label": "Party Name",
+   "options": "party_type",
+   "reqd": 1
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_in_quick_entry": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "depends_on": "", 
-   "fieldname": "party_user", 
-   "fieldtype": "Link", 
-   "hidden": 0, 
-   "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 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
-  }, 
+   "fieldname": "party_user",
+   "fieldtype": "Link",
+   "label": "Party User",
+   "options": "User"
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_in_quick_entry": 0, 
-   "allow_on_submit": 1, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "status", 
-   "fieldtype": "Select", 
-   "hidden": 1, 
-   "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": "Unsigned\nActive\nInactive", 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_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": 1,
+   "fieldname": "status",
+   "fieldtype": "Select",
+   "hidden": 1,
+   "in_list_view": 1,
+   "in_standard_filter": 1,
+   "label": "Status",
+   "no_copy": 1,
+   "options": "Unsigned\nActive\nInactive"
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_in_quick_entry": 0, 
-   "allow_on_submit": 1, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "fulfilment_status", 
-   "fieldtype": "Select", 
-   "hidden": 1, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 1, 
-   "in_standard_filter": 1, 
-   "label": "Fulfilment Status", 
-   "length": 0, 
-   "no_copy": 0, 
-   "options": "N/A\nUnfulfilled\nPartially Fulfilled\nFulfilled\nLapsed", 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_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": 1,
+   "fieldname": "fulfilment_status",
+   "fieldtype": "Select",
+   "hidden": 1,
+   "in_list_view": 1,
+   "in_standard_filter": 1,
+   "label": "Fulfilment Status",
+   "no_copy": 1,
+   "options": "N/A\nUnfulfilled\nPartially Fulfilled\nFulfilled\nLapsed"
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_in_quick_entry": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "sb_terms", 
-   "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": "Contract Period", 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "translatable": 0, 
-   "unique": 0
-  }, 
+   "fieldname": "sb_terms",
+   "fieldtype": "Section Break",
+   "label": "Contract Period"
+  },
   {
-   "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": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "translatable": 0, 
-   "unique": 0
-  }, 
+   "fieldname": "start_date",
+   "fieldtype": "Date",
+   "label": "Start Date"
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_in_quick_entry": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "cb_date", 
-   "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
-  }, 
+   "fieldname": "cb_date",
+   "fieldtype": "Column Break"
+  },
   {
-   "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": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "translatable": 0, 
-   "unique": 0
-  }, 
+   "fieldname": "end_date",
+   "fieldtype": "Date",
+   "label": "End Date"
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_in_quick_entry": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "collapsible_depends_on": "", 
-   "columns": 0, 
-   "depends_on": "eval:doc.is_signed==1", 
-   "fieldname": "sb_signee", 
-   "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": "Signee 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
-  }, 
+   "depends_on": "eval:doc.is_signed==1",
+   "fieldname": "sb_signee",
+   "fieldtype": "Section Break",
+   "label": "Signee Details"
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_in_quick_entry": 0, 
-   "allow_on_submit": 1, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "depends_on": "", 
-   "fieldname": "signee", 
-   "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": "Signee", 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_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": 1,
+   "fieldname": "signee",
+   "fieldtype": "Data",
+   "in_global_search": 1,
+   "label": "Signee",
+   "no_copy": 1
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_in_quick_entry": 0, 
-   "allow_on_submit": 1, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "depends_on": "", 
-   "fieldname": "signed_on", 
-   "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": "Signed On", 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_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": 1,
+   "fieldname": "signed_on",
+   "fieldtype": "Datetime",
+   "in_list_view": 1,
+   "label": "Signed On",
+   "no_copy": 1
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_in_quick_entry": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "cb_user", 
-   "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
-  }, 
+   "fieldname": "cb_user",
+   "fieldtype": "Column Break"
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_in_quick_entry": 0, 
-   "allow_on_submit": 1, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "depends_on": "", 
-   "fieldname": "ip_address", 
-   "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": "IP Address", 
-   "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_on_submit": 1,
+   "fieldname": "ip_address",
+   "fieldtype": "Data",
+   "label": "IP Address",
+   "no_copy": 1,
+   "read_only": 1
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_in_quick_entry": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 1, 
-   "collapsible_depends_on": "eval:doc.docstatus==0", 
-   "columns": 0, 
-   "fieldname": "sb_contract", 
-   "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": "Contract 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
-  }, 
+   "collapsible": 1,
+   "collapsible_depends_on": "eval:doc.docstatus==0",
+   "fieldname": "sb_contract",
+   "fieldtype": "Section Break",
+   "label": "Contract Details"
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_in_quick_entry": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "contract_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": "Contract Template", 
-   "length": 0, 
-   "no_copy": 0, 
-   "options": "Contract 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
-  }, 
+   "fieldname": "contract_template",
+   "fieldtype": "Link",
+   "label": "Contract Template",
+   "options": "Contract Template"
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_in_quick_entry": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "contract_terms", 
-   "fieldtype": "Text Editor", 
-   "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": "Contract Terms", 
-   "length": 0, 
-   "no_copy": 0, 
-   "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
-  }, 
+   "fieldname": "contract_terms",
+   "fieldtype": "Text Editor",
+   "in_list_view": 1,
+   "label": "Contract Terms",
+   "reqd": 1
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_in_quick_entry": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "sb_fulfilment", 
-   "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": "Fulfilment 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
-  }, 
+   "fieldname": "sb_fulfilment",
+   "fieldtype": "Section Break",
+   "label": "Fulfilment Details"
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_in_quick_entry": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "requires_fulfilment", 
-   "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": "Requires Fulfilment", 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "translatable": 0, 
-   "unique": 0
-  }, 
+   "default": "0",
+   "fieldname": "requires_fulfilment",
+   "fieldtype": "Check",
+   "label": "Requires Fulfilment"
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_in_quick_entry": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "depends_on": "eval:doc.requires_fulfilment==1", 
-   "fieldname": "fulfilment_deadline", 
-   "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": "Fulfilment Deadline", 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "translatable": 0, 
-   "unique": 0
-  }, 
+   "depends_on": "eval:doc.requires_fulfilment==1",
+   "fieldname": "fulfilment_deadline",
+   "fieldtype": "Date",
+   "label": "Fulfilment Deadline"
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_in_quick_entry": 0, 
-   "allow_on_submit": 1, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "depends_on": "eval:doc.requires_fulfilment==1", 
-   "fieldname": "fulfilment_terms", 
-   "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": "Fulfilment Terms", 
-   "length": 0, 
-   "no_copy": 0, 
-   "options": "Contract Fulfilment Checklist", 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_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": 1,
+   "depends_on": "eval:doc.requires_fulfilment==1",
+   "fieldname": "fulfilment_terms",
+   "fieldtype": "Table",
+   "label": "Fulfilment Terms",
+   "options": "Contract Fulfilment Checklist"
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_in_quick_entry": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 1, 
-   "columns": 0, 
-   "fieldname": "sb_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
-  }, 
+   "collapsible": 1,
+   "fieldname": "sb_references",
+   "fieldtype": "Section Break",
+   "label": "References"
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_in_quick_entry": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "default": "", 
-   "depends_on": "", 
-   "fieldname": "document_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": "Document Type", 
-   "length": 0, 
-   "no_copy": 0, 
-   "options": "\nQuotation\nProject\nSales Order\nPurchase Order\nSales Invoice\nPurchase Invoice", 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "translatable": 0, 
-   "unique": 0
-  }, 
+   "fieldname": "document_type",
+   "fieldtype": "Select",
+   "label": "Document Type",
+   "options": "\nQuotation\nProject\nSales Order\nPurchase Order\nSales Invoice\nPurchase Invoice"
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_in_quick_entry": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "cb_links", 
-   "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
-  }, 
+   "fieldname": "cb_links",
+   "fieldtype": "Column Break"
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_in_quick_entry": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "depends_on": "", 
-   "fieldname": "document_name", 
-   "fieldtype": "Dynamic Link", 
-   "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": "Document Name", 
-   "length": 0, 
-   "no_copy": 0, 
-   "options": "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
-  }, 
+   "fieldname": "document_name",
+   "fieldtype": "Dynamic Link",
+   "in_global_search": 1,
+   "in_list_view": 1,
+   "in_standard_filter": 1,
+   "label": "Document Name",
+   "options": "document_type"
+  },
   {
-   "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": "Contract", 
-   "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
+   "fieldname": "amended_from",
+   "fieldtype": "Link",
+   "label": "Amended From",
+   "no_copy": 1,
+   "options": "Contract",
+   "print_hide": 1,
+   "read_only": 1
   }
- ], 
- "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-06-14 12:47:10.142988", 
- "modified_by": "Administrator", 
- "module": "CRM", 
- "name": "Contract", 
- "name_case": "", 
- "owner": "Administrator", 
+ ],
+ "is_submittable": 1,
+ "modified": "2019-09-30 00:56:41.559681",
+ "modified_by": "Administrator",
+ "module": "CRM",
+ "name": "Contract",
+ "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": "Sales Manager", 
-   "set_user_permissions": 0, 
-   "share": 1, 
-   "submit": 1, 
+   "amend": 1,
+   "cancel": 1,
+   "create": 1,
+   "delete": 1,
+   "email": 1,
+   "export": 1,
+   "print": 1,
+   "read": 1,
+   "report": 1,
+   "role": "Sales Manager",
+   "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": "Purchase Manager", 
-   "set_user_permissions": 0, 
-   "share": 1, 
-   "submit": 1, 
+   "amend": 1,
+   "cancel": 1,
+   "create": 1,
+   "delete": 1,
+   "email": 1,
+   "export": 1,
+   "print": 1,
+   "read": 1,
+   "report": 1,
+   "role": "Purchase Manager",
+   "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, 
+   "amend": 1,
+   "cancel": 1,
+   "create": 1,
+   "delete": 1,
+   "email": 1,
+   "export": 1,
+   "print": 1,
+   "read": 1,
+   "report": 1,
+   "role": "HR Manager",
+   "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": "System Manager", 
-   "set_user_permissions": 0, 
-   "share": 1, 
-   "submit": 1, 
+   "amend": 1,
+   "cancel": 1,
+   "create": 1,
+   "delete": 1,
+   "email": 1,
+   "export": 1,
+   "print": 1,
+   "read": 1,
+   "report": 1,
+   "role": "System Manager",
+   "share": 1,
+   "submit": 1,
    "write": 1
   }
- ], 
- "quick_entry": 0, 
- "read_only": 0, 
- "read_only_onload": 0, 
- "show_name_in_global_search": 1, 
- "sort_field": "modified", 
- "sort_order": "DESC", 
- "title_field": "", 
- "track_changes": 1, 
+ ],
+ "show_name_in_global_search": 1,
+ "sort_field": "modified",
+ "sort_order": "DESC",
+ "track_changes": 1,
  "track_seen": 1
 }
\ No newline at end of file
diff --git a/erpnext/crm/doctype/opportunity/opportunity.json b/erpnext/crm/doctype/opportunity/opportunity.json
index 37f492e..66e3ca4 100644
--- a/erpnext/crm/doctype/opportunity/opportunity.json
+++ b/erpnext/crm/doctype/opportunity/opportunity.json
@@ -1,5 +1,6 @@
 {
  "allow_import": 1,
+ "allow_rename": 1,
  "autoname": "naming_series:",
  "creation": "2013-03-07 18:50:30",
  "description": "Potential Sales Deal",
@@ -411,7 +412,7 @@
  ],
  "icon": "fa fa-info-sign",
  "idx": 195,
- "modified": "2019-09-12 09:37:30.127901",
+ "modified": "2019-09-30 12:58:37.385400",
  "modified_by": "Administrator",
  "module": "CRM",
  "name": "Opportunity",
diff --git a/erpnext/crm/doctype/utils.py b/erpnext/crm/doctype/utils.py
index 535458a..885ef05 100644
--- a/erpnext/crm/doctype/utils.py
+++ b/erpnext/crm/doctype/utils.py
@@ -17,7 +17,7 @@
 			if link.link_doctype == 'Customer':
 				last_issue = get_last_issue_from_customer(link.link_name)
 			query_condition += "(`reference_doctype`=%s AND `reference_name`=%s) OR"
-			values += [link_link_doctype, link_link_name]
+			values += [link.link_doctype, link.link_name]
 
 		if query_condition:
 			# remove extra appended 'OR'
diff --git a/erpnext/crm/report/lead_conversion_time/lead_conversion_time.py b/erpnext/crm/report/lead_conversion_time/lead_conversion_time.py
index d91b9c5..e66bc1e 100644
--- a/erpnext/crm/report/lead_conversion_time/lead_conversion_time.py
+++ b/erpnext/crm/report/lead_conversion_time/lead_conversion_time.py
@@ -67,7 +67,7 @@
 	communication_count = None
 	communication_list = []
 	opportunities = frappe.db.get_values('Opportunity', {'opportunity_from': 'Lead'},\
-		['name', 'customer_name', 'lead', 'contact_email'], as_dict=1)
+		['name', 'customer_name', 'contact_email'], as_dict=1)
 
 	for d in opportunities:
 		invoice = frappe.db.sql('''
diff --git a/erpnext/erpnext_integrations/connectors/shopify_connection.py b/erpnext/erpnext_integrations/connectors/shopify_connection.py
index 1d6e891..bd98037 100644
--- a/erpnext/erpnext_integrations/connectors/shopify_connection.py
+++ b/erpnext/erpnext_integrations/connectors/shopify_connection.py
@@ -19,6 +19,7 @@
 	dump_request_data(order, event)
 
 def sync_sales_order(order, request_id=None):
+	frappe.set_user('Administrator')
 	shopify_settings = frappe.get_doc("Shopify Settings")
 	frappe.flags.request_id = request_id
 
@@ -33,6 +34,7 @@
 			make_shopify_log(status="Success")
 
 def prepare_sales_invoice(order, request_id=None):
+	frappe.set_user('Administrator')
 	shopify_settings = frappe.get_doc("Shopify Settings")
 	frappe.flags.request_id = request_id
 
@@ -45,6 +47,7 @@
 		make_shopify_log(status="Error", exception=True)
 
 def prepare_delivery_note(order, request_id=None):
+	frappe.set_user('Administrator')
 	shopify_settings = frappe.get_doc("Shopify Settings")
 	frappe.flags.request_id = request_id
 
@@ -137,6 +140,7 @@
 		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.insert(ignore_mandatory=True)
 		si.submit()
 		make_payament_entry_against_sales_invoice(si, shopify_settings)
 		frappe.db.commit()
@@ -151,6 +155,7 @@
 	payemnt_entry.flags.ignore_mandatory = True
 	payemnt_entry.reference_no = doc.name
 	payemnt_entry.reference_date = nowdate()
+	payemnt_entry.insert(ignore_permissions=True)
 	payemnt_entry.submit()
 
 def create_delivery_note(shopify_order, shopify_settings, so):
@@ -168,6 +173,7 @@
 			dn.items = get_fulfillment_items(dn.items, fulfillment.get("line_items"), shopify_settings)
 			dn.flags.ignore_mandatory = True
 			dn.save()
+			dn.submit()
 			frappe.db.commit()
 
 def get_fulfillment_items(dn_items, fulfillment_items, shopify_settings):
@@ -200,7 +206,7 @@
 				"rate": shopify_item.get("price"),
 				"delivery_date": nowdate(),
 				"qty": shopify_item.get("quantity"),
-				"stock_uom": shopify_item.get("sku"),
+				"stock_uom": shopify_item.get("uom") or _("Nos"),
 				"warehouse": shopify_settings.warehouse
 			})
 		else:
diff --git a/erpnext/erpnext_integrations/doctype/amazon_mws_settings/amazon_methods.py b/erpnext/erpnext_integrations/doctype/amazon_mws_settings/amazon_methods.py
index b9be9c0..2f39dc5 100644
--- a/erpnext/erpnext_integrations/doctype/amazon_mws_settings/amazon_methods.py
+++ b/erpnext/erpnext_integrations/doctype/amazon_mws_settings/amazon_methods.py
@@ -4,10 +4,7 @@
 
 from __future__ import unicode_literals
 import frappe, time, dateutil, math, csv
-try:
-    from StringIO import StringIO
-except ImportError:
-    from io import StringIO
+from six import StringIO
 import erpnext.erpnext_integrations.doctype.amazon_mws_settings.amazon_mws_api as mws
 from frappe import _
 
@@ -26,7 +23,7 @@
 			listings_response = reports.get_report(report_id=report_id)
 
 			#Get ASIN Codes
-			string_io = StringIO(listings_response.original)
+			string_io = StringIO(frappe.safe_decode(listings_response.original))
 			csv_rows = list(csv.reader(string_io, delimiter=str('\t')))
 			asin_list = list(set([row[1] for row in csv_rows[1:]]))
 			#break into chunks of 10
@@ -294,7 +291,8 @@
 			so.submit()
 
 		except Exception as e:
-			frappe.log_error(message=e, title="Create Sales Order")
+			import traceback
+			frappe.log_error(message=traceback.format_exc(), title="Create Sales Order")
 
 def create_customer(order_json):
 	order_customer_name = ""
@@ -451,7 +449,7 @@
 			shipment_item_list = return_as_list(shipment_event.ShipmentEvent.ShipmentItemList.ShipmentItem)
 
 			for shipment_item in shipment_item_list:
-				charges, fees = []
+				charges, fees = [], []
 
 				if 'ItemChargeList' in shipment_item.keys():
 					charges = return_as_list(shipment_item.ItemChargeList.ChargeComponent)
diff --git a/erpnext/erpnext_integrations/doctype/amazon_mws_settings/amazon_mws_api.py b/erpnext/erpnext_integrations/doctype/amazon_mws_settings/amazon_mws_api.py
index 68c2b9c..9925dc4 100755
--- a/erpnext/erpnext_integrations/doctype/amazon_mws_settings/amazon_mws_api.py
+++ b/erpnext/erpnext_integrations/doctype/amazon_mws_settings/amazon_mws_api.py
@@ -65,7 +65,8 @@
 	"""
 	md = hashlib.md5()
 	md.update(string)
-	return base64.encodestring(md.digest()).strip('\n')
+	return base64.encodestring(md.digest()).strip('\n') if six.PY2 \
+		else base64.encodebytes(md.digest()).decode().strip()
 
 def remove_empty(d):
 	"""
@@ -87,8 +88,7 @@
 		self.original = xml
 		self._rootkey = rootkey
 		self._mydict = xml_utils.xml2dict().fromstring(remove_namespace(xml))
-		self._response_dict = self._mydict.get(self._mydict.keys()[0],
-												self._mydict)
+		self._response_dict = self._mydict.get(list(self._mydict)[0], self._mydict)
 
 	@property
 	def parsed(self):
diff --git a/erpnext/erpnext_integrations/doctype/shopify_settings/shopify_settings.json b/erpnext/erpnext_integrations/doctype/shopify_settings/shopify_settings.json
index a7040f2..8f1b746 100644
--- a/erpnext/erpnext_integrations/doctype/shopify_settings/shopify_settings.json
+++ b/erpnext/erpnext_integrations/doctype/shopify_settings/shopify_settings.json
@@ -1,1258 +1,280 @@
 {
- "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, 
+ "creation": "2015-05-18 05:21:07.270859",
+ "doctype": "DocType",
+ "document_type": "System",
+ "field_order": [
+  "status_html",
+  "enable_shopify",
+  "app_type",
+  "column_break_4",
+  "last_sync_datetime",
+  "section_break_2",
+  "shopify_url",
+  "api_key",
+  "column_break_3",
+  "password",
+  "shared_secret",
+  "access_token",
+  "section_break_38",
+  "webhooks",
+  "section_break_15",
+  "default_customer",
+  "column_break_19",
+  "customer_group",
+  "company_dependent_settings",
+  "company",
+  "cash_bank_account",
+  "column_break_20",
+  "cost_center",
+  "erp_settings",
+  "price_list",
+  "update_price_in_erpnext_price_list",
+  "column_break_26",
+  "warehouse",
+  "section_break_25",
+  "sales_order_series",
+  "column_break_27",
+  "sync_delivery_note",
+  "delivery_note_series",
+  "sync_sales_invoice",
+  "sales_invoice_series",
+  "section_break_22",
+  "html_16",
+  "taxes"
+ ],
  "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
-  }, 
+   "fieldname": "status_html",
+   "fieldtype": "HTML",
+   "label": "status html",
+   "read_only": 1
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "default": "",
-   "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
-  }, 
+   "default": "0",
+   "fieldname": "enable_shopify",
+   "fieldtype": "Check",
+   "label": "Enable Shopify"
+  },
   {
-   "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
-  }, 
+   "default": "Private",
+   "fieldname": "app_type",
+   "fieldtype": "Data",
+   "in_list_view": 1,
+   "label": "App Type",
+   "read_only": 1,
+   "reqd": 1
+  },
   {
-   "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
-  }, 
+   "fieldname": "column_break_4",
+   "fieldtype": "Column Break"
+  },
   {
-   "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
-  }, 
+   "fieldname": "last_sync_datetime",
+   "fieldtype": "Datetime",
+   "label": "Last Sync Datetime",
+   "read_only": 1
+  },
   {
-   "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
-  }, 
+   "fieldname": "section_break_2",
+   "fieldtype": "Section Break"
+  },
   {
-   "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
-  }, 
+   "description": "eg: frappe.myshopify.com",
+   "fieldname": "shopify_url",
+   "fieldtype": "Data",
+   "in_list_view": 1,
+   "label": "Shop URL",
+   "reqd": 1
+  },
   {
-   "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
-  }, 
+   "depends_on": "eval:doc.app_type==\"Private\"",
+   "fieldname": "api_key",
+   "fieldtype": "Data",
+   "label": "API Key"
+  },
   {
-   "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
-  }, 
+   "fieldname": "column_break_3",
+   "fieldtype": "Column Break"
+  },
   {
-   "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
-  }, 
+   "depends_on": "eval:doc.app_type==\"Private\"",
+   "fieldname": "password",
+   "fieldtype": "Password",
+   "label": "Password"
+  },
   {
-   "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
-  }, 
+   "fieldname": "shared_secret",
+   "fieldtype": "Data",
+   "label": "Shared secret"
+  },
   {
-   "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
-  }, 
+   "fieldname": "access_token",
+   "fieldtype": "Data",
+   "hidden": 1,
+   "label": "Access Token",
+   "read_only": 1
+  },
   {
-   "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
-  }, 
+   "collapsible": 1,
+   "fieldname": "section_break_38",
+   "fieldtype": "Section Break",
+   "label": "Webhooks Details"
+  },
   {
-   "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
-  }, 
+   "fieldname": "webhooks",
+   "fieldtype": "Table",
+   "label": "Webhooks",
+   "options": "Shopify Webhook Detail",
+   "read_only": 1
+  },
   {
-   "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
-  }, 
+   "fieldname": "section_break_15",
+   "fieldtype": "Section Break",
+   "label": "Customer Settings"
+  },
   {
-   "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
-  }, 
+   "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",
+   "label": "Default Customer",
+   "options": "Customer"
+  },
   {
-   "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
-  }, 
+   "fieldname": "column_break_19",
+   "fieldtype": "Column Break"
+  },
   {
-   "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
-  }, 
+   "description": "Customer Group will set to selected group while syncing customers from Shopify",
+   "fieldname": "customer_group",
+   "fieldtype": "Link",
+   "label": "Customer Group",
+   "options": "Customer Group"
+  },
   {
-   "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
-  }, 
+   "fieldname": "company_dependent_settings",
+   "fieldtype": "Section Break"
+  },
   {
-   "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
-  }, 
+   "fieldname": "company",
+   "fieldtype": "Link",
+   "label": "For Company",
+   "options": "Company"
+  },
   {
-   "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
-  }, 
+   "description": "Cash Account will used for Sales Invoice creation",
+   "fieldname": "cash_bank_account",
+   "fieldtype": "Link",
+   "label": "Cash/Bank Account",
+   "options": "Account"
+  },
   {
-   "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
-  }, 
+   "fieldname": "column_break_20",
+   "fieldtype": "Column Break"
+  },
   {
-   "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
-  }, 
+   "fieldname": "cost_center",
+   "fieldtype": "Link",
+   "label": "Cost Center",
+   "options": "Cost Center"
+  },
   {
-   "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
-  }, 
+   "fieldname": "erp_settings",
+   "fieldtype": "Section Break"
+  },
   {
-   "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
-  }, 
+   "fieldname": "price_list",
+   "fieldtype": "Link",
+   "label": "Price List",
+   "options": "Price List"
+  },
   {
-   "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
-  }, 
+   "default": "0",
+   "fieldname": "update_price_in_erpnext_price_list",
+   "fieldtype": "Check",
+   "label": "Update Price from Shopify To ERPNext Price List"
+  },
   {
-   "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
-  }, 
+   "fieldname": "column_break_26",
+   "fieldtype": "Column Break"
+  },
   {
-   "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
-  }, 
+   "description": "Default Warehouse to to create Sales Order and Delivery Note",
+   "fieldname": "warehouse",
+   "fieldtype": "Link",
+   "label": "Warehouse",
+   "options": "Warehouse"
+  },
   {
-   "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
-  }, 
+   "fieldname": "section_break_25",
+   "fieldtype": "Section Break"
+  },
   {
-   "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
-  }, 
+   "fieldname": "sales_order_series",
+   "fieldtype": "Select",
+   "label": "Sales Order Series"
+  },
   {
-   "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
-  }, 
+   "fieldname": "column_break_27",
+   "fieldtype": "Column Break"
+  },
   {
-   "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
-  }, 
+   "default": "0",
+   "fieldname": "sync_delivery_note",
+   "fieldtype": "Check",
+   "label": "Import Delivery Notes from Shopify on Shipment"
+  },
   {
-   "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
-  }, 
+   "depends_on": "eval:doc.sync_delivery_note==1",
+   "fieldname": "delivery_note_series",
+   "fieldtype": "Select",
+   "label": "Delivery Note Series"
+  },
   {
-   "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
-  }, 
+   "default": "0",
+   "fieldname": "sync_sales_invoice",
+   "fieldtype": "Check",
+   "label": "Import Sales Invoice from Shopify if Payment is marked"
+  },
   {
-   "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
-  }, 
+   "depends_on": "eval:doc.sync_sales_invoice==1",
+   "fieldname": "sales_invoice_series",
+   "fieldtype": "Select",
+   "label": "Sales Invoice Series"
+  },
   {
-   "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
-  }, 
+   "fieldname": "section_break_22",
+   "fieldtype": "Section Break"
+  },
   {
-   "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
-  }, 
+   "fieldname": "html_16",
+   "fieldtype": "HTML",
+   "options": "Map Shopify Taxes / Shipping Charges to ERPNext Account"
+  },
   {
-   "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
+   "fieldname": "taxes",
+   "fieldtype": "Table",
+   "label": "Shopify Tax Account",
+   "options": "Shopify Tax Account"
   }
- ], 
- "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-09-07 09:11:49.403176",
- "modified_by": "Administrator", 
- "module": "ERPNext Integrations", 
- "name": "Shopify Settings", 
- "name_case": "", 
- "owner": "Administrator", 
+ ],
+ "issingle": 1,
+ "modified": "2019-09-13 12:32:11.384757",
+ "modified_by": "umair@erpnext.com",
+ "module": "ERPNext Integrations",
+ "name": "Shopify Settings",
+ "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, 
+   "create": 1,
+   "delete": 1,
+   "email": 1,
+   "print": 1,
+   "read": 1,
+   "role": "System Manager",
+   "share": 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": 0, 
- "track_seen": 0,
- "track_views": 0
+ ],
+ "sort_field": "modified",
+ "sort_order": "DESC"
 }
\ 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
index 4943053..e2f6d49 100644
--- a/erpnext/erpnext_integrations/doctype/shopify_settings/shopify_settings.py
+++ b/erpnext/erpnext_integrations/doctype/shopify_settings/shopify_settings.py
@@ -21,33 +21,22 @@
 		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"))
+		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)
 
 	def register_webhooks(self):
 		webhooks = ["orders/create", "orders/paid", "orders/fulfilled"]
-
-		url = get_shopify_url('admin/webhooks.json', self)
+		# url = get_shopify_url('admin/webhooks.json', self)
 		created_webhooks = [d.method for d in self.webhooks]
-
+		url = get_shopify_url('admin/api/2019-04/webhooks.json', self)
+		print('url', url)
 		for method in webhooks:
-			if method in created_webhooks:
-				continue
-
+			print('method', method)
 			session = get_request_session()
+			print('session', session)
 			try:
+				print(get_header(self))
 				d = session.post(url, data=json.dumps({
 					"webhook": {
 						"topic": method,
@@ -55,6 +44,7 @@
 						"format": "json"
 						}
 					}), headers=get_header(self))
+				print('d', d.json())
 				d.raise_for_status()
 				self.update_webhook_table(method, d.json())
 			except Exception as e:
@@ -65,7 +55,7 @@
 		deleted_webhooks = []
 
 		for d in self.webhooks:
-			url = get_shopify_url('admin/webhooks/{0}.json'.format(d.webhook_id), self)
+			url = get_shopify_url('admin/api/2019-04/webhooks.json'.format(d.webhook_id), self)
 			try:
 				res = session.delete(url, headers=get_header(self))
 				res.raise_for_status()
@@ -77,6 +67,7 @@
 			self.remove(d)
 
 	def update_webhook_table(self, method, res):
+		print('update')
 		self.append("webhooks", {
 			"webhook_id": res['webhook']['id'],
 			"method": method
@@ -84,6 +75,7 @@
 
 def get_shopify_url(path, settings):
 	if settings.app_type == "Private":
+		print(settings.api_key, settings.get_password('password'), settings.shopify_url, path)
 		return 'https://{}:{}@{}/{}'.format(settings.api_key, settings.get_password('password'), settings.shopify_url, path)
 	else:
 		return 'https://{}/{}'.format(settings.shopify_url, path)
@@ -91,11 +83,7 @@
 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
+	return header;
 
 @frappe.whitelist()
 def get_series():
diff --git a/erpnext/erpnext_integrations/doctype/shopify_settings/sync_customer.py b/erpnext/erpnext_integrations/doctype/shopify_settings/sync_customer.py
index 4b284b2..7866fde 100644
--- a/erpnext/erpnext_integrations/doctype/shopify_settings/sync_customer.py
+++ b/erpnext/erpnext_integrations/doctype/shopify_settings/sync_customer.py
@@ -21,7 +21,7 @@
 			"customer_type": _("Individual")
 		})
 		customer.flags.ignore_mandatory = True
-		customer.insert()
+		customer.insert(ignore_permissions=True)
 
 		if customer:
 			create_customer_address(customer, shopify_customer)
diff --git a/erpnext/erpnext_integrations/doctype/shopify_settings/sync_product.py b/erpnext/erpnext_integrations/doctype/shopify_settings/sync_product.py
index 5570e69..bde1011 100644
--- a/erpnext/erpnext_integrations/doctype/shopify_settings/sync_product.py
+++ b/erpnext/erpnext_integrations/doctype/shopify_settings/sync_product.py
@@ -1,13 +1,14 @@
 from __future__ import unicode_literals
 import frappe
 from frappe import _
+from erpnext import get_default_company
 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)
+	url = get_shopify_url("admin/api/2019-04/products/{0}.json".format(item.get("product_id")), shopify_settings)
 	session = get_request_session()
 
 	try:
@@ -107,7 +108,12 @@
 		"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)
+		"default_supplier": get_supplier(shopify_item),
+		"item_defaults": [
+			{
+				"company": get_default_company()
+			}
+		]
 	}
 
 	if not is_item_exists(item_dict, attributes, variant_of=variant_of):
@@ -116,7 +122,7 @@
 
 		if not item_details:
 			new_item = frappe.get_doc(item_dict)
-			new_item.insert()
+			new_item.insert(ignore_permissions=True, ignore_mandatory=True)
 			name = new_item.name
 
 		if not name:
diff --git a/erpnext/erpnext_integrations/doctype/shopify_settings/test_shopify_settings.py b/erpnext/erpnext_integrations/doctype/shopify_settings/test_shopify_settings.py
index b983407..64ef3dc 100644
--- a/erpnext/erpnext_integrations/doctype/shopify_settings/test_shopify_settings.py
+++ b/erpnext/erpnext_integrations/doctype/shopify_settings/test_shopify_settings.py
@@ -40,6 +40,7 @@
 			"price_list": "_Test Price List",
 			"warehouse": "_Test Warehouse - _TC",
 			"cash_bank_account": "Cash - _TC",
+			"account": "Cash - _TC",
 			"customer_group": "_Test Customer Group",
 			"cost_center": "Main - _TC",
 			"taxes": [
diff --git a/erpnext/erpnext_integrations/utils.py b/erpnext/erpnext_integrations/utils.py
index 9065779..84f7f5a 100644
--- a/erpnext/erpnext_integrations/utils.py
+++ b/erpnext/erpnext_integrations/utils.py
@@ -40,4 +40,4 @@
 
 	server_url = '{uri.scheme}://{uri.netloc}/api/method/{endpoint}'.format(uri=urlparse(url), endpoint=endpoint)
 
-	return server_url
\ No newline at end of file
+	return server_url
diff --git a/erpnext/healthcare/doctype/patient/patient.json b/erpnext/healthcare/doctype/patient/patient.json
index 1de4205..0136f72 100644
--- a/erpnext/healthcare/doctype/patient/patient.json
+++ b/erpnext/healthcare/doctype/patient/patient.json
@@ -347,7 +347,7 @@
  "icon": "fa fa-user",
  "image_field": "image",
  "max_attachments": 50,
- "modified": "2019-09-23 16:01:39.811633",
+ "modified": "2019-09-25 23:30:49.905893",
  "modified_by": "Administrator",
  "module": "Healthcare",
  "name": "Patient",
@@ -362,6 +362,18 @@
    "print": 1,
    "read": 1,
    "report": 1,
+   "role": "System Manager",
+   "share": 1,
+   "write": 1
+  },
+  {
+   "create": 1,
+   "delete": 1,
+   "email": 1,
+   "export": 1,
+   "print": 1,
+   "read": 1,
+   "report": 1,
    "role": "Physician",
    "share": 1,
    "write": 1
diff --git a/erpnext/hooks.py b/erpnext/hooks.py
index b165b13..5c61874 100644
--- a/erpnext/hooks.py
+++ b/erpnext/hooks.py
@@ -42,8 +42,13 @@
 get_help_messages = "erpnext.utilities.activation.get_help_messages"
 get_user_progress_slides = "erpnext.utilities.user_progress.get_user_progress_slides"
 update_and_get_user_progress = "erpnext.utilities.user_progress_utils.update_default_domain_actions_and_get_state"
+leaderboards = "erpnext.startup.leaderboard.get_leaderboards"
 
-on_session_creation = "erpnext.shopping_cart.utils.set_cart_count"
+
+on_session_creation = [
+	"erpnext.portal.utils.create_customer_or_supplier",
+	"erpnext.shopping_cart.utils.set_cart_count"
+]
 on_logout = "erpnext.shopping_cart.utils.clear_cart_count"
 
 treeviews = ['Account', 'Cost Center', 'Warehouse', 'Item Group', 'Customer Group', 'Sales Person', 'Territory', 'Assessment Group', 'Department']
@@ -100,6 +105,20 @@
 			"parents": [{"label": _("Supplier Quotation"), "route": "supplier-quotations"}]
 		}
 	},
+	{"from_route": "/purchase-orders", "to_route": "Purchase Order"},
+	{"from_route": "/purchase-orders/<path:name>", "to_route": "order",
+		"defaults": {
+			"doctype": "Purchase Order",
+			"parents": [{"label": _("Purchase Order"), "route": "purchase-orders"}]
+		}
+	},
+	{"from_route": "/purchase-invoices", "to_route": "Purchase Invoice"},
+	{"from_route": "/purchase-invoices/<path:name>", "to_route": "order",
+		"defaults": {
+			"doctype": "Purchase Invoice",
+			"parents": [{"label": _("Purchase Invoice"), "route": "purchase-invoices"}]
+		}
+	},
 	{"from_route": "/quotations", "to_route": "Quotation"},
 	{"from_route": "/quotations/<path:name>", "to_route": "order",
 		"defaults": {
@@ -146,6 +165,8 @@
 	{"title": _("Projects"), "route": "/project", "reference_doctype": "Project"},
 	{"title": _("Request for Quotations"), "route": "/rfq", "reference_doctype": "Request for Quotation", "role": "Supplier"},
 	{"title": _("Supplier Quotation"), "route": "/supplier-quotations", "reference_doctype": "Supplier Quotation", "role": "Supplier"},
+	{"title": _("Purchase Orders"), "route": "/purchase-orders", "reference_doctype": "Purchase Order", "role": "Supplier"},
+	{"title": _("Purchase Invoices"), "route": "/purchase-invoices", "reference_doctype": "Purchase Invoice", "role": "Supplier"},
 	{"title": _("Quotations"), "route": "/quotations", "reference_doctype": "Quotation", "role":"Customer"},
 	{"title": _("Orders"), "route": "/orders", "reference_doctype": "Sales Order", "role":"Customer"},
 	{"title": _("Invoices"), "route": "/invoices", "reference_doctype": "Sales Invoice", "role":"Customer"},
@@ -158,8 +179,8 @@
 	{"title": _("Patient Appointment"), "route": "/patient-appointments", "reference_doctype": "Patient Appointment", "role":"Patient"},
 	{"title": _("Fees"), "route": "/fees", "reference_doctype": "Fees", "role":"Student"},
 	{"title": _("Newsletter"), "route": "/newsletters", "reference_doctype": "Newsletter"},
-	{"title": _("Admission"), "route": "/admissions", "reference_doctype": "Student Admission"},
-	{"title": _("Certification"), "route": "/certification", "reference_doctype": "Certification Application"},
+	{"title": _("Admission"), "route": "/admissions", "reference_doctype": "Student Admission", "role": "Student"},
+	{"title": _("Certification"), "route": "/certification", "reference_doctype": "Certification Application", "role": "Non Profit Portal User"},
 	{"title": _("Material Request"), "route": "/material-requests", "reference_doctype": "Material Request", "role": "Customer"},
 ]
 
@@ -179,6 +200,8 @@
 	"Quotation": "erpnext.controllers.website_list_for_contact.has_website_permission",
 	"Sales Invoice": "erpnext.controllers.website_list_for_contact.has_website_permission",
 	"Supplier Quotation": "erpnext.controllers.website_list_for_contact.has_website_permission",
+	"Purchase Order": "erpnext.controllers.website_list_for_contact.has_website_permission",
+	"Purchase Invoice": "erpnext.controllers.website_list_for_contact.has_website_permission",
 	"Material Request": "erpnext.controllers.website_list_for_contact.has_website_permission",
 	"Delivery Note": "erpnext.controllers.website_list_for_contact.has_website_permission",
 	"Issue": "erpnext.support.doctype.issue.issue.has_website_permission",
@@ -353,52 +376,155 @@
 	}
 ]
 
-global_search_doctypes = [
-	{"doctype": "Customer", "index": 0},
-	{"doctype": "Supplier", "index": 1},
-	{"doctype": "Item", "index": 2},
-	{"doctype": "Warehouse", "index": 3},
-	{"doctype": "Account", "index": 4},
-	{"doctype": "Employee", "index": 5},
-	{"doctype": "BOM", "index": 6},
-	{"doctype": "Sales Invoice", "index": 7},
-	{"doctype": "Sales Order", "index": 8},
-	{"doctype": "Quotation", "index": 9},
-	{"doctype": "Work Order", "index": 10},
-	{"doctype": "Purchase Receipt", "index": 11},
-	{"doctype": "Purchase Invoice", "index": 12},
-	{"doctype": "Delivery Note", "index": 13},
-	{"doctype": "Stock Entry", "index": 14},
-	{"doctype": "Material Request", "index": 15},
-	{"doctype": "Delivery Trip", "index": 16},
-	{"doctype": "Pick List", "index": 17},
-	{"doctype": "Salary Slip", "index": 18},
-	{"doctype": "Leave Application", "index": 19},
-	{"doctype": "Expense Claim", "index": 20},
-	{"doctype": "Payment Entry", "index": 21},
-	{"doctype": "Lead", "index": 22},
-	{"doctype": "Opportunity", "index": 23},
-	{"doctype": "Item Price", "index": 24},
-	{"doctype": "Purchase Taxes and Charges Template", "index": 25},
-	{"doctype": "Sales Taxes and Charges", "index": 26},
-	{"doctype": "Asset", "index": 27},
-	{"doctype": "Project", "index": 28},
-	{"doctype": "Task", "index": 29},
-	{"doctype": "Timesheet", "index": 30},
-	{"doctype": "Issue", "index": 31},
-	{"doctype": "Serial No", "index": 32},
-	{"doctype": "Batch", "index": 33},
-	{"doctype": "Branch", "index": 34},
-	{"doctype": "Department", "index": 35},
-	{"doctype": "Employee Grade", "index": 36},
-	{"doctype": "Designation", "index": 37},
-	{"doctype": "Job Opening", "index": 38},
-	{"doctype": "Job Applicant", "index": 39},
-	{"doctype": "Job Offer", "index": 40},
-	{"doctype": "Salary Structure Assignment", "index": 41},
-	{"doctype": "Appraisal", "index": 42},
-	{"doctype": "Loan", "index": 43},
-	{"doctype": "Maintenance Schedule", "index": 44},
-	{"doctype": "Maintenance Visit", "index": 45},
-	{"doctype": "Warranty Claim", "index": 46},
-]
\ No newline at end of file
+# ERPNext doctypes for Global Search
+global_search_doctypes = {
+	"Default": [
+		{"doctype": "Customer", "index": 0},
+		{"doctype": "Supplier", "index": 1},
+		{"doctype": "Item", "index": 2},
+		{"doctype": "Warehouse", "index": 3},
+		{"doctype": "Account", "index": 4},
+		{"doctype": "Employee", "index": 5},
+		{"doctype": "BOM", "index": 6},
+		{"doctype": "Sales Invoice", "index": 7},
+		{"doctype": "Sales Order", "index": 8},
+		{"doctype": "Quotation", "index": 9},
+		{"doctype": "Work Order", "index": 10},
+		{"doctype": "Purchase Receipt", "index": 11},
+		{"doctype": "Purchase Invoice", "index": 12},
+		{"doctype": "Delivery Note", "index": 13},
+		{"doctype": "Stock Entry", "index": 14},
+		{"doctype": "Material Request", "index": 15},
+		{"doctype": "Delivery Trip", "index": 16},
+		{"doctype": "Pick List", "index": 17},
+		{"doctype": "Salary Slip", "index": 18},
+		{"doctype": "Leave Application", "index": 19},
+		{"doctype": "Expense Claim", "index": 20},
+		{"doctype": "Payment Entry", "index": 21},
+		{"doctype": "Lead", "index": 22},
+		{"doctype": "Opportunity", "index": 23},
+		{"doctype": "Item Price", "index": 24},
+		{"doctype": "Purchase Taxes and Charges Template", "index": 25},
+		{"doctype": "Sales Taxes and Charges", "index": 26},
+		{"doctype": "Asset", "index": 27},
+		{"doctype": "Project", "index": 28},
+		{"doctype": "Task", "index": 29},
+		{"doctype": "Timesheet", "index": 30},
+		{"doctype": "Issue", "index": 31},
+		{"doctype": "Serial No", "index": 32},
+		{"doctype": "Batch", "index": 33},
+		{"doctype": "Branch", "index": 34},
+		{"doctype": "Department", "index": 35},
+		{"doctype": "Employee Grade", "index": 36},
+		{"doctype": "Designation", "index": 37},
+		{"doctype": "Job Opening", "index": 38},
+		{"doctype": "Job Applicant", "index": 39},
+		{"doctype": "Job Offer", "index": 40},
+		{"doctype": "Salary Structure Assignment", "index": 41},
+		{"doctype": "Appraisal", "index": 42},
+		{"doctype": "Loan", "index": 43},
+		{"doctype": "Maintenance Schedule", "index": 44},
+		{"doctype": "Maintenance Visit", "index": 45},
+		{"doctype": "Warranty Claim", "index": 46},
+	],
+	"Healthcare": [
+		{'doctype': 'Patient', 'index': 1},
+		{'doctype': 'Medical Department', 'index': 2},
+		{'doctype': 'Vital Signs', 'index': 3},
+		{'doctype': 'Healthcare Practitioner', 'index': 4},
+		{'doctype': 'Patient Appointment', 'index': 5},
+		{'doctype': 'Healthcare Service Unit', 'index': 6},
+		{'doctype': 'Patient Encounter', 'index': 7},
+		{'doctype': 'Antibiotic', 'index': 8},
+		{'doctype': 'Diagnosis', 'index': 9},
+		{'doctype': 'Lab Test', 'index': 10},
+		{'doctype': 'Clinical Procedure', 'index': 11},
+		{'doctype': 'Inpatient Record', 'index': 12},
+		{'doctype': 'Sample Collection', 'index': 13},
+		{'doctype': 'Patient Medical Record', 'index': 14},
+		{'doctype': 'Appointment Type', 'index': 15},
+		{'doctype': 'Fee Validity', 'index': 16},
+		{'doctype': 'Practitioner Schedule', 'index': 17},
+		{'doctype': 'Dosage Form', 'index': 18},
+		{'doctype': 'Lab Test Sample', 'index': 19},
+		{'doctype': 'Prescription Duration', 'index': 20},
+		{'doctype': 'Prescription Dosage', 'index': 21},
+		{'doctype': 'Sensitivity', 'index': 22},
+		{'doctype': 'Complaint', 'index': 23},
+		{'doctype': 'Medical Code', 'index': 24},
+	],
+	"Education": [
+		{'doctype': 'Article', 'index': 1},
+		{'doctype': 'Video', 'index': 2},
+		{'doctype': 'Topic', 'index': 3},
+		{'doctype': 'Course', 'index': 4},
+		{'doctype': 'Program', 'index': 5},
+		{'doctype': 'Quiz', 'index': 6},
+		{'doctype': 'Question', 'index': 7},
+		{'doctype': 'Fee Schedule', 'index': 8},
+		{'doctype': 'Fee Structure', 'index': 9},
+		{'doctype': 'Fees', 'index': 10},
+		{'doctype': 'Student Group', 'index': 11},
+		{'doctype': 'Student', 'index': 12},
+		{'doctype': 'Instructor', 'index': 13},
+		{'doctype': 'Course Activity', 'index': 14},
+		{'doctype': 'Quiz Activity', 'index': 15},
+		{'doctype': 'Course Enrollment', 'index': 16},
+		{'doctype': 'Program Enrollment', 'index': 17},
+		{'doctype': 'Student Language', 'index': 18},
+		{'doctype': 'Student Applicant', 'index': 19},
+		{'doctype': 'Assessment Result', 'index': 20},
+		{'doctype': 'Assessment Plan', 'index': 21},
+		{'doctype': 'Grading Scale', 'index': 22},
+		{'doctype': 'Guardian', 'index': 23},
+		{'doctype': 'Student Leave Application', 'index': 24},
+		{'doctype': 'Student Log', 'index': 25},
+		{'doctype': 'Room', 'index': 26},
+		{'doctype': 'Course Schedule', 'index': 27},
+		{'doctype': 'Student Attendance', 'index': 28},
+		{'doctype': 'Announcement', 'index': 29},
+		{'doctype': 'Student Category', 'index': 30},
+		{'doctype': 'Assessment Group', 'index': 31},
+		{'doctype': 'Student Batch Name', 'index': 32},
+		{'doctype': 'Assessment Criteria', 'index': 33},
+		{'doctype': 'Academic Year', 'index': 34},
+		{'doctype': 'Academic Term', 'index': 35},
+		{'doctype': 'School House', 'index': 36},
+		{'doctype': 'Student Admission', 'index': 37},
+		{'doctype': 'Fee Category', 'index': 38},
+		{'doctype': 'Assessment Code', 'index': 39},
+		{'doctype': 'Discussion', 'index': 40},
+	],
+	"Agriculture": [
+		{'doctype': 'Weather', 'index': 1},
+		{'doctype': 'Soil Texture', 'index': 2},
+		{'doctype': 'Water Analysis', 'index': 3},
+		{'doctype': 'Soil Analysis', 'index': 4},
+		{'doctype': 'Plant Analysis', 'index': 5},
+		{'doctype': 'Agriculture Analysis Criteria', 'index': 6},
+		{'doctype': 'Disease', 'index': 7},
+		{'doctype': 'Crop', 'index': 8},
+		{'doctype': 'Fertilizer', 'index': 9},
+		{'doctype': 'Crop Cycle', 'index': 10}
+	],
+	"Non Profit": [
+		{'doctype': 'Certified Consultant', 'index': 1},
+		{'doctype': 'Certification Application', 'index': 2},
+		{'doctype': 'Volunteer', 'index': 3},
+		{'doctype': 'Membership', 'index': 4},
+		{'doctype': 'Member', 'index': 5},
+		{'doctype': 'Donor', 'index': 6},
+		{'doctype': 'Chapter', 'index': 7},
+		{'doctype': 'Grant Application', 'index': 8},
+		{'doctype': 'Volunteer Type', 'index': 9},
+		{'doctype': 'Donor Type', 'index': 10},
+		{'doctype': 'Membership Type', 'index': 11}
+	],
+	"Hospitality": [
+		{'doctype': 'Hotel Room', 'index': 0},
+		{'doctype': 'Hotel Room Reservation', 'index': 1},
+		{'doctype': 'Hotel Room Pricing', 'index': 2},
+		{'doctype': 'Hotel Room Package', 'index': 3},
+		{'doctype': 'Hotel Room Type', 'index': 4}
+	]
+}
\ 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 6d25c06..27a51c3 100644
--- a/erpnext/hr/doctype/salary_slip/salary_slip.py
+++ b/erpnext/hr/doctype/salary_slip/salary_slip.py
@@ -255,16 +255,19 @@
 		for d in range(working_days):
 			dt = add_days(cstr(getdate(self.start_date)), d)
 			leave = frappe.db.sql("""
-				select t1.name, t1.half_day
-				from `tabLeave Application` t1, `tabLeave Type` t2
-				where t2.name = t1.leave_type
-				and t2.is_lwp = 1
-				and t1.docstatus = 1
-				and t1.employee = %(employee)s
-				and CASE WHEN t2.include_holiday != 1 THEN %(dt)s not in ('{0}') and %(dt)s between from_date and to_date and ifnull(t1.salary_slip, '') = ''
+				SELECT t1.name,
+					CASE WHEN t1.half_day_date = %(dt)s or t1.to_date = t1.from_date
+					THEN t1.half_day else 0 END
+				FROM `tabLeave Application` t1, `tabLeave Type` t2
+				WHERE t2.name = t1.leave_type
+				AND t2.is_lwp = 1
+				AND t1.docstatus = 1
+				AND t1.employee = %(employee)s
+				AND CASE WHEN t2.include_holiday != 1 THEN %(dt)s not in ('{0}') and %(dt)s between from_date and to_date and ifnull(t1.salary_slip, '') = ''
 				WHEN t2.include_holiday THEN %(dt)s between from_date and to_date and ifnull(t1.salary_slip, '') = ''
 				END
 				""".format(holidays), {"employee": self.employee, "dt": dt})
+
 			if leave:
 				lwp = cint(leave[0][1]) and (lwp + 0.5) or (lwp + 1)
 		return lwp
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 7717ba0..e967db8 100644
--- a/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py
+++ b/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py
@@ -60,7 +60,10 @@
 
 	data = []
 	for employee in active_employees:
-		leave_approvers = department_approver_map.get(employee.department_name, []).append(employee.leave_approver)
+		leave_approvers = department_approver_map.get(employee.department_name, [])
+		if employee.leave_approver:
+			leave_approvers.append(employee.leave_approver)
+
 		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]
 
diff --git a/erpnext/manufacturing/doctype/bom/bom.py b/erpnext/manufacturing/doctype/bom/bom.py
index f82afb7..eb01b8c 100644
--- a/erpnext/manufacturing/doctype/bom/bom.py
+++ b/erpnext/manufacturing/doctype/bom/bom.py
@@ -173,7 +173,7 @@
 			#Customer Provided parts will have zero rate
 			if not frappe.db.get_value('Item', arg["item_code"], 'is_customer_provided_item'):
 				if arg.get('bom_no') and self.set_rate_of_sub_assembly_item_based_on_bom:
-					rate = self.get_bom_unitcost(arg['bom_no']) * (arg.get("conversion_factor") or 1)
+					rate = flt(self.get_bom_unitcost(arg['bom_no'])) * (arg.get("conversion_factor") or 1)
 				else:
 					if self.rm_cost_as_per == 'Valuation Rate':
 						rate = self.get_valuation_rate(arg) * (arg.get("conversion_factor") or 1)
diff --git a/erpnext/manufacturing/doctype/production_plan/production_plan.py b/erpnext/manufacturing/doctype/production_plan/production_plan.py
index b51420f..04359e3 100644
--- a/erpnext/manufacturing/doctype/production_plan/production_plan.py
+++ b/erpnext/manufacturing/doctype/production_plan/production_plan.py
@@ -195,6 +195,7 @@
 		for data in self.po_items:
 			if data.name == production_plan_item:
 				data.produced_qty = produced_qty
+				data.pending_qty = data.planned_qty - data.produced_qty
 				data.db_update()
 
 		self.calculate_total_produced_qty()
diff --git a/erpnext/manufacturing/doctype/work_order/work_order.js b/erpnext/manufacturing/doctype/work_order/work_order.js
index ce7b4f9..1789a1f 100644
--- a/erpnext/manufacturing/doctype/work_order/work_order.js
+++ b/erpnext/manufacturing/doctype/work_order/work_order.js
@@ -91,6 +91,16 @@
 			};
 		});
 
+		frm.set_query("operation", "required_items", function() {
+			return {
+				query: "erpnext.manufacturing.doctype.work_order.work_order.get_bom_operations",
+				filters: {
+					'parent': frm.doc.bom_no,
+					'parenttype': 'BOM'
+				}
+			};
+		});
+
 		// formatter for work order operation
 		frm.set_indicator_formatter('operation',
 			function(doc) { return (frm.doc.qty==doc.completed_qty) ? "green" : "orange"; });
@@ -545,11 +555,14 @@
 
 	get_max_transferable_qty: (frm, purpose) => {
 		let max = 0;
-		if (frm.doc.skip_transfer) return max;
-		if (purpose === 'Manufacture') {
-			max = flt(frm.doc.material_transferred_for_manufacturing) - flt(frm.doc.produced_qty);
+		if (frm.doc.skip_transfer) {
+			max = flt(frm.doc.qty) - flt(frm.doc.produced_qty);
 		} else {
-			max = flt(frm.doc.qty) - flt(frm.doc.material_transferred_for_manufacturing);
+			if (purpose === 'Manufacture') {
+				max = flt(frm.doc.material_transferred_for_manufacturing) - flt(frm.doc.produced_qty);
+			} else {
+				max = flt(frm.doc.qty) - flt(frm.doc.material_transferred_for_manufacturing);
+			}
 		}
 		return flt(max, precision('qty'));
 	},
diff --git a/erpnext/manufacturing/doctype/work_order/work_order.py b/erpnext/manufacturing/doctype/work_order/work_order.py
index 24b798b..678e709 100644
--- a/erpnext/manufacturing/doctype/work_order/work_order.py
+++ b/erpnext/manufacturing/doctype/work_order/work_order.py
@@ -543,6 +543,13 @@
 		bom.set_bom_material_details()
 		return bom
 
+def get_bom_operations(doctype, txt, searchfield, start, page_len, filters):
+	if txt:
+		filters['operation'] = ('like', '%%%s%%' % txt)
+
+	return frappe.get_all('BOM Operation',
+		filters = filters, fields = ['operation'], as_list=1)
+
 @frappe.whitelist()
 def get_item_details(item, project = None):
 	res = frappe.db.sql("""
diff --git a/erpnext/patches.txt b/erpnext/patches.txt
index 722baaf..9f98099 100644
--- a/erpnext/patches.txt
+++ b/erpnext/patches.txt
@@ -638,3 +638,5 @@
 erpnext.patches.v12_0.rename_bank_account_field_in_journal_entry_account
 erpnext.patches.v12_0.create_default_energy_point_rules
 erpnext.patches.v12_0.set_produced_qty_field_in_sales_order_for_work_order
+erpnext.patches.v12_0.generate_leave_ledger_entries
+erpnext.patches.v12_0.set_default_shopify_app_type
diff --git a/erpnext/patches/v12_0/generate_leave_ledger_entries.py b/erpnext/patches/v12_0/generate_leave_ledger_entries.py
index 5e91449..c5bec19 100644
--- a/erpnext/patches/v12_0/generate_leave_ledger_entries.py
+++ b/erpnext/patches/v12_0/generate_leave_ledger_entries.py
@@ -10,6 +10,7 @@
 		for last allocation """
 	frappe.reload_doc("HR", "doctype", "Leave Ledger Entry")
 	frappe.reload_doc("HR", "doctype", "Leave Encashment")
+	frappe.reload_doc("HR", "doctype", "Leave Type")
 	if frappe.db.a_row_exists("Leave Ledger Entry"):
 		return
 
@@ -84,4 +85,4 @@
 def get_leave_encashment_records():
 	return frappe.get_all("Leave Encashment", filters={
 		"docstatus": 1
-		}, fields=['name', 'employee', 'leave_type', 'encashable_days', 'encashment_date'])
\ No newline at end of file
+		}, fields=['name', 'employee', 'leave_type', 'encashable_days', 'encashment_date'])
diff --git a/erpnext/patches/v12_0/set_default_shopify_app_type.py b/erpnext/patches/v12_0/set_default_shopify_app_type.py
new file mode 100644
index 0000000..d040ea7
--- /dev/null
+++ b/erpnext/patches/v12_0/set_default_shopify_app_type.py
@@ -0,0 +1,6 @@
+from __future__ import unicode_literals
+import frappe
+
+def execute():
+	frappe.reload_doc('erpnext_integrations', 'doctype', 'shopify_settings')
+	frappe.db.set_value('Shopify Settings', None, 'app_type', 'Private')
\ No newline at end of file
diff --git a/erpnext/portal/utils.py b/erpnext/portal/utils.py
index 2e710c7..56e4fcd 100644
--- a/erpnext/portal/utils.py
+++ b/erpnext/portal/utils.py
@@ -1,5 +1,8 @@
 from __future__ import unicode_literals
 import frappe
+from erpnext.shopping_cart.doctype.shopping_cart_settings.shopping_cart_settings import get_shopping_cart_settings
+from erpnext.shopping_cart.cart import get_debtors_account
+from frappe.utils.nestedset import get_root_of
 
 def set_default_role(doc, method):
 	'''Set customer, supplier, student, guardian based on email'''
@@ -21,3 +24,88 @@
 		doc.add_roles('Student')
 	elif frappe.get_value('Guardian', dict(email_address=doc.email)) and 'Guardian' not in roles:
 		doc.add_roles('Guardian')
+
+def create_customer_or_supplier():
+	'''Based on the default Role (Customer, Supplier), create a Customer / Supplier.
+	Called on_session_creation hook.
+	'''
+	user = frappe.session.user
+
+	if frappe.db.get_value('User', user, 'user_type') != 'Website User':
+		return
+
+	user_roles = frappe.get_roles()
+	portal_settings = frappe.get_single('Portal Settings')
+	default_role = portal_settings.default_role
+
+	if default_role not in ['Customer', 'Supplier']:
+		return
+
+	# create customer / supplier if the user has that role
+	if portal_settings.default_role and portal_settings.default_role in user_roles:
+		doctype = portal_settings.default_role
+	else:
+		doctype = None
+
+	if not doctype:
+		return
+
+	if party_exists(doctype, user):
+		return
+
+	party = frappe.new_doc(doctype)
+	fullname = frappe.utils.get_fullname(user)
+
+	if doctype == 'Customer':
+		cart_settings = get_shopping_cart_settings()
+
+		if cart_settings.enable_checkout:
+			debtors_account = get_debtors_account(cart_settings)
+		else:
+			debtors_account = ''
+
+		party.update({
+			"customer_name": fullname,
+			"customer_type": "Individual",
+			"customer_group": cart_settings.default_customer_group,
+			"territory": get_root_of("Territory")
+		})
+
+		if debtors_account:
+			party.update({
+				"accounts": [{
+					"company": cart_settings.company,
+					"account": debtors_account
+				}]
+			})
+	else:
+		party.update({
+			"supplier_name": fullname,
+			"supplier_group": "All Supplier Groups",
+			"supplier_type": "Individual"
+		})
+
+	party.flags.ignore_mandatory = True
+	party.insert(ignore_permissions=True)
+
+	contact = frappe.new_doc("Contact")
+	contact.update({
+		"first_name": fullname,
+		"email_id": user
+	})
+	contact.append('links', dict(link_doctype=doctype, link_name=party.name))
+	contact.flags.ignore_mandatory = True
+	contact.insert(ignore_permissions=True)
+
+	return party
+
+
+def party_exists(doctype, user):
+	contact_name = frappe.db.get_value("Contact", {"email_id": user})
+
+	if contact_name:
+		contact = frappe.get_doc('Contact', contact_name)
+		doctypes = [d.link_doctype for d in contact.links]
+		return doctype in doctypes
+
+	return False
diff --git a/erpnext/projects/doctype/project/project.json b/erpnext/projects/doctype/project/project.json
index 205f895..7d47db3 100644
--- a/erpnext/projects/doctype/project/project.json
+++ b/erpnext/projects/doctype/project/project.json
@@ -108,7 +108,7 @@
    "fieldname": "percent_complete_method",
    "fieldtype": "Select",
    "label": "% Complete Method",
-   "options": "Task Completion\nTask Progress\nTask Weight"
+   "options": "Manual\nTask Completion\nTask Progress\nTask Weight"
   },
   {
    "bold": 1,
diff --git a/erpnext/projects/doctype/project/project.py b/erpnext/projects/doctype/project/project.py
index 6176cf8..783bcf3 100644
--- a/erpnext/projects/doctype/project/project.py
+++ b/erpnext/projects/doctype/project/project.py
@@ -87,6 +87,11 @@
 			frappe.db.set_value("Sales Order", self.sales_order, "project", self.name)
 
 	def update_percent_complete(self):
+		if self.percent_complete_method == "Manual":
+			if self.status == "Completed":
+				self.percent_complete = 100
+			return
+
 		total = frappe.db.count('Task', dict(project=self.name))
 
 		if not total:
diff --git a/erpnext/public/js/templates/contact_list.html b/erpnext/public/js/templates/contact_list.html
index 50fbfd9..7e69691 100644
--- a/erpnext/public/js/templates/contact_list.html
+++ b/erpnext/public/js/templates/contact_list.html
@@ -19,6 +19,9 @@
 			{% if(contact_list[i].phone) { %}
 				{%= __("Phone") %}: {%= contact_list[i].phone %}<span class="text-muted"> ({%= __("Primary") %})</span><br>
 			{% endif %}
+			{% if(contact_list[i].mobile_no) { %}
+				{%= __("Mobile No") %}: {%= contact_list[i].mobile_no %}<span class="text-muted"> ({%= __("Primary") %})</span><br>
+			{% endif %}
 			{% if(contact_list[i].phone_nos) { %}
 				{% for(var j=0, k=contact_list[i].phone_nos.length; j<k; j++) { %}
 					{%= __("Phone") %}: {%= contact_list[i].phone_nos[j].phone %}<br>
diff --git a/erpnext/public/scss/website.scss b/erpnext/public/scss/website.scss
index 002498f..7b9a70d 100644
--- a/erpnext/public/scss/website.scss
+++ b/erpnext/public/scss/website.scss
@@ -51,3 +51,30 @@
 	width: 24px;
 	height: 24px;
 }
+
+.website-list .result {
+	margin-top: 2rem;
+}
+
+.result {
+	border-bottom: 1px solid $border-color;
+}
+
+.transaction-list-item {
+	padding: 1rem 0;
+	border-top: 1px solid $border-color;
+	position: relative;
+
+	a.transaction-item-link {
+		position: absolute;
+		top: 0;
+		left: 0;
+		width: 100%;
+		height: 100%;
+		text-decoration: none;
+		opacity: 0;
+		overflow: hidden;
+		text-indent: -9999px;
+		z-index: 0;
+	}
+}
diff --git a/erpnext/regional/italy/e-invoice.xml b/erpnext/regional/italy/e-invoice.xml
index 0a5bb29..049a7eb 100644
--- a/erpnext/regional/italy/e-invoice.xml
+++ b/erpnext/regional/italy/e-invoice.xml
@@ -19,7 +19,7 @@
 {%- endmacro %}
 
 {%- macro render_discount_or_margin(item) -%}
-{%- if item.discount_percentage > 0.0 or item.margin_type %}
+{%- if (item.discount_percentage and item.discount_percentage > 0.0) or item.margin_type %}
 <ScontoMaggiorazione>
   {%- if item.discount_percentage > 0.0 %}
   <Tipo>SC</Tipo>
diff --git a/erpnext/regional/italy/utils.py b/erpnext/regional/italy/utils.py
index 12f5762..bc8d00d 100644
--- a/erpnext/regional/italy/utils.py
+++ b/erpnext/regional/italy/utils.py
@@ -151,8 +151,7 @@
 						tax_rate=tax.rate,
 						tax_amount=(reference_row.tax_amount * tax.rate) / 100,
 						net_amount=reference_row.tax_amount,
-						taxable_amount=(reference_row.tax_amount if tax.charge_type == 'On Previous Row Amount'
-							else reference_row.total),
+						taxable_amount=reference_row.tax_amount,
 						item_tax_rate={tax.account_head: tax.rate},
 						charges=True
 					)
@@ -177,6 +176,10 @@
 						summary_data[key]["tax_exemption_reason"] = tax.tax_exemption_reason
 						summary_data[key]["tax_exemption_law"] = tax.tax_exemption_law
 
+			if summary_data.get("0.0") and tax.charge_type in ["On Previous Row Total",
+				"On Previous Row Amount"]:
+				summary_data[key]["taxable_amount"] = tax.total
+
 			if summary_data == {}: #Implies that Zero VAT has not been set on any item.
 				summary_data.setdefault("0.0", {"tax_amount": 0.0, "taxable_amount": tax.total,
 					"tax_exemption_reason": tax.tax_exemption_reason, "tax_exemption_law": tax.tax_exemption_law})
diff --git a/erpnext/selling/doctype/sales_order/sales_order.json b/erpnext/selling/doctype/sales_order/sales_order.json
index e537495..cd6965a 100644
--- a/erpnext/selling/doctype/sales_order/sales_order.json
+++ b/erpnext/selling/doctype/sales_order/sales_order.json
@@ -941,7 +941,7 @@
    "collapsible": 1,
    "fieldname": "printing_details",
    "fieldtype": "Section Break",
-   "label": "Printing Details"
+   "label": "Print Settings"
   },
   {
    "fieldname": "language",
@@ -1120,7 +1120,7 @@
    "allow_on_submit": 1,
    "fieldname": "sales_team",
    "fieldtype": "Table",
-   "label": "Sales Team1",
+   "label": "Sales Team",
    "oldfieldname": "sales_team",
    "oldfieldtype": "Table",
    "options": "Sales Team",
@@ -1176,7 +1176,7 @@
  "icon": "fa fa-file-text",
  "idx": 105,
  "is_submittable": 1,
- "modified": "2019-09-12 02:13:56.308839",
+ "modified": "2019-09-27 14:23:52.233323",
  "modified_by": "Administrator",
  "module": "Selling",
  "name": "Sales Order",
diff --git a/erpnext/setup/doctype/company/company.py b/erpnext/setup/doctype/company/company.py
index 584391e..9eb3748 100644
--- a/erpnext/setup/doctype/company/company.py
+++ b/erpnext/setup/doctype/company/company.py
@@ -64,16 +64,19 @@
 		})
 
 	def validate_default_accounts(self):
-		for field in ["default_bank_account", "default_cash_account",
+		accounts = [
+			"default_bank_account", "default_cash_account",
 			"default_receivable_account", "default_payable_account",
 			"default_expense_account", "default_income_account",
 			"stock_received_but_not_billed", "stock_adjustment_account",
-			"expenses_included_in_valuation", "default_payroll_payable_account"]:
-				if self.get(field):
-					for_company = frappe.db.get_value("Account", self.get(field), "company")
-					if for_company != self.name:
-						frappe.throw(_("Account {0} does not belong to company: {1}")
-							.format(self.get(field), self.name))
+			"expenses_included_in_valuation", "default_payroll_payable_account"
+		]
+
+		for field in accounts:
+			if self.get(field):
+				for_company = frappe.db.get_value("Account", self.get(field), "company")
+				if for_company != self.name:
+					frappe.throw(_("Account {0} does not belong to company: {1}").format(self.get(field), self.name))
 
 	def validate_currency(self):
 		if self.is_new():
@@ -180,21 +183,29 @@
 			self.existing_company = self.parent_company
 
 	def set_default_accounts(self):
-		self._set_default_account("default_cash_account", "Cash")
-		self._set_default_account("default_bank_account", "Bank")
-		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")
+		default_accounts = {
+			"default_cash_account": "Cash",
+			"default_bank_account": "Bank",
+			"round_off_account": "Round Off",
+			"accumulated_depreciation_account": "Accumulated Depreciation",
+			"depreciation_expense_account": "Depreciation",
+			"capital_work_in_progress_account": "Capital Work in Progress",
+			"asset_received_but_not_billed": "Asset Received But Not Billed",
+			"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")
-			self._set_default_account("default_inventory_account", "Stock")
-			self._set_default_account("stock_adjustment_account", "Stock Adjustment")
-			self._set_default_account("expenses_included_in_valuation", "Expenses Included In Valuation")
-			self._set_default_account("default_expense_account", "Cost of Goods Sold")
+			default_accounts.update({
+				"stock_received_but_not_billed": "Stock Received But Not Billed",
+				"default_inventory_account": "Stock",
+				"stock_adjustment_account": "Stock Adjustment",
+				"expenses_included_in_valuation": "Expenses Included In Valuation",
+				"default_expense_account": "Cost of Goods Sold"
+			})
+
+		for default_account in default_accounts:
+			if self.is_new() or frappe.flags.in_test:
+				self._set_default_account(default_account, default_accounts.get(default_account))
 
 		if not self.default_income_account:
 			income_account = frappe.db.get_value("Account",
@@ -243,8 +254,7 @@
 		if self.get(fieldname):
 			return
 
-		account = frappe.db.get_value("Account", {"account_type": account_type,
-			"is_group": 0, "company": self.name})
+		account = frappe.db.get_value("Account", {"account_type": account_type, "is_group": 0, "company": self.name})
 
 		if account:
 			self.db_set(fieldname, account)
diff --git a/erpnext/setup/setup_wizard/setup_wizard.py b/erpnext/setup/setup_wizard/setup_wizard.py
index b293f5d..e74d837 100644
--- a/erpnext/setup/setup_wizard/setup_wizard.py
+++ b/erpnext/setup/setup_wizard/setup_wizard.py
@@ -65,7 +65,12 @@
 						'fn': stage_four,
 						'args': args,
 						'fail_msg': _("Failed to create website")
-					}
+					},
+					{
+						'fn': set_active_domains,
+						'args': args,
+						'fail_msg': _("Failed to add Domain")
+					},
 				]
 			},
 			{
@@ -128,3 +133,7 @@
 	setup_defaults(args)
 	stage_four(args)
 	fin(args)
+
+def set_active_domains(args):
+	domain_settings = frappe.get_single('Domain Settings')
+	domain_settings.set_active_domains(args.get('domains'))
diff --git a/erpnext/startup/leaderboard.py b/erpnext/startup/leaderboard.py
new file mode 100644
index 0000000..90ecd46
--- /dev/null
+++ b/erpnext/startup/leaderboard.py
@@ -0,0 +1,177 @@
+
+from __future__ import unicode_literals, print_function
+import frappe
+from frappe.utils import cint
+
+def get_leaderboards():
+	leaderboards = {
+		"Customer": {
+			"fields": [
+				{'fieldname': 'total_sales_amount', 'fieldtype': 'Currency'},
+				'total_qty_sold',
+				{'fieldname': 'outstanding_amount', 'fieldtype': 'Currency'}
+			],
+			"method": "erpnext.startup.leaderboard.get_all_customers",
+		},
+		"Item": {
+			"fields": [
+				{'fieldname': 'total_sales_amount', 'fieldtype': 'Currency'},
+				'total_qty_sold',
+				{'fieldname': 'total_purchase_amount', 'fieldtype': 'Currency'},
+				'total_qty_purchased',
+				'available_stock_qty',
+				{'fieldname': 'available_stock_value', 'fieldtype': 'Currency'}
+			],
+			"method": "erpnext.startup.leaderboard.get_all_items",
+		},
+		"Supplier": {
+			"fields": [
+				{'fieldname': 'total_purchase_amount', 'fieldtype': 'Currency'},
+				'total_qty_purchased',
+				{'fieldname': 'outstanding_amount', 'fieldtype': 'Currency'}
+			],
+			"method": "erpnext.startup.leaderboard.get_all_suppliers",
+		},
+		"Sales Partner": {
+			"fields": [
+				{'fieldname': 'total_sales_amount', 'fieldtype': 'Currency'},
+				{'fieldname': 'total_commission', 'fieldtype': 'Currency'}
+			],
+			"method": "erpnext.startup.leaderboard.get_all_sales_partner",
+		},
+		"Sales Person": {
+			"fields": [
+				{'fieldname': 'total_sales_amount', 'fieldtype': 'Currency'}
+			],
+			"method": "erpnext.startup.leaderboard.get_all_sales_person",
+		}
+	}
+
+	return leaderboards
+
+@frappe.whitelist()
+def get_all_customers(from_date, company, field, limit = None):
+	if field == "outstanding_amount":
+		filters = [['docstatus', '=', '1'], ['company', '=', company]]
+		if from_date:
+			filters.append(['posting_date', '>=', from_date])
+		return frappe.db.get_all('Sales Invoice',
+			fields = ['customer as name', 'sum(outstanding_amount) as value'],
+			filters = filters,
+			group_by = 'customer',
+			order_by = 'value desc',
+			limit = limit
+		)
+	else:
+		if field == "total_sales_amount":
+			select_field = "sum(so_item.base_net_amount)"
+		elif field == "total_qty_sold":
+			select_field = "sum(so_item.stock_qty)"
+
+		return frappe.db.sql("""
+			select so.customer as name, {0} as value
+			FROM `tabSales Order` as so JOIN `tabSales Order Item` as so_item
+				ON so.name = so_item.parent
+			where so.docstatus = 1 and so.transaction_date >= %s and so.company = %s
+			group by so.customer
+			order by value DESC
+			limit %s
+		""".format(select_field), (from_date, company, cint(limit)), as_dict=1) #nosec
+
+@frappe.whitelist()
+def get_all_items(from_date, company, field, limit = None):
+	if field in ("available_stock_qty", "available_stock_value"):
+		select_field = "sum(actual_qty)" if field=="available_stock_qty" else "sum(stock_value)"
+		return frappe.db.get_all('Bin',
+			fields = ['item_code as name', '{0} as value'.format(select_field)],
+			group_by = 'item_code',
+			order_by = 'value desc',
+			limit = limit
+		)
+	else:
+		if field == "total_sales_amount":
+			select_field = "sum(order_item.base_net_amount)"
+			select_doctype = "Sales Order"
+		elif field == "total_purchase_amount":
+			select_field = "sum(order_item.base_net_amount)"
+			select_doctype = "Purchase Order"
+		elif field == "total_qty_sold":
+			select_field = "sum(order_item.stock_qty)"
+			select_doctype = "Sales Order"
+		elif field == "total_qty_purchased":
+			select_field = "sum(order_item.stock_qty)"
+			select_doctype = "Purchase Order"
+
+		return frappe.db.sql("""
+			select order_item.item_code as name, {0} as value
+			from `tab{1}` sales_order join `tab{1} Item` as order_item
+				on sales_order.name = order_item.parent
+			where sales_order.docstatus = 1
+				and sales_order.company = %s and sales_order.transaction_date >= %s
+			group by order_item.item_code
+			order by value desc
+			limit %s
+		""".format(select_field, select_doctype), (company, from_date, cint(limit)), as_dict=1) #nosec
+
+@frappe.whitelist()
+def get_all_suppliers(from_date, company, field, limit = None):
+	if field == "outstanding_amount":
+		filters = [['docstatus', '=', '1'], ['company', '=', company]]
+		if from_date:
+			filters.append(['posting_date', '>=', from_date])
+		return frappe.db.get_all('Purchase Invoice',
+			fields = ['supplier as name', 'sum(outstanding_amount) as value'],
+			filters = filters,
+			group_by = 'supplier',
+			order_by = 'value desc',
+			limit = limit
+		)
+	else:
+		if field == "total_purchase_amount":
+			select_field = "sum(purchase_order_item.base_net_amount)"
+		elif field == "total_qty_purchased":
+			select_field = "sum(purchase_order_item.stock_qty)"
+
+		return frappe.db.sql("""
+			select purchase_order.supplier as name, {0} as value
+			FROM `tabPurchase Order` as purchase_order LEFT JOIN `tabPurchase Order Item`
+				as purchase_order_item ON purchase_order.name = purchase_order_item.parent
+			where purchase_order.docstatus = 1 and  purchase_order.modified >= %s
+				and  purchase_order.company = %s
+			group by purchase_order.supplier
+			order by value DESC
+			limit %s""".format(select_field), (from_date, company, cint(limit)), as_dict=1) #nosec
+
+@frappe.whitelist()
+def get_all_sales_partner(from_date, company, field, limit = None):
+	if field == "total_sales_amount":
+		select_field = "sum(`base_net_total`)"
+	elif field == "total_commission":
+		select_field = "sum(`total_commission`)"
+
+	filters = {
+		'sales_partner': ['!=', ''],
+		'docstatus': 1,
+		'company': company
+	}
+	if from_date:
+		filters['transaction_date'] = ['>=', from_date]
+
+	return frappe.get_list('Sales Order', fields=[
+		'`sales_partner` as name',
+		'{} as value'.format(select_field),
+	], filters=filters, group_by='sales_partner', order_by='value DESC', limit=limit)
+
+@frappe.whitelist()
+def get_all_sales_person(from_date, company, field = None, limit = 0):
+	return frappe.db.sql("""
+		select sales_team.sales_person as name, sum(sales_order.base_net_total) as value
+		from `tabSales Order` as sales_order join `tabSales Team` as sales_team
+			on sales_order.name = sales_team.parent and sales_team.parenttype = 'Sales Order'
+		where sales_order.docstatus = 1
+			and sales_order.transaction_date >= %s
+			and sales_order.company = %s
+		group by sales_team.sales_person
+		order by value DESC
+		limit %s
+	""", (from_date, company, cint(limit)), as_dict=1)
diff --git a/erpnext/stock/doctype/delivery_note/delivery_note.json b/erpnext/stock/doctype/delivery_note/delivery_note.json
index 1116273..3c6fb48 100644
--- a/erpnext/stock/doctype/delivery_note/delivery_note.json
+++ b/erpnext/stock/doctype/delivery_note/delivery_note.json
@@ -4,6 +4,7 @@
  "creation": "2013-05-24 19:29:09",
  "doctype": "DocType",
  "document_type": "Document",
+ "engine": "InnoDB",
  "field_order": [
   "delivery_to_section",
   "column_break0",
@@ -1026,7 +1027,7 @@
    "collapsible": 1,
    "fieldname": "printing_details",
    "fieldtype": "Section Break",
-   "label": "Printing Details"
+   "label": "Print Settings"
   },
   {
    "allow_on_submit": 1,
@@ -1237,7 +1238,7 @@
  "icon": "fa fa-truck",
  "idx": 146,
  "is_submittable": 1,
- "modified": "2019-08-26 07:37:39.766014",
+ "modified": "2019-09-27 14:24:20.269682",
  "modified_by": "Administrator",
  "module": "Stock",
  "name": "Delivery Note",
diff --git a/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js b/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js
index 2e8bc64..aef53ed 100644
--- a/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js
+++ b/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js
@@ -115,12 +115,12 @@
 					cur_frm.add_custom_button(__("Close"), this.close_purchase_receipt, __("Status"))
 				}
 
-				cur_frm.add_custom_button(__('Return'), this.make_purchase_return, __('Create'));
+				cur_frm.add_custom_button(__('Purchase Return'), this.make_purchase_return, __('Create'));
 
 				cur_frm.add_custom_button(__('Make Stock Entry'), cur_frm.cscript['Make Stock Entry'], __('Create'));
 
 				if(flt(this.frm.doc.per_billed) < 100) {
-					cur_frm.add_custom_button(__('Invoice'), this.make_purchase_invoice, __('Create'));
+					cur_frm.add_custom_button(__('Purchase Invoice'), this.make_purchase_invoice, __('Create'));
 				}
 				cur_frm.add_custom_button(__('Retention Stock Entry'), this.make_retention_stock_entry, __('Create'));
 
diff --git a/erpnext/stock/doctype/purchase_receipt/purchase_receipt.json b/erpnext/stock/doctype/purchase_receipt/purchase_receipt.json
index 3ddcd95..d6bc1a9 100755
--- a/erpnext/stock/doctype/purchase_receipt/purchase_receipt.json
+++ b/erpnext/stock/doctype/purchase_receipt/purchase_receipt.json
@@ -1,3924 +1,1126 @@
 {
- "allow_copy": 0, 
- "allow_events_in_timeline": 0, 
- "allow_guest_to_view": 0, 
- "allow_import": 1, 
- "allow_rename": 0, 
- "autoname": "naming_series:", 
- "beta": 0, 
- "creation": "2013-05-21 16:16:39", 
- "custom": 0, 
- "docstatus": 0, 
- "doctype": "DocType", 
- "document_type": "Document", 
- "editable_grid": 1, 
+ "allow_import": 1,
+ "autoname": "naming_series:",
+ "creation": "2013-05-21 16:16:39",
+ "doctype": "DocType",
+ "document_type": "Document",
+ "editable_grid": 1,
+ "engine": "InnoDB",
+ "field_order": [
+  "supplier_section",
+  "column_break0",
+  "title",
+  "naming_series",
+  "supplier",
+  "supplier_name",
+  "supplier_delivery_note",
+  "column_break1",
+  "posting_date",
+  "posting_time",
+  "set_posting_time",
+  "company",
+  "is_return",
+  "return_against",
+  "section_addresses",
+  "supplier_address",
+  "contact_person",
+  "address_display",
+  "contact_display",
+  "contact_mobile",
+  "contact_email",
+  "col_break_address",
+  "shipping_address",
+  "shipping_address_display",
+  "currency_and_price_list",
+  "currency",
+  "conversion_rate",
+  "column_break2",
+  "buying_price_list",
+  "price_list_currency",
+  "plc_conversion_rate",
+  "ignore_pricing_rule",
+  "sec_warehouse",
+  "set_warehouse",
+  "rejected_warehouse",
+  "col_break_warehouse",
+  "is_subcontracted",
+  "supplier_warehouse",
+  "items_section",
+  "items",
+  "pricing_rule_details",
+  "pricing_rules",
+  "get_current_stock",
+  "raw_material_details",
+  "supplied_items",
+  "section_break0",
+  "total_qty",
+  "base_total",
+  "base_net_total",
+  "column_break_27",
+  "total",
+  "net_total",
+  "total_net_weight",
+  "taxes_charges_section",
+  "tax_category",
+  "shipping_col",
+  "shipping_rule",
+  "taxes_section",
+  "taxes_and_charges",
+  "taxes",
+  "sec_tax_breakup",
+  "other_charges_calculation",
+  "totals",
+  "base_taxes_and_charges_added",
+  "base_taxes_and_charges_deducted",
+  "base_total_taxes_and_charges",
+  "column_break3",
+  "taxes_and_charges_added",
+  "taxes_and_charges_deducted",
+  "total_taxes_and_charges",
+  "section_break_42",
+  "apply_discount_on",
+  "base_discount_amount",
+  "column_break_44",
+  "additional_discount_percentage",
+  "discount_amount",
+  "section_break_46",
+  "base_grand_total",
+  "base_rounding_adjustment",
+  "base_in_words",
+  "base_rounded_total",
+  "column_break_50",
+  "grand_total",
+  "rounding_adjustment",
+  "rounded_total",
+  "in_words",
+  "disable_rounded_total",
+  "terms_section_break",
+  "tc_name",
+  "terms",
+  "bill_no",
+  "bill_date",
+  "more_info",
+  "status",
+  "amended_from",
+  "range",
+  "column_break4",
+  "per_billed",
+  "subscription_detail",
+  "auto_repeat",
+  "printing_settings",
+  "letter_head",
+  "select_print_heading",
+  "language",
+  "group_same_items",
+  "column_break_97",
+  "other_details",
+  "instructions",
+  "remarks",
+  "transporter_info",
+  "transporter_name",
+  "column_break5",
+  "lr_no",
+  "lr_date"
+ ],
  "fields": [
   {
-   "allow_bulk_edit": 0, 
-   "allow_in_quick_entry": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "supplier_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_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, 
-   "oldfieldtype": "Column Break", 
-   "permlevel": 0, 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "print_width": "50%", 
-   "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_in_quick_entry": 0, 
-   "allow_on_submit": 1, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "default": "{supplier_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, 
-   "options": "", 
-   "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, 
-   "default": "", 
-   "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": "MAT-PRE-.YYYY.-", 
-   "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_in_quick_entry": 0, 
-   "allow_on_submit": 0, 
-   "bold": 1, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "supplier", 
-   "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": "Supplier", 
-   "length": 0, 
-   "no_copy": 0, 
-   "oldfieldname": "supplier", 
-   "oldfieldtype": "Link", 
-   "options": "Supplier", 
-   "permlevel": 0, 
-   "print_hide": 1, 
-   "print_hide_if_no_value": 0, 
-   "print_width": "150px", 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 1, 
-   "search_index": 1, 
-   "set_only_once": 0, 
-   "translatable": 0, 
-   "unique": 0, 
-   "width": "150px"
-  }, 
-  {
-   "allow_bulk_edit": 0, 
-   "allow_in_quick_entry": 0, 
-   "allow_on_submit": 0, 
-   "bold": 1, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "depends_on": "supplier", 
-   "fetch_from": "supplier.supplier_name", 
-   "fieldname": "supplier_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": "Supplier Name", 
-   "length": 0, 
-   "no_copy": 0, 
-   "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_in_quick_entry": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "supplier_delivery_note", 
-   "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 Delivery Note", 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "translatable": 0, 
-   "unique": 0
+   "fieldname": "supplier_section",
+   "fieldtype": "Section Break",
+   "options": "fa fa-user"
   },
   {
-   "allow_bulk_edit": 0, 
-   "allow_in_quick_entry": 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, 
-   "print_width": "50%", 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "translatable": 0, 
-   "unique": 0, 
+   "fieldname": "column_break0",
+   "fieldtype": "Column Break",
+   "oldfieldtype": "Column Break",
+   "print_width": "50%",
    "width": "50%"
-  }, 
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_in_quick_entry": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "default": "Today", 
-   "depends_on": "", 
-   "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": "Date", 
-   "length": 0, 
-   "no_copy": 1, 
-   "oldfieldname": "posting_date", 
-   "oldfieldtype": "Date", 
-   "permlevel": 0, 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "print_width": "100px", 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 1, 
-   "search_index": 1, 
-   "set_only_once": 0, 
-   "translatable": 0, 
-   "unique": 0, 
-   "width": "100px"
-  }, 
+   "allow_on_submit": 1,
+   "default": "{supplier_name}",
+   "fieldname": "title",
+   "fieldtype": "Data",
+   "hidden": 1,
+   "label": "Title",
+   "no_copy": 1,
+   "print_hide": 1
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_in_quick_entry": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "depends_on": "", 
-   "description": "Time at which materials were received", 
-   "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, 
-   "print_width": "100px", 
-   "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": "100px"
-  }, 
+   "fieldname": "naming_series",
+   "fieldtype": "Select",
+   "label": "Series",
+   "no_copy": 1,
+   "oldfieldname": "naming_series",
+   "oldfieldtype": "Select",
+   "options": "MAT-PRE-.YYYY.-",
+   "print_hide": 1,
+   "reqd": 1,
+   "set_only_once": 1
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_in_quick_entry": 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_in_quick_entry": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "description": "", 
-   "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, 
-   "print_width": "150px", 
-   "read_only": 0, 
-   "remember_last_selected_value": 1, 
-   "report_hide": 0, 
-   "reqd": 1, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "translatable": 0, 
-   "unique": 0, 
+   "bold": 1,
+   "fieldname": "supplier",
+   "fieldtype": "Link",
+   "in_global_search": 1,
+   "label": "Supplier",
+   "oldfieldname": "supplier",
+   "oldfieldtype": "Link",
+   "options": "Supplier",
+   "print_hide": 1,
+   "print_width": "150px",
+   "reqd": 1,
+   "search_index": 1,
    "width": "150px"
-  }, 
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_in_quick_entry": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "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
-  }, 
+   "bold": 1,
+   "depends_on": "supplier",
+   "fetch_from": "supplier.supplier_name",
+   "fieldname": "supplier_name",
+   "fieldtype": "Data",
+   "in_global_search": 1,
+   "label": "Supplier Name",
+   "read_only": 1
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_in_quick_entry": 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 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
-  }, 
+   "fieldname": "supplier_delivery_note",
+   "fieldtype": "Data",
+   "label": "Supplier Delivery Note"
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_in_quick_entry": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 1, 
-   "columns": 0, 
-   "fieldname": "section_addresses", 
-   "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_in_quick_entry": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "supplier_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": "Select Supplier 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_in_quick_entry": 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": 0, 
-   "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_in_quick_entry": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "depends_on": "", 
-   "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_in_quick_entry": 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": 1, 
-   "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_in_quick_entry": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "contact_mobile", 
-   "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": "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_in_quick_entry": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "contact_email", 
-   "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 Email", 
-   "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_in_quick_entry": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "col_break_address", 
-   "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, 
-   "depends_on": "", 
-   "fieldname": "shipping_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": "Select Shipping Address", 
-   "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_in_quick_entry": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "shipping_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": "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_in_quick_entry": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 1, 
-   "columns": 0, 
-   "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": "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_in_quick_entry": 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_in_quick_entry": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "description": "Rate at which supplier's currency is converted to company'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_in_quick_entry": 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, 
-   "oldfieldtype": "Column Break", 
-   "permlevel": 0, 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "print_width": "50%", 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "translatable": 0, 
-   "unique": 0, 
+   "fieldname": "column_break1",
+   "fieldtype": "Column Break",
+   "oldfieldtype": "Column Break",
+   "print_width": "50%",
    "width": "50%"
-  }, 
+  },
   {
-   "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": "Price List", 
-   "length": 0, 
-   "no_copy": 0, 
-   "options": "Price List", 
-   "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
-  }, 
+   "default": "Today",
+   "fieldname": "posting_date",
+   "fieldtype": "Date",
+   "in_list_view": 1,
+   "label": "Date",
+   "no_copy": 1,
+   "oldfieldname": "posting_date",
+   "oldfieldtype": "Date",
+   "print_width": "100px",
+   "reqd": 1,
+   "search_index": 1,
+   "width": "100px"
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_in_quick_entry": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "depends_on": "buying_price_list", 
-   "fieldname": "price_list_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": "Price List Currency", 
-   "length": 0, 
-   "no_copy": 0, 
-   "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
-  }, 
+   "description": "Time at which materials were received",
+   "fieldname": "posting_time",
+   "fieldtype": "Time",
+   "label": "Posting Time",
+   "no_copy": 1,
+   "oldfieldname": "posting_time",
+   "oldfieldtype": "Time",
+   "print_hide": 1,
+   "print_width": "100px",
+   "reqd": 1,
+   "width": "100px"
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_in_quick_entry": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "depends_on": "buying_price_list", 
-   "fieldname": "plc_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": "Price List Exchange Rate", 
-   "length": 0, 
-   "no_copy": 0, 
-   "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": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "translatable": 0, 
-   "unique": 0
-  }, 
+   "default": "0",
+   "depends_on": "eval:doc.docstatus==0",
+   "fieldname": "set_posting_time",
+   "fieldtype": "Check",
+   "label": "Edit Posting Date and Time",
+   "print_hide": 1
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_in_quick_entry": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "ignore_pricing_rule", 
-   "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": "Ignore Pricing Rule", 
-   "length": 0, 
-   "no_copy": 1, 
-   "permlevel": 1, 
-   "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
-  }, 
+   "fieldname": "company",
+   "fieldtype": "Link",
+   "in_standard_filter": 1,
+   "label": "Company",
+   "oldfieldname": "company",
+   "oldfieldtype": "Link",
+   "options": "Company",
+   "print_hide": 1,
+   "print_width": "150px",
+   "remember_last_selected_value": 1,
+   "reqd": 1,
+   "width": "150px"
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_in_quick_entry": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "sec_warehouse", 
-   "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
-  }, 
+   "default": "0",
+   "fieldname": "is_return",
+   "fieldtype": "Check",
+   "label": "Is Return",
+   "no_copy": 1,
+   "print_hide": 1,
+   "read_only": 1
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_in_quick_entry": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "set_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": "Set Accepted Warehouse", 
-   "length": 0, 
-   "no_copy": 0, 
-   "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
-  }, 
+   "depends_on": "is_return",
+   "fieldname": "return_against",
+   "fieldtype": "Link",
+   "label": "Return Against Purchase Receipt",
+   "no_copy": 1,
+   "options": "Purchase Receipt",
+   "print_hide": 1,
+   "read_only": 1
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_in_quick_entry": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "description": "Warehouse where you are maintaining stock of rejected items", 
-   "fieldname": "rejected_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": "Rejected Warehouse", 
-   "length": 0, 
-   "no_copy": 1, 
-   "oldfieldname": "rejected_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
-  }, 
+   "collapsible": 1,
+   "fieldname": "section_addresses",
+   "fieldtype": "Section Break",
+   "label": "Address and Contact"
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_in_quick_entry": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "col_break_warehouse", 
-   "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
-  }, 
+   "fieldname": "supplier_address",
+   "fieldtype": "Link",
+   "label": "Select Supplier Address",
+   "options": "Address",
+   "print_hide": 1
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_in_quick_entry": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "default": "No", 
-   "description": "", 
-   "fieldname": "is_subcontracted", 
-   "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": "Raw Materials Supplied", 
-   "length": 0, 
-   "no_copy": 0, 
-   "oldfieldname": "is_subcontracted", 
-   "oldfieldtype": "Select", 
-   "options": "No\nYes", 
-   "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
-  }, 
+   "fieldname": "contact_person",
+   "fieldtype": "Link",
+   "label": "Contact Person",
+   "options": "Contact",
+   "print_hide": 1
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_in_quick_entry": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "depends_on": "eval:doc.is_subcontracted==\"Yes\"", 
-   "description": "", 
-   "fieldname": "supplier_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": "Supplier Warehouse", 
-   "length": 0, 
-   "no_copy": 1, 
-   "oldfieldname": "supplier_warehouse", 
-   "oldfieldtype": "Link", 
-   "options": "Warehouse", 
-   "permlevel": 0, 
-   "print_hide": 1, 
-   "print_hide_if_no_value": 0, 
-   "print_width": "50px", 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "translatable": 0, 
-   "unique": 0, 
+   "fieldname": "address_display",
+   "fieldtype": "Small Text",
+   "label": "Address",
+   "read_only": 1
+  },
+  {
+   "fieldname": "contact_display",
+   "fieldtype": "Small Text",
+   "in_global_search": 1,
+   "label": "Contact",
+   "read_only": 1
+  },
+  {
+   "fieldname": "contact_mobile",
+   "fieldtype": "Small Text",
+   "label": "Mobile No",
+   "read_only": 1
+  },
+  {
+   "fieldname": "contact_email",
+   "fieldtype": "Small Text",
+   "label": "Contact Email",
+   "print_hide": 1,
+   "read_only": 1
+  },
+  {
+   "fieldname": "col_break_address",
+   "fieldtype": "Column Break"
+  },
+  {
+   "fieldname": "shipping_address",
+   "fieldtype": "Link",
+   "label": "Select Shipping Address",
+   "options": "Address",
+   "print_hide": 1
+  },
+  {
+   "fieldname": "shipping_address_display",
+   "fieldtype": "Small Text",
+   "label": "Shipping Address",
+   "print_hide": 1,
+   "read_only": 1
+  },
+  {
+   "collapsible": 1,
+   "fieldname": "currency_and_price_list",
+   "fieldtype": "Section Break",
+   "label": "Currency and Price List",
+   "options": "fa fa-tag"
+  },
+  {
+   "fieldname": "currency",
+   "fieldtype": "Link",
+   "label": "Currency",
+   "oldfieldname": "currency",
+   "oldfieldtype": "Select",
+   "options": "Currency",
+   "print_hide": 1,
+   "reqd": 1
+  },
+  {
+   "description": "Rate at which supplier's currency is converted to company's base currency",
+   "fieldname": "conversion_rate",
+   "fieldtype": "Float",
+   "label": "Exchange Rate",
+   "oldfieldname": "conversion_rate",
+   "oldfieldtype": "Currency",
+   "precision": "9",
+   "print_hide": 1,
+   "reqd": 1
+  },
+  {
+   "fieldname": "column_break2",
+   "fieldtype": "Column Break",
+   "oldfieldtype": "Column Break",
+   "print_width": "50%",
+   "width": "50%"
+  },
+  {
+   "fieldname": "buying_price_list",
+   "fieldtype": "Link",
+   "label": "Price List",
+   "options": "Price List",
+   "print_hide": 1
+  },
+  {
+   "depends_on": "buying_price_list",
+   "fieldname": "price_list_currency",
+   "fieldtype": "Link",
+   "label": "Price List Currency",
+   "options": "Currency",
+   "print_hide": 1,
+   "read_only": 1
+  },
+  {
+   "depends_on": "buying_price_list",
+   "fieldname": "plc_conversion_rate",
+   "fieldtype": "Float",
+   "label": "Price List Exchange Rate",
+   "precision": "9",
+   "print_hide": 1
+  },
+  {
+   "default": "0",
+   "fieldname": "ignore_pricing_rule",
+   "fieldtype": "Check",
+   "label": "Ignore Pricing Rule",
+   "no_copy": 1,
+   "permlevel": 1,
+   "print_hide": 1
+  },
+  {
+   "fieldname": "sec_warehouse",
+   "fieldtype": "Section Break"
+  },
+  {
+   "fieldname": "set_warehouse",
+   "fieldtype": "Link",
+   "label": "Accepted Warehouse",
+   "options": "Warehouse",
+   "print_hide": 1
+  },
+  {
+   "description": "Warehouse where you are maintaining stock of rejected items",
+   "fieldname": "rejected_warehouse",
+   "fieldtype": "Link",
+   "label": "Rejected Warehouse",
+   "no_copy": 1,
+   "oldfieldname": "rejected_warehouse",
+   "oldfieldtype": "Link",
+   "options": "Warehouse",
+   "print_hide": 1
+  },
+  {
+   "fieldname": "col_break_warehouse",
+   "fieldtype": "Column Break"
+  },
+  {
+   "default": "No",
+   "fieldname": "is_subcontracted",
+   "fieldtype": "Select",
+   "label": "Raw Materials Supplied",
+   "oldfieldname": "is_subcontracted",
+   "oldfieldtype": "Select",
+   "options": "No\nYes",
+   "print_hide": 1
+  },
+  {
+   "depends_on": "eval:doc.is_subcontracted==\"Yes\"",
+   "fieldname": "supplier_warehouse",
+   "fieldtype": "Link",
+   "label": "Supplier Warehouse",
+   "no_copy": 1,
+   "oldfieldname": "supplier_warehouse",
+   "oldfieldtype": "Link",
+   "options": "Warehouse",
+   "print_hide": 1,
+   "print_width": "50px",
    "width": "50px"
-  }, 
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_in_quick_entry": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "items_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-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
-  }, 
+   "fieldname": "items_section",
+   "fieldtype": "Section Break",
+   "oldfieldtype": "Section Break",
+   "options": "fa fa-shopping-cart"
+  },
   {
-   "allow_bulk_edit": 1, 
-   "allow_in_quick_entry": 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": "Items", 
-   "length": 0, 
-   "no_copy": 0, 
-   "oldfieldname": "purchase_receipt_details", 
-   "oldfieldtype": "Table", 
-   "options": "Purchase Receipt Item", 
-   "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": 1,
+   "fieldname": "items",
+   "fieldtype": "Table",
+   "label": "Items",
+   "oldfieldname": "purchase_receipt_details",
+   "oldfieldtype": "Table",
+   "options": "Purchase Receipt Item",
+   "reqd": 1
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_in_quick_entry": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "pricing_rule_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": "Pricing Rules", 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "translatable": 0, 
-   "unique": 0
-  }, 
+   "fieldname": "pricing_rule_details",
+   "fieldtype": "Section Break",
+   "label": "Pricing Rules"
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_in_quick_entry": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "pricing_rules", 
-   "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": "Pricing Rule Detail", 
-   "length": 0, 
-   "no_copy": 0, 
-   "options": "Pricing Rule 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
-  }, 
+   "fieldname": "pricing_rules",
+   "fieldtype": "Table",
+   "label": "Pricing Rule Detail",
+   "options": "Pricing Rule Detail",
+   "read_only": 1
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_in_quick_entry": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "get_current_stock", 
-   "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 current stock", 
-   "length": 0, 
-   "no_copy": 0, 
-   "oldfieldtype": "Button", 
-   "options": "get_current_stock", 
-   "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
-  }, 
+   "fieldname": "get_current_stock",
+   "fieldtype": "Button",
+   "label": "Get current stock",
+   "oldfieldtype": "Button",
+   "options": "get_current_stock",
+   "print_hide": 1
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_in_quick_entry": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 1, 
-   "collapsible_depends_on": "supplied_items", 
-   "columns": 0, 
-   "description": "", 
-   "fieldname": "raw_material_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": "Raw Materials Supplied", 
-   "length": 0, 
-   "no_copy": 0, 
-   "oldfieldtype": "Section Break", 
-   "options": "fa fa-table", 
-   "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
-  }, 
+   "collapsible": 1,
+   "collapsible_depends_on": "supplied_items",
+   "fieldname": "raw_material_details",
+   "fieldtype": "Section Break",
+   "label": "Raw Materials Supplied",
+   "oldfieldtype": "Section Break",
+   "options": "fa fa-table",
+   "print_hide": 1,
+   "read_only": 1
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_in_quick_entry": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "supplied_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": "Supplied Items", 
-   "length": 0, 
-   "no_copy": 1, 
-   "oldfieldname": "pr_raw_material_details", 
-   "oldfieldtype": "Table", 
-   "options": "Purchase Receipt Item Supplied", 
-   "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
-  }, 
+   "fieldname": "supplied_items",
+   "fieldtype": "Table",
+   "label": "Supplied Items",
+   "no_copy": 1,
+   "oldfieldname": "pr_raw_material_details",
+   "oldfieldtype": "Table",
+   "options": "Purchase Receipt Item Supplied",
+   "print_hide": 1,
+   "read_only": 1
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_in_quick_entry": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "section_break0", 
-   "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, 
-   "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
-  }, 
+   "fieldname": "section_break0",
+   "fieldtype": "Section Break",
+   "oldfieldtype": "Section Break"
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_in_quick_entry": 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
-  }, 
+   "fieldname": "total_qty",
+   "fieldtype": "Float",
+   "label": "Total Quantity",
+   "read_only": 1
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_in_quick_entry": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "base_total", 
-   "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 (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
-  }, 
+   "fieldname": "base_total",
+   "fieldtype": "Currency",
+   "label": "Total (Company Currency)",
+   "options": "Company:company:default_currency",
+   "print_hide": 1,
+   "read_only": 1
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_in_quick_entry": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "base_net_total", 
-   "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 Total (Company Currency)", 
-   "length": 0, 
-   "no_copy": 0, 
-   "oldfieldname": "net_total", 
-   "oldfieldtype": "Currency", 
-   "options": "Company:company:default_currency", 
-   "permlevel": 0, 
-   "print_hide": 1, 
-   "print_hide_if_no_value": 0, 
-   "print_width": "150px", 
-   "read_only": 1, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 1, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "translatable": 0, 
-   "unique": 0, 
+   "fieldname": "base_net_total",
+   "fieldtype": "Currency",
+   "label": "Net Total (Company Currency)",
+   "oldfieldname": "net_total",
+   "oldfieldtype": "Currency",
+   "options": "Company:company:default_currency",
+   "print_hide": 1,
+   "print_width": "150px",
+   "read_only": 1,
+   "reqd": 1,
    "width": "150px"
-  }, 
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_in_quick_entry": 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, 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "translatable": 0, 
-   "unique": 0
-  }, 
+   "fieldname": "column_break_27",
+   "fieldtype": "Column Break"
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_in_quick_entry": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "total", 
-   "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", 
-   "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
-  }, 
+   "fieldname": "total",
+   "fieldtype": "Currency",
+   "label": "Total",
+   "options": "currency",
+   "read_only": 1
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_in_quick_entry": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "net_total", 
-   "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 Total", 
-   "length": 0, 
-   "no_copy": 0, 
-   "oldfieldname": "net_total_import", 
-   "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
-  }, 
+   "fieldname": "net_total",
+   "fieldtype": "Currency",
+   "label": "Net Total",
+   "oldfieldname": "net_total_import",
+   "oldfieldtype": "Currency",
+   "options": "currency",
+   "print_hide": 1,
+   "read_only": 1
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_in_quick_entry": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "total_net_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 Net 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
-  }, 
+   "fieldname": "total_net_weight",
+   "fieldtype": "Float",
+   "label": "Total Net Weight",
+   "print_hide": 1,
+   "read_only": 1
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_in_quick_entry": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "description": "Add / Edit Taxes and Charges", 
-   "fieldname": "taxes_charges_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-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
-  }, 
+   "description": "Add / Edit Taxes and Charges",
+   "fieldname": "taxes_charges_section",
+   "fieldtype": "Section Break",
+   "oldfieldtype": "Section Break",
+   "options": "fa fa-money"
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_in_quick_entry": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "tax_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 Category", 
-   "length": 0, 
-   "no_copy": 0, 
-   "options": "Tax Category", 
-   "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
-  }, 
+   "fieldname": "tax_category",
+   "fieldtype": "Link",
+   "label": "Tax Category",
+   "options": "Tax Category",
+   "print_hide": 1
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_in_quick_entry": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "shipping_col", 
-   "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
-  }, 
+   "fieldname": "shipping_col",
+   "fieldtype": "Column Break"
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_in_quick_entry": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "shipping_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": "Shipping Rule", 
-   "length": 0, 
-   "no_copy": 0, 
-   "options": "Shipping Rule", 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "translatable": 0, 
-   "unique": 0
-  }, 
+   "fieldname": "shipping_rule",
+   "fieldtype": "Link",
+   "label": "Shipping Rule",
+   "options": "Shipping Rule"
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_in_quick_entry": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "taxes_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, 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "translatable": 0, 
-   "unique": 0
-  }, 
+   "fieldname": "taxes_section",
+   "fieldtype": "Section Break"
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_in_quick_entry": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "description": "", 
-   "fieldname": "taxes_and_charges", 
-   "fieldtype": "Link", 
-   "hidden": 0, 
-   "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 Taxes and Charges Template", 
-   "length": 0, 
-   "no_copy": 0, 
-   "oldfieldname": "purchase_other_charges", 
-   "oldfieldtype": "Link", 
-   "options": "Purchase Taxes and Charges Template", 
-   "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
-  }, 
+   "fieldname": "taxes_and_charges",
+   "fieldtype": "Link",
+   "label": "Purchase Taxes and Charges Template",
+   "oldfieldname": "purchase_other_charges",
+   "oldfieldtype": "Link",
+   "options": "Purchase Taxes and Charges Template",
+   "print_hide": 1
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_in_quick_entry": 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": "Purchase Taxes and Charges", 
-   "length": 0, 
-   "no_copy": 0, 
-   "oldfieldname": "purchase_tax_details", 
-   "oldfieldtype": "Table", 
-   "options": "Purchase Taxes and Charges", 
-   "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
-  }, 
+   "fieldname": "taxes",
+   "fieldtype": "Table",
+   "label": "Purchase Taxes and Charges",
+   "oldfieldname": "purchase_tax_details",
+   "oldfieldtype": "Table",
+   "options": "Purchase Taxes and Charges"
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_in_quick_entry": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 1, 
-   "columns": 0, 
-   "fieldname": "sec_tax_breakup", 
-   "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": "Tax Breakup", 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "translatable": 0, 
-   "unique": 0
-  }, 
+   "collapsible": 1,
+   "fieldname": "sec_tax_breakup",
+   "fieldtype": "Section Break",
+   "label": "Tax Breakup"
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_in_quick_entry": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "other_charges_calculation", 
-   "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": "Taxes and Charges Calculation", 
-   "length": 0, 
-   "no_copy": 1, 
-   "oldfieldtype": "HTML", 
-   "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
-  }, 
+   "fieldname": "other_charges_calculation",
+   "fieldtype": "Text",
+   "label": "Taxes and Charges Calculation",
+   "no_copy": 1,
+   "oldfieldtype": "HTML",
+   "print_hide": 1,
+   "read_only": 1
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_in_quick_entry": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "description": "", 
-   "fieldname": "totals", 
-   "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-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
-  }, 
+   "fieldname": "totals",
+   "fieldtype": "Section Break",
+   "oldfieldtype": "Section Break",
+   "options": "fa fa-money"
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_in_quick_entry": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "base_taxes_and_charges_added", 
-   "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": "Taxes and Charges Added (Company Currency)", 
-   "length": 0, 
-   "no_copy": 0, 
-   "oldfieldname": "other_charges_added", 
-   "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
-  }, 
+   "fieldname": "base_taxes_and_charges_added",
+   "fieldtype": "Currency",
+   "label": "Taxes and Charges Added (Company Currency)",
+   "oldfieldname": "other_charges_added",
+   "oldfieldtype": "Currency",
+   "options": "Company:company:default_currency",
+   "print_hide": 1,
+   "read_only": 1
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_in_quick_entry": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "base_taxes_and_charges_deducted", 
-   "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": "Taxes and Charges Deducted (Company Currency)", 
-   "length": 0, 
-   "no_copy": 0, 
-   "oldfieldname": "other_charges_deducted", 
-   "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
-  }, 
+   "fieldname": "base_taxes_and_charges_deducted",
+   "fieldtype": "Currency",
+   "label": "Taxes and Charges Deducted (Company Currency)",
+   "oldfieldname": "other_charges_deducted",
+   "oldfieldtype": "Currency",
+   "options": "Company:company:default_currency",
+   "print_hide": 1,
+   "read_only": 1
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_in_quick_entry": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "base_total_taxes_and_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": "Total Taxes and Charges (Company Currency)", 
-   "length": 0, 
-   "no_copy": 0, 
-   "oldfieldname": "total_tax", 
-   "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
-  }, 
+   "fieldname": "base_total_taxes_and_charges",
+   "fieldtype": "Currency",
+   "label": "Total Taxes and Charges (Company Currency)",
+   "oldfieldname": "total_tax",
+   "oldfieldtype": "Currency",
+   "options": "Company:company:default_currency",
+   "print_hide": 1,
+   "read_only": 1
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_in_quick_entry": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "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, 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "print_width": "50%", 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "translatable": 0, 
-   "unique": 0, 
+   "fieldname": "column_break3",
+   "fieldtype": "Column Break",
+   "print_width": "50%",
    "width": "50%"
-  }, 
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_in_quick_entry": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "taxes_and_charges_added", 
-   "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": "Taxes and Charges Added", 
-   "length": 0, 
-   "no_copy": 0, 
-   "oldfieldname": "other_charges_added_import", 
-   "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
-  }, 
+   "fieldname": "taxes_and_charges_added",
+   "fieldtype": "Currency",
+   "label": "Taxes and Charges Added",
+   "oldfieldname": "other_charges_added_import",
+   "oldfieldtype": "Currency",
+   "options": "currency",
+   "print_hide": 1,
+   "read_only": 1
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_in_quick_entry": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "taxes_and_charges_deducted", 
-   "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": "Taxes and Charges Deducted", 
-   "length": 0, 
-   "no_copy": 0, 
-   "oldfieldname": "other_charges_deducted_import", 
-   "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
-  }, 
+   "fieldname": "taxes_and_charges_deducted",
+   "fieldtype": "Currency",
+   "label": "Taxes and Charges Deducted",
+   "oldfieldname": "other_charges_deducted_import",
+   "oldfieldtype": "Currency",
+   "options": "currency",
+   "print_hide": 1,
+   "read_only": 1
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_in_quick_entry": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "total_taxes_and_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": "Total Taxes and Charges", 
-   "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
-  }, 
+   "fieldname": "total_taxes_and_charges",
+   "fieldtype": "Currency",
+   "label": "Total Taxes and Charges",
+   "options": "currency",
+   "print_hide": 1,
+   "read_only": 1
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_in_quick_entry": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 1, 
-   "collapsible_depends_on": "discount_amount", 
-   "columns": 0, 
-   "fieldname": "section_break_42", 
-   "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": "Additional Discount", 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "translatable": 0, 
-   "unique": 0
-  }, 
+   "collapsible": 1,
+   "collapsible_depends_on": "discount_amount",
+   "fieldname": "section_break_42",
+   "fieldtype": "Section Break",
+   "label": "Additional Discount"
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_in_quick_entry": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "default": "Grand Total", 
-   "fieldname": "apply_discount_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": "Apply Additional Discount On", 
-   "length": 0, 
-   "no_copy": 0, 
-   "options": "\nGrand Total\nNet Total", 
-   "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
-  }, 
+   "default": "Grand Total",
+   "fieldname": "apply_discount_on",
+   "fieldtype": "Select",
+   "label": "Apply Additional Discount On",
+   "options": "\nGrand Total\nNet Total",
+   "print_hide": 1
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_in_quick_entry": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "base_discount_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": "Additional Discount 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
-  }, 
+   "fieldname": "base_discount_amount",
+   "fieldtype": "Currency",
+   "label": "Additional Discount Amount (Company Currency)",
+   "options": "Company:company:default_currency",
+   "print_hide": 1,
+   "read_only": 1
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_in_quick_entry": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "column_break_44", 
-   "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
-  }, 
+   "fieldname": "column_break_44",
+   "fieldtype": "Column Break"
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_in_quick_entry": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "additional_discount_percentage", 
-   "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": "Additional Discount Percentage", 
-   "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
-  }, 
+   "fieldname": "additional_discount_percentage",
+   "fieldtype": "Float",
+   "label": "Additional Discount Percentage",
+   "print_hide": 1
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_in_quick_entry": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "discount_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": "Additional Discount Amount", 
-   "length": 0, 
-   "no_copy": 0, 
-   "options": "currency", 
-   "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
-  }, 
+   "fieldname": "discount_amount",
+   "fieldtype": "Currency",
+   "label": "Additional Discount Amount",
+   "options": "currency",
+   "print_hide": 1
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_in_quick_entry": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "section_break_46", 
-   "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
-  }, 
+   "fieldname": "section_break_46",
+   "fieldtype": "Section Break"
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_in_quick_entry": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "base_grand_total", 
-   "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": "Grand Total (Company Currency)", 
-   "length": 0, 
-   "no_copy": 0, 
-   "oldfieldname": "grand_total", 
-   "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
-  }, 
+   "fieldname": "base_grand_total",
+   "fieldtype": "Currency",
+   "label": "Grand Total (Company Currency)",
+   "oldfieldname": "grand_total",
+   "oldfieldtype": "Currency",
+   "options": "Company:company:default_currency",
+   "print_hide": 1,
+   "read_only": 1
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_in_quick_entry": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "base_rounding_adjustment", 
-   "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": "Rounding Adjustment (Company Currency)", 
-   "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, 
-   "translatable": 0, 
-   "unique": 0
-  }, 
+   "fieldname": "base_rounding_adjustment",
+   "fieldtype": "Currency",
+   "label": "Rounding Adjustment (Company Currency)",
+   "no_copy": 1,
+   "options": "Company:company:default_currency",
+   "print_hide": 1,
+   "read_only": 1
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_in_quick_entry": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "description": "", 
-   "fieldname": "base_in_words", 
-   "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": "In Words (Company Currency)", 
-   "length": 0, 
-   "no_copy": 0, 
-   "oldfieldname": "in_words", 
-   "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": 0, 
-   "set_only_once": 0, 
-   "translatable": 0, 
-   "unique": 0
-  }, 
+   "fieldname": "base_in_words",
+   "fieldtype": "Data",
+   "label": "In Words (Company Currency)",
+   "oldfieldname": "in_words",
+   "oldfieldtype": "Data",
+   "print_hide": 1,
+   "read_only": 1
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_in_quick_entry": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "base_rounded_total", 
-   "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": "Rounded Total (Company Currency)", 
-   "length": 0, 
-   "no_copy": 0, 
-   "oldfieldname": "rounded_total", 
-   "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
-  }, 
+   "fieldname": "base_rounded_total",
+   "fieldtype": "Currency",
+   "label": "Rounded Total (Company Currency)",
+   "oldfieldname": "rounded_total",
+   "oldfieldtype": "Currency",
+   "options": "Company:company:default_currency",
+   "print_hide": 1,
+   "read_only": 1
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_in_quick_entry": 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
-  }, 
+   "fieldname": "column_break_50",
+   "fieldtype": "Column Break"
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_in_quick_entry": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "grand_total", 
-   "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": "Grand Total", 
-   "length": 0, 
-   "no_copy": 0, 
-   "oldfieldname": "grand_total_import", 
-   "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": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "translatable": 0, 
-   "unique": 0
-  }, 
+   "fieldname": "grand_total",
+   "fieldtype": "Currency",
+   "in_list_view": 1,
+   "label": "Grand Total",
+   "oldfieldname": "grand_total_import",
+   "oldfieldtype": "Currency",
+   "options": "currency",
+   "read_only": 1
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_in_quick_entry": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "rounding_adjustment", 
-   "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": "Rounding Adjustment", 
-   "length": 0, 
-   "no_copy": 1, 
-   "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
-  }, 
+   "fieldname": "rounding_adjustment",
+   "fieldtype": "Currency",
+   "label": "Rounding Adjustment",
+   "no_copy": 1,
+   "options": "currency",
+   "print_hide": 1,
+   "read_only": 1
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_in_quick_entry": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "depends_on": "eval:!doc.disable_rounded_total", 
-   "fieldname": "rounded_total", 
-   "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": "Rounded Total", 
-   "length": 0, 
-   "no_copy": 1, 
-   "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
-  }, 
+   "depends_on": "eval:!doc.disable_rounded_total",
+   "fieldname": "rounded_total",
+   "fieldtype": "Currency",
+   "label": "Rounded Total",
+   "no_copy": 1,
+   "options": "currency",
+   "print_hide": 1,
+   "read_only": 1
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_in_quick_entry": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "in_words", 
-   "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": "In Words", 
-   "length": 0, 
-   "no_copy": 0, 
-   "oldfieldname": "in_words_import", 
-   "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": 0, 
-   "set_only_once": 0, 
-   "translatable": 0, 
-   "unique": 0
-  }, 
+   "fieldname": "in_words",
+   "fieldtype": "Data",
+   "label": "In Words",
+   "oldfieldname": "in_words_import",
+   "oldfieldtype": "Data",
+   "print_hide": 1,
+   "read_only": 1
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_in_quick_entry": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "disable_rounded_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": "Disable Rounded 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
-  }, 
+   "default": "0",
+   "fieldname": "disable_rounded_total",
+   "fieldtype": "Check",
+   "label": "Disable Rounded Total"
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_in_quick_entry": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 1, 
-   "collapsible_depends_on": "terms", 
-   "columns": 0, 
-   "fieldname": "terms_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": "Terms and Conditions", 
-   "length": 0, 
-   "no_copy": 0, 
-   "oldfieldtype": "Section Break", 
-   "options": "fa fa-legal", 
-   "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
-  }, 
+   "collapsible": 1,
+   "collapsible_depends_on": "terms",
+   "fieldname": "terms_section_break",
+   "fieldtype": "Section Break",
+   "label": "Terms and Conditions",
+   "oldfieldtype": "Section Break",
+   "options": "fa fa-legal"
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_in_quick_entry": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "tc_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": "Terms", 
-   "length": 0, 
-   "no_copy": 0, 
-   "oldfieldname": "tc_name", 
-   "oldfieldtype": "Link", 
-   "options": "Terms and Conditions", 
-   "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
-  }, 
+   "fieldname": "tc_name",
+   "fieldtype": "Link",
+   "label": "Terms",
+   "oldfieldname": "tc_name",
+   "oldfieldtype": "Link",
+   "options": "Terms and Conditions",
+   "print_hide": 1
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_in_quick_entry": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "terms", 
-   "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": "Terms and Conditions", 
-   "length": 0, 
-   "no_copy": 0, 
-   "oldfieldname": "terms", 
-   "oldfieldtype": "Text Editor", 
-   "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
-  }, 
+   "fieldname": "terms",
+   "fieldtype": "Text Editor",
+   "label": "Terms and Conditions",
+   "oldfieldname": "terms",
+   "oldfieldtype": "Text Editor"
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_in_quick_entry": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "bill_no", 
-   "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": "Bill No", 
-   "length": 0, 
-   "no_copy": 0, 
-   "oldfieldname": "bill_no", 
-   "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
-  }, 
+   "fieldname": "bill_no",
+   "fieldtype": "Data",
+   "hidden": 1,
+   "label": "Bill No",
+   "oldfieldname": "bill_no",
+   "oldfieldtype": "Data",
+   "print_hide": 1
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_in_quick_entry": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "bill_date", 
-   "fieldtype": "Date", 
-   "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": "Bill Date", 
-   "length": 0, 
-   "no_copy": 0, 
-   "oldfieldname": "bill_date", 
-   "oldfieldtype": "Date", 
-   "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
-  }, 
+   "fieldname": "bill_date",
+   "fieldtype": "Date",
+   "hidden": 1,
+   "label": "Bill Date",
+   "oldfieldname": "bill_date",
+   "oldfieldtype": "Date",
+   "print_hide": 1
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_in_quick_entry": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 1, 
-   "columns": 0, 
-   "fieldname": "more_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": "More Information", 
-   "length": 0, 
-   "no_copy": 0, 
-   "oldfieldtype": "Section Break", 
-   "options": "fa fa-file-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
-  }, 
+   "collapsible": 1,
+   "fieldname": "more_info",
+   "fieldtype": "Section Break",
+   "label": "More Information",
+   "oldfieldtype": "Section Break",
+   "options": "fa fa-file-text"
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_in_quick_entry": 0, 
-   "allow_on_submit": 0, 
-   "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": 0, 
-   "in_standard_filter": 1, 
-   "label": "Status", 
-   "length": 0, 
-   "no_copy": 1, 
-   "oldfieldname": "status", 
-   "oldfieldtype": "Select", 
-   "options": "\nDraft\nTo Bill\nCompleted\nCancelled\nClosed", 
-   "permlevel": 0, 
-   "print_hide": 1, 
-   "print_hide_if_no_value": 0, 
-   "print_width": "150px", 
-   "read_only": 1, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 1, 
-   "search_index": 1, 
-   "set_only_once": 0, 
-   "translatable": 0, 
-   "unique": 0, 
+   "default": "Draft",
+   "fieldname": "status",
+   "fieldtype": "Select",
+   "in_standard_filter": 1,
+   "label": "Status",
+   "no_copy": 1,
+   "oldfieldname": "status",
+   "oldfieldtype": "Select",
+   "options": "\nDraft\nTo Bill\nCompleted\nCancelled\nClosed",
+   "print_hide": 1,
+   "print_width": "150px",
+   "read_only": 1,
+   "reqd": 1,
+   "search_index": 1,
    "width": "150px"
-  }, 
+  },
   {
-   "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": 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": "Amended From", 
-   "length": 0, 
-   "no_copy": 1, 
-   "oldfieldname": "amended_from", 
-   "oldfieldtype": "Data", 
-   "options": "Purchase Receipt", 
-   "permlevel": 0, 
-   "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, 
+   "fieldname": "amended_from",
+   "fieldtype": "Link",
+   "hidden": 1,
+   "ignore_user_permissions": 1,
+   "label": "Amended From",
+   "no_copy": 1,
+   "oldfieldname": "amended_from",
+   "oldfieldtype": "Data",
+   "options": "Purchase Receipt",
+   "print_hide": 1,
+   "print_width": "150px",
+   "read_only": 1,
    "width": "150px"
-  }, 
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_in_quick_entry": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "range", 
-   "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": "Range", 
-   "length": 0, 
-   "no_copy": 0, 
-   "oldfieldname": "range", 
-   "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
-  }, 
+   "fieldname": "range",
+   "fieldtype": "Data",
+   "hidden": 1,
+   "label": "Range",
+   "oldfieldname": "range",
+   "oldfieldtype": "Data",
+   "print_hide": 1
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_in_quick_entry": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "column_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, 
-   "oldfieldtype": "Column Break", 
-   "permlevel": 0, 
-   "print_hide": 1, 
-   "print_hide_if_no_value": 0, 
-   "print_width": "50%", 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "translatable": 0, 
-   "unique": 0, 
+   "fieldname": "column_break4",
+   "fieldtype": "Column Break",
+   "oldfieldtype": "Column Break",
+   "print_hide": 1,
+   "print_width": "50%",
    "width": "50%"
-  }, 
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_in_quick_entry": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "per_billed", 
-   "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": "% Amount Billed", 
-   "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
-  }, 
+   "fieldname": "per_billed",
+   "fieldtype": "Percent",
+   "label": "% Amount Billed",
+   "no_copy": 1,
+   "print_hide": 1,
+   "read_only": 1
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_in_quick_entry": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "subscription_detail", 
-   "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 Repeat Detail", 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "translatable": 0, 
-   "unique": 0
-  }, 
+   "fieldname": "subscription_detail",
+   "fieldtype": "Section Break",
+   "label": "Auto Repeat Detail"
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_in_quick_entry": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "auto_repeat", 
-   "fieldtype": "Link", 
-   "hidden": 0, 
-   "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 Repeat", 
-   "length": 0, 
-   "no_copy": 1, 
-   "options": "Auto Repeat", 
-   "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
-  }, 
+   "fieldname": "auto_repeat",
+   "fieldtype": "Link",
+   "label": "Auto Repeat",
+   "no_copy": 1,
+   "options": "Auto Repeat",
+   "print_hide": 1,
+   "read_only": 1
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_in_quick_entry": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 1, 
-   "columns": 0, 
-   "fieldname": "printing_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": "Printing 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
-  }, 
+   "collapsible": 1,
+   "fieldname": "printing_settings",
+   "fieldtype": "Section Break",
+   "label": "Printing Settings"
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_in_quick_entry": 0, 
-   "allow_on_submit": 1, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "letter_head", 
-   "fieldtype": "Link", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "label": "Letter Head", 
-   "length": 0, 
-   "no_copy": 0, 
-   "options": "Letter Head", 
-   "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_on_submit": 1,
+   "fieldname": "letter_head",
+   "fieldtype": "Link",
+   "label": "Letter Head",
+   "options": "Letter Head",
+   "print_hide": 1
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_in_quick_entry": 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, 
-   "translatable": 0, 
-   "unique": 0
-  }, 
+   "allow_on_submit": 1,
+   "fieldname": "select_print_heading",
+   "fieldtype": "Link",
+   "label": "Print Heading",
+   "no_copy": 1,
+   "oldfieldname": "select_print_heading",
+   "oldfieldtype": "Link",
+   "options": "Print Heading",
+   "print_hide": 1,
+   "report_hide": 1
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_in_quick_entry": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "language", 
-   "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": "Print Language", 
-   "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
-  }, 
+   "fieldname": "language",
+   "fieldtype": "Data",
+   "label": "Print Language",
+   "read_only": 1
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_in_quick_entry": 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, 
-   "translatable": 0, 
-   "unique": 0
-  }, 
+   "allow_on_submit": 1,
+   "default": "0",
+   "fieldname": "group_same_items",
+   "fieldtype": "Check",
+   "label": "Group same items",
+   "print_hide": 1
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_in_quick_entry": 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, 
-   "translatable": 0, 
-   "unique": 0
-  }, 
+   "fieldname": "column_break_97",
+   "fieldtype": "Column Break"
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_in_quick_entry": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "other_details", 
-   "fieldtype": "HTML", 
-   "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": "Other Details", 
-   "length": 0, 
-   "no_copy": 0, 
-   "oldfieldtype": "HTML", 
-   "options": "<div class=\"columnHeading\">Other Details</div>", 
-   "permlevel": 0, 
-   "print_hide": 1, 
-   "print_hide_if_no_value": 0, 
-   "print_width": "30%", 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "translatable": 0, 
-   "unique": 0, 
+   "fieldname": "other_details",
+   "fieldtype": "HTML",
+   "hidden": 1,
+   "label": "Other Details",
+   "oldfieldtype": "HTML",
+   "options": "<div class=\"columnHeading\">Other Details</div>",
+   "print_hide": 1,
+   "print_width": "30%",
    "width": "30%"
-  }, 
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_in_quick_entry": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "instructions", 
-   "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": "Instructions", 
-   "length": 0, 
-   "no_copy": 0, 
-   "oldfieldname": "instructions", 
-   "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
-  }, 
+   "fieldname": "instructions",
+   "fieldtype": "Small Text",
+   "label": "Instructions",
+   "oldfieldname": "instructions",
+   "oldfieldtype": "Text"
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_in_quick_entry": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "remarks", 
-   "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": "Remarks", 
-   "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
-  }, 
+   "fieldname": "remarks",
+   "fieldtype": "Small Text",
+   "label": "Remarks",
+   "print_hide": 1
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_in_quick_entry": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 1, 
-   "collapsible_depends_on": "transporter_name", 
-   "columns": 0, 
-   "fieldname": "transporter_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": "Transporter Details", 
-   "length": 0, 
-   "no_copy": 0, 
-   "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
-  }, 
+   "collapsible": 1,
+   "collapsible_depends_on": "transporter_name",
+   "fieldname": "transporter_info",
+   "fieldtype": "Section Break",
+   "label": "Transporter Details",
+   "options": "fa fa-truck"
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_in_quick_entry": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "transporter_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": "Transporter Name", 
-   "length": 0, 
-   "no_copy": 0, 
-   "oldfieldname": "transporter_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": 0, 
-   "set_only_once": 0, 
-   "translatable": 0, 
-   "unique": 0
-  }, 
+   "fieldname": "transporter_name",
+   "fieldtype": "Data",
+   "label": "Transporter Name",
+   "oldfieldname": "transporter_name",
+   "oldfieldtype": "Data"
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_in_quick_entry": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "column_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, 
-   "print_width": "50%", 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "translatable": 0, 
-   "unique": 0, 
+   "fieldname": "column_break5",
+   "fieldtype": "Column Break",
+   "print_width": "50%",
    "width": "50%"
-  }, 
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_in_quick_entry": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "description": "", 
-   "fieldname": "lr_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": "Vehicle Number", 
-   "length": 0, 
-   "no_copy": 1, 
-   "oldfieldname": "lr_no", 
-   "oldfieldtype": "Data", 
-   "permlevel": 0, 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "print_width": "100px", 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "translatable": 0, 
-   "unique": 0, 
+   "fieldname": "lr_no",
+   "fieldtype": "Data",
+   "label": "Vehicle Number",
+   "no_copy": 1,
+   "oldfieldname": "lr_no",
+   "oldfieldtype": "Data",
+   "print_width": "100px",
    "width": "100px"
-  }, 
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_in_quick_entry": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "description": "", 
-   "fieldname": "lr_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": "Vehicle Date", 
-   "length": 0, 
-   "no_copy": 1, 
-   "oldfieldname": "lr_date", 
-   "oldfieldtype": "Date", 
-   "permlevel": 0, 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "print_width": "100px", 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "translatable": 0, 
-   "unique": 0, 
+   "fieldname": "lr_date",
+   "fieldtype": "Date",
+   "label": "Vehicle Date",
+   "no_copy": 1,
+   "oldfieldname": "lr_date",
+   "oldfieldtype": "Date",
+   "print_width": "100px",
    "width": "100px"
   }
- ], 
- "has_web_view": 0, 
- "hide_heading": 0, 
- "hide_toolbar": 0, 
- "icon": "fa fa-truck", 
- "idx": 261, 
- "image_view": 0, 
- "in_create": 0, 
- "is_submittable": 1, 
- "issingle": 0, 
- "istable": 0, 
- "max_attachments": 0, 
- "menu_index": 0, 
- "modified": "2019-02-13 00:58:26.302834", 
- "modified_by": "Administrator", 
- "module": "Stock", 
- "name": "Purchase Receipt", 
- "owner": "Administrator", 
+ ],
+ "icon": "fa fa-truck",
+ "idx": 261,
+ "is_submittable": 1,
+ "modified": "2019-09-27 14:24:49.044505",
+ "modified_by": "Administrator",
+ "module": "Stock",
+ "name": "Purchase Receipt",
+ "owner": "Administrator",
  "permissions": [
   {
-   "amend": 1, 
-   "cancel": 1, 
-   "create": 1, 
-   "delete": 1, 
-   "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": 1, 
-   "submit": 1, 
+   "amend": 1,
+   "cancel": 1,
+   "create": 1,
+   "delete": 1,
+   "email": 1,
+   "print": 1,
+   "read": 1,
+   "report": 1,
+   "role": "Stock Manager",
+   "share": 1,
+   "submit": 1,
    "write": 1
-  }, 
+  },
   {
-   "amend": 1, 
-   "cancel": 1, 
-   "create": 1, 
-   "delete": 1, 
-   "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": 1, 
-   "submit": 1, 
+   "amend": 1,
+   "cancel": 1,
+   "create": 1,
+   "delete": 1,
+   "email": 1,
+   "print": 1,
+   "read": 1,
+   "report": 1,
+   "role": "Stock User",
+   "share": 1,
+   "submit": 1,
    "write": 1
-  }, 
+  },
   {
-   "amend": 1, 
-   "cancel": 1, 
-   "create": 1, 
-   "delete": 1, 
-   "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": 1, 
-   "submit": 1, 
+   "amend": 1,
+   "cancel": 1,
+   "create": 1,
+   "delete": 1,
+   "email": 1,
+   "print": 1,
+   "read": 1,
+   "report": 1,
+   "role": "Purchase User",
+   "share": 1,
+   "submit": 1,
    "write": 1
-  }, 
+  },
   {
-   "amend": 0, 
-   "cancel": 0, 
-   "create": 0, 
-   "delete": 0, 
-   "email": 0, 
-   "export": 0, 
-   "if_owner": 0, 
-   "import": 0, 
-   "permlevel": 0, 
-   "print": 0, 
-   "read": 1, 
-   "report": 1, 
-   "role": "Accounts User", 
-   "set_user_permissions": 0, 
-   "share": 0, 
-   "submit": 0, 
-   "write": 0
-  }, 
+   "read": 1,
+   "report": 1,
+   "role": "Accounts User"
+  },
   {
-   "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": "Stock Manager", 
-   "set_user_permissions": 0, 
-   "share": 0, 
-   "submit": 0, 
+   "permlevel": 1,
+   "read": 1,
+   "role": "Stock Manager",
    "write": 1
   }
- ], 
- "quick_entry": 0, 
- "read_only": 0, 
- "read_only_onload": 1, 
+ ],
  "search_fields": "status, posting_date, supplier",
- "show_name_in_global_search": 1, 
- "sort_field": "modified", 
- "sort_order": "DESC", 
- "timeline_field": "supplier", 
- "title_field": "title", 
- "track_changes": 1, 
- "track_seen": 0, 
- "track_views": 0
+ "show_name_in_global_search": 1,
+ "sort_field": "modified",
+ "sort_order": "DESC",
+ "timeline_field": "supplier",
+ "title_field": "title",
+ "track_changes": 1
 }
\ No newline at end of file
diff --git a/erpnext/utilities/page/__init__.py b/erpnext/stock/doctype/quick_stock_balance/__init__.py
similarity index 100%
copy from erpnext/utilities/page/__init__.py
copy to erpnext/stock/doctype/quick_stock_balance/__init__.py
diff --git a/erpnext/stock/doctype/quick_stock_balance/quick_stock_balance.js b/erpnext/stock/doctype/quick_stock_balance/quick_stock_balance.js
new file mode 100644
index 0000000..a6f7343
--- /dev/null
+++ b/erpnext/stock/doctype/quick_stock_balance/quick_stock_balance.js
@@ -0,0 +1,91 @@
+// Copyright (c) 2019, Frappe Technologies Pvt. Ltd. and contributors
+// For license information, please see license.txt
+
+frappe.ui.form.on('Quick Stock Balance', {
+
+	setup: (frm) => {
+		frm.set_query('item', () => {
+			if (!(frm.doc.warehouse && frm.doc.date)) {
+				frm.trigger('check_warehouse_and_date');
+			}
+		});
+	},
+
+	make_custom_stock_report_button: (frm) => {
+		if (frm.doc.item) {
+			frm.add_custom_button(__('Stock Balance Report'), () => {
+				frappe.set_route('query-report', 'Stock Balance',
+					{ 'item_code': frm.doc.item, 'warehouse': frm.doc.warehouse });
+			}).addClass("btn-primary");
+		}
+	},
+
+	refresh: (frm) => {
+		frm.disable_save();
+		frm.trigger('make_custom_stock_report_button');
+	},
+
+	check_warehouse_and_date: (frm) => {
+		frappe.msgprint(__('Please enter Warehouse and Date'));
+		frm.doc.item = '';
+		frm.refresh();
+	},
+
+	warehouse: (frm) => {
+		if (frm.doc.item || frm.doc.item_barcode) {
+			frm.trigger('get_stock_and_item_details');
+		}
+	},
+
+	date: (frm) => {
+		if (frm.doc.item || frm.doc.item_barcode) {
+			frm.trigger('get_stock_and_item_details');
+		}
+	},
+
+	item: (frm) => {
+		frappe.flags.last_updated_element = 'item';
+		frm.trigger('get_stock_and_item_details');
+		frm.trigger('make_custom_stock_report_button');
+	},
+
+	item_barcode: (frm) => {
+		frappe.flags.last_updated_element = 'item_barcode';
+		frm.trigger('get_stock_and_item_details');
+		frm.trigger('make_custom_stock_report_button');
+	},
+
+	get_stock_and_item_details: (frm) => {
+		if (!(frm.doc.warehouse && frm.doc.date)) {
+			frm.trigger('check_warehouse_and_date');
+		}
+		else if (frm.doc.item || frm.doc.item_barcode) {
+			let filters = {
+				warehouse: frm.doc.warehouse,
+				date: frm.doc.date,
+			};
+			if (frappe.flags.last_updated_element === 'item') {
+				filters = { ...filters, ...{ item: frm.doc.item }};
+			}
+			else {
+				filters = { ...filters, ...{ barcode: frm.doc.item_barcode }};
+			}
+			frappe.call({
+				method: 'erpnext.stock.doctype.quick_stock_balance.quick_stock_balance.get_stock_item_details',
+				args: filters,
+				callback: (r) => {
+					if (r.message) {
+						let fields = ['item', 'qty', 'value', 'image'];
+						if (!r.message['barcodes'].includes(frm.doc.item_barcode)) {
+							frm.doc.item_barcode = '';
+							frm.refresh();
+						}
+						fields.forEach(function (field) {
+							frm.set_value(field, r.message[field]);
+						});
+					}
+				}
+			});
+		}
+	}
+});
diff --git a/erpnext/stock/doctype/quick_stock_balance/quick_stock_balance.json b/erpnext/stock/doctype/quick_stock_balance/quick_stock_balance.json
new file mode 100644
index 0000000..34ae7e6
--- /dev/null
+++ b/erpnext/stock/doctype/quick_stock_balance/quick_stock_balance.json
@@ -0,0 +1,137 @@
+{
+ "_comments": "[]",
+ "allow_copy": 1,
+ "creation": "2019-09-06 12:01:33.933063",
+ "doctype": "DocType",
+ "editable_grid": 1,
+ "engine": "InnoDB",
+ "field_order": [
+  "warehouse",
+  "date",
+  "item_barcode",
+  "item",
+  "col_break",
+  "item_name",
+  "item_description",
+  "image",
+  "sec_break",
+  "qty",
+  "col_break2",
+  "value"
+ ],
+ "fields": [
+  {
+   "fieldname": "warehouse",
+   "fieldtype": "Link",
+   "in_list_view": 1,
+   "label": "Warehouse",
+   "options": "Warehouse",
+   "reqd": 1
+  },
+  {
+   "fieldname": "item",
+   "fieldtype": "Link",
+   "in_list_view": 1,
+   "label": "Item Code",
+   "options": "Item",
+   "reqd": 1
+  },
+  {
+   "fieldname": "col_break",
+   "fieldtype": "Column Break"
+  },
+  {
+   "fieldname": "item_barcode",
+   "fieldtype": "Data",
+   "label": "Item Barcode"
+  },
+  {
+   "fetch_from": "item.item_name",
+   "fieldname": "item_name",
+   "fieldtype": "Data",
+   "label": "Item Name",
+   "read_only": 1
+  },
+  {
+   "default": "  ",
+   "fetch_from": "item.description",
+   "fieldname": "item_description",
+   "fieldtype": "Small Text",
+   "label": "Item Description",
+   "read_only": 1
+  },
+  {
+   "fieldname": "sec_break",
+   "fieldtype": "Section Break"
+  },
+  {
+   "fieldname": "qty",
+   "fieldtype": "Float",
+   "label": "Available Quantity",
+   "read_only": 1
+  },
+  {
+   "fieldname": "col_break2",
+   "fieldtype": "Column Break"
+  },
+  {
+   "fieldname": "value",
+   "fieldtype": "Currency",
+   "label": "Stock Value",
+   "read_only": 1
+  },
+  {
+   "fieldname": "image",
+   "fieldtype": "Image",
+   "label": "Image View",
+   "options": "image",
+   "print_hide": 1
+  },
+  {
+   "default": "Today",
+   "fieldname": "date",
+   "fieldtype": "Date",
+   "in_list_view": 1,
+   "label": "Date",
+   "reqd": 1
+  }
+ ],
+ "hide_toolbar": 1,
+ "issingle": 1,
+ "modified": "2019-10-04 21:59:48.597497",
+ "modified_by": "Administrator",
+ "module": "Stock",
+ "name": "Quick Stock Balance",
+ "owner": "Administrator",
+ "permissions": [
+  {
+   "create": 1,
+   "delete": 1,
+   "read": 1,
+   "role": "System Manager",
+   "share": 1,
+   "write": 1
+  },
+  {
+   "create": 1,
+   "delete": 1,
+   "read": 1,
+   "role": "Stock User",
+   "share": 1,
+   "write": 1
+  },
+  {
+   "create": 1,
+   "delete": 1,
+   "read": 1,
+   "role": "Stock Manager",
+   "share": 1,
+   "write": 1
+  }
+ ],
+ "quick_entry": 1,
+ "show_name_in_global_search": 1,
+ "sort_field": "modified",
+ "sort_order": "DESC",
+ "track_changes": 1
+}
\ No newline at end of file
diff --git a/erpnext/stock/doctype/quick_stock_balance/quick_stock_balance.py b/erpnext/stock/doctype/quick_stock_balance/quick_stock_balance.py
new file mode 100644
index 0000000..efa9519
--- /dev/null
+++ b/erpnext/stock/doctype/quick_stock_balance/quick_stock_balance.py
@@ -0,0 +1,34 @@
+# -*- coding: utf-8 -*-
+# Copyright (c) 2019, 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.stock.utils import get_stock_balance, get_stock_value_on
+
+class QuickStockBalance(Document):
+	pass
+
+@frappe.whitelist()
+def get_stock_item_details(warehouse, date, item=None, barcode=None):
+	out = {}
+	if barcode:
+		out["item"] = frappe.db.get_value(
+			"Item Barcode", filters={"barcode": barcode}, fieldname=["parent"])
+		if not out["item"]:
+			frappe.throw(
+				_("Invalid Barcode. There is no Item attached to this barcode."))
+	else:
+		out["item"] = item
+
+	barcodes = frappe.db.get_values("Item Barcode", filters={"parent": out["item"]},
+		fieldname=["barcode"])
+
+	out["barcodes"] = [x[0] for x in barcodes]
+	out["qty"] = get_stock_balance(out["item"], warehouse, date)
+	out["value"] = get_stock_value_on(warehouse, date, out["item"])
+	out["image"] = frappe.db.get_value("Item",
+		filters={"name": out["item"]}, fieldname=["image"])
+	return out
diff --git a/erpnext/stock/doctype/stock_entry/stock_entry.json b/erpnext/stock/doctype/stock_entry/stock_entry.json
index 7bcefa0..bdd0bd0 100644
--- a/erpnext/stock/doctype/stock_entry/stock_entry.json
+++ b/erpnext/stock/doctype/stock_entry/stock_entry.json
@@ -335,7 +335,7 @@
    "depends_on": "to_warehouse",
    "fieldname": "target_warehouse_address",
    "fieldtype": "Link",
-   "label": "Target Warehouse Name",
+   "label": "Target Warehouse Address",
    "options": "Address"
   },
   {
@@ -627,7 +627,7 @@
  "icon": "fa fa-file-text",
  "idx": 1,
  "is_submittable": 1,
- "modified": "2019-09-09 11:40:05.762003",
+ "modified": "2019-09-27 14:38:20.801420",
  "modified_by": "Administrator",
  "module": "Stock",
  "name": "Stock Entry",
diff --git a/erpnext/stock/doctype/stock_entry/stock_entry.py b/erpnext/stock/doctype/stock_entry/stock_entry.py
index 69c624b..758fb37 100644
--- a/erpnext/stock/doctype/stock_entry/stock_entry.py
+++ b/erpnext/stock/doctype/stock_entry/stock_entry.py
@@ -328,6 +328,10 @@
 			completed_qty = d.completed_qty + (allowance_percentage/100 * d.completed_qty)
 			if total_completed_qty > flt(completed_qty):
 				job_card = frappe.db.get_value('Job Card', {'operation_id': d.name}, 'name')
+				if not job_card:
+					frappe.throw(_("Work Order {0}: job card not found for the operation {1}")
+						.format(self.work_order, job_card))
+
 				work_order_link = frappe.utils.get_link_to_form('Work Order', self.work_order)
 				job_card_link = frappe.utils.get_link_to_form('Job Card', job_card)
 				frappe.throw(_("Row #{0}: Operation {1} is not completed for {2} qty of finished goods in Work Order {3}. Please update operation status via Job Card {4}.")
diff --git a/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.js b/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.js
index 5ac0b09..1791978 100644
--- a/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.js
+++ b/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.js
@@ -30,7 +30,7 @@
 
 	refresh: function(frm) {
 		if(frm.doc.docstatus < 1) {
-			frm.add_custom_button(__("Items"), function() {
+			frm.add_custom_button(__("Fetch Items from Warehouse"), function() {
 				frm.events.get_items(frm);
 			});
 		}
diff --git a/erpnext/stock/report/stock_ageing/stock_ageing.py b/erpnext/stock/report/stock_ageing/stock_ageing.py
index f0579bf..803a5c8 100644
--- a/erpnext/stock/report/stock_ageing/stock_ageing.py
+++ b/erpnext/stock/report/stock_ageing/stock_ageing.py
@@ -13,9 +13,12 @@
 	columns = get_columns(filters)
 	item_details = get_fifo_queue(filters)
 	to_date = filters["to_date"]
+	_func = lambda x: x[1]
+
 	data = []
 	for item, item_dict in iteritems(item_details):
-		fifo_queue = sorted(item_dict["fifo_queue"], key=lambda x: x[1])
+
+		fifo_queue = sorted(filter(_func, item_dict["fifo_queue"]), key=_func)
 		details = item_dict["details"]
 		if not fifo_queue or (not item_dict.get("total_qty")): continue
 
diff --git a/erpnext/stock/report/stock_ledger/stock_ledger.py b/erpnext/stock/report/stock_ledger/stock_ledger.py
index d386230..5bdbca2 100644
--- a/erpnext/stock/report/stock_ledger/stock_ledger.py
+++ b/erpnext/stock/report/stock_ledger/stock_ledger.py
@@ -107,7 +107,7 @@
 	if include_uom:
 		cf_field = ", ucd.conversion_factor"
 		cf_join = "left join `tabUOM Conversion Detail` ucd on ucd.parent=item.name and ucd.uom='%s'" \
-			% frappe.db.escape(include_uom)
+			% (include_uom)
 
 	res = frappe.db.sql("""
 		select
diff --git a/erpnext/stock/utils.py b/erpnext/stock/utils.py
index 4c663e3..2ac0bae 100644
--- a/erpnext/stock/utils.py
+++ b/erpnext/stock/utils.py
@@ -253,31 +253,40 @@
 		return
 
 	convertible_cols = {}
-	for col_idx in reversed(range(0, len(columns))):
-		col = columns[col_idx]
-		if isinstance(col, dict) and col.get("convertible") in ['rate', 'qty']:
-			convertible_cols[col_idx] = col['convertible']
-			columns.insert(col_idx+1, col.copy())
-			columns[col_idx+1]['fieldname'] += "_alt"
-			if convertible_cols[col_idx] == 'rate':
-				columns[col_idx+1]['label'] += " (per {})".format(include_uom)
-			else:
-				columns[col_idx+1]['label'] += " ({})".format(include_uom)
+
+	is_dict_obj = False
+	if isinstance(result[0], dict):
+		is_dict_obj = True
+
+	convertible_columns = {}
+	for idx, d in enumerate(columns):
+		key = d.get("fieldname") if is_dict_obj else idx
+		if d.get("convertible"):
+			convertible_columns.setdefault(key, d.get("convertible"))
+
+			# Add new column to show qty/rate as per the selected UOM
+			columns.insert(idx+1, {
+				'label': "{0} (per {1})".format(d.get("label"), include_uom),
+				'fieldname': "{0}_{1}".format(d.get("fieldname"), frappe.scrub(include_uom)),
+				'fieldtype': 'Currency' if d.get("convertible") == 'rate' else 'Float'
+			})
 
 	for row_idx, row in enumerate(result):
-		new_row = []
-		for col_idx, d in enumerate(row):
-			new_row.append(d)
-			if col_idx in convertible_cols:
-				if conversion_factors[row_idx]:
-					if convertible_cols[col_idx] == 'rate':
-						new_row.append(flt(d) * conversion_factors[row_idx])
-					else:
-						new_row.append(flt(d) / conversion_factors[row_idx])
-				else:
-					new_row.append(None)
+		data = row.items() if is_dict_obj else enumerate(row)
+		for key, value in data:
+			if not key in convertible_columns or not conversion_factors[row_idx]:
+				continue
 
-		result[row_idx] = new_row
+			if convertible_columns.get(key) == 'rate':
+				new_value = flt(value) * conversion_factors[row_idx]
+			else:
+				new_value = flt(value) / conversion_factors[row_idx]
+
+			if not is_dict_obj:
+				row.insert(key+1, new_value)
+			else:
+				new_key = "{0}_{1}".format(key, frappe.scrub(include_uom))
+				row[new_key] = new_value
 
 def get_available_serial_nos(item_code, warehouse):
 	return frappe.get_all("Serial No", filters = {'item_code': item_code,
diff --git a/erpnext/templates/includes/rfq/rfq_items.html b/erpnext/templates/includes/rfq/rfq_items.html
index cb77f7e..caa15f3 100644
--- a/erpnext/templates/includes/rfq/rfq_items.html
+++ b/erpnext/templates/includes/rfq/rfq_items.html
@@ -3,13 +3,13 @@
 {% for d in doc.items %}
 <div class="rfq-item">
 	<div class="row">
-		<div class="col-sm-5 col-xs-12" style="margin-bottom: 10px;margin-top: 5px;">
+		<div class="col-sm-5 col-12" style="margin-bottom: 10px;margin-top: 5px;">
 			{{ item_name_and_description(d, doc) }}
 		</div>
-		<!-- <div class="col-sm-2 col-xs-2" style="margin-bottom: 10px;">
+		<!-- <div class="col-sm-2 col-2" style="margin-bottom: 10px;">
 			<textarea type="text" style="margin-top: 5px;" class="input-with-feedback form-control rfq-offer_detail" ></textarea>
 		</div> -->
-		<div class="col-sm-2 col-xs-4 text-right">
+		<div class="col-sm-2 col-4 text-right">
 				<input type="text" class="form-control text-right rfq-qty" style="margin-top: 5px;display: inline-block"
 				value = "{{ d.get_formatted('qty') }}"
 				data-idx="{{ d.idx }}">
@@ -17,14 +17,14 @@
 					{{_("UOM") + ":"+ d.uom}}
 				</p>
 		</div>
-		<div class="col-sm-2 col-xs-4 text-right">
+		<div class="col-sm-2 col-4 text-right">
 			<input type="text" class="form-control text-right rfq-rate"
 				style="margin-top: 5px;display: inline-block" value="0.00"
 				data-idx="{{ d.idx }}">
 		</div>
-        <div class="col-sm-3 col-xs-4 text-right" style="padding-top: 9px;">
+        <div class="col-sm-3 col-4 text-right" style="padding-top: 9px;">
            {{doc.currency_symbol}} <span class="rfq-amount" data-idx="{{ d.idx }}">0.00</span>
         </div>
 		</div>
 	</div>
-{% endfor %}
\ No newline at end of file
+{% endfor %}
diff --git a/erpnext/templates/includes/rfq/rfq_macros.html b/erpnext/templates/includes/rfq/rfq_macros.html
index 95bbcfe..88724c3 100644
--- a/erpnext/templates/includes/rfq/rfq_macros.html
+++ b/erpnext/templates/includes/rfq/rfq_macros.html
@@ -1,13 +1,11 @@
-{% from "erpnext/templates/includes/macros.html" import product_image_square %}
+{% from "erpnext/templates/includes/macros.html" import product_image_square, product_image %}
 
 {% macro item_name_and_description(d, doc) %}
     <div class="row">
-        <div class="col-xs-4 col-sm-2 order-image-col">
-            <div class="order-image">
-                {{ product_image_square(d.image) }}
-            </div>
+        <div class="col-3">
+			{{ product_image(d.image) }}
         </div>
-        <div class="col-xs-8 col-sm-10">
+        <div class="col-9">
             {{ d.item_code }}
             <p class="text-muted small">{{ d.description }}</p>
 			{% set supplier_part_no = frappe.db.get_value("Item Supplier", {'parent': d.item_code, 'supplier': doc.supplier}, "supplier_part_no") %}
diff --git a/erpnext/templates/includes/transaction_row.html b/erpnext/templates/includes/transaction_row.html
index 6c58b51..80a542f 100644
--- a/erpnext/templates/includes/transaction_row.html
+++ b/erpnext/templates/includes/transaction_row.html
@@ -1,22 +1,21 @@
 <div class="web-list-item transaction-list-item">
-	<a href="/{{ pathname }}/{{ doc.name }}">
-		<div class="row">
-			<div class="col-sm-4" style='margin-top: -3px;'>
-				<span class="indicator small {{ doc.indicator_color or ("blue" if doc.docstatus==1 else "darkgrey") }}">
-				{{ doc.name }}</span>
-				<div class="small text-muted transaction-time"
-					title="{{ frappe.utils.format_datetime(doc.modified, "medium") }}">
-					{{ frappe.utils.global_date_format(doc.modified) }}
-				</div>
-			</div>
-			<div class="col-sm-5">
-				<div class="small text-muted items-preview ellipsis ellipsis-width">
-					{{ doc.items_preview }}
-				</div>
-			</div>
-			<div class="col-sm-3 text-right bold">
-				{{ doc.get_formatted("grand_total") }}
+	<div class="row">
+		<div class="col-sm-4">
+			<span class="indicator small {{ doc.indicator_color or ("blue" if doc.docstatus==1 else "darkgrey") }}">
+			{{ doc.name }}</span>
+			<div class="small text-muted transaction-time"
+				title="{{ frappe.utils.format_datetime(doc.modified, "medium") }}">
+				{{ frappe.utils.global_date_format(doc.modified) }}
 			</div>
 		</div>
-	</a>
+		<div class="col-sm-5">
+			<div class="small text-muted items-preview ellipsis ellipsis-width">
+				{{ doc.items_preview }}
+			</div>
+		</div>
+		<div class="col-sm-3 text-right bold">
+			{{ doc.get_formatted("grand_total") }}
+		</div>
+	</div>
+	<a class="transaction-item-link" href="/{{ pathname }}/{{ doc.name }}">Link</a>
 </div>
diff --git a/erpnext/templates/pages/order.html b/erpnext/templates/pages/order.html
index 67a8fed..9e3c58b 100644
--- a/erpnext/templates/pages/order.html
+++ b/erpnext/templates/pages/order.html
@@ -12,7 +12,22 @@
 {% endblock %}
 
 {% block header_actions %}
-<a href='/printview?doctype={{ doc.doctype}}&name={{ doc.name }}&format={{ print_format }}' target="_blank" rel="noopener noreferrer">{{ _("Print") }}</a>
+<div class="dropdown">
+	<button class="btn btn-outline-secondary dropdown-toggle" data-toggle="dropdown" aria-expanded="false">
+		<span>{{ _('Actions') }}</span>
+		<b class="caret"></b>
+	</button>
+	<ul class="dropdown-menu dropdown-menu-right" role="menu">
+		{% if doc.doctype == 'Purchase Order' %}
+		<a class="dropdown-item" href="/api/method/erpnext.buying.doctype.purchase_order.purchase_order.make_purchase_invoice_from_portal?purchase_order_name={{ doc.name }}" data-action="make_purchase_invoice">{{ _("Make Purchase Invoice") }}</a>
+		{% endif %}
+		<a class="dropdown-item" href='/printview?doctype={{ doc.doctype}}&name={{ doc.name }}&format={{ print_format }}'
+			target="_blank" rel="noopener noreferrer">
+			{{ _("Print") }}
+		</a>
+	</ul>
+</div>
+
 {% endblock %}
 
 {% block page_content %}
@@ -34,7 +49,7 @@
 </div>
 
 <p class="small my-3">
-	{%- set party_name = doc.supplier_name if doc.doctype == 'Supplier Quotation' else doc.customer_name %}
+	{%- set party_name = doc.supplier_name if doc.doctype in ['Supplier Quotation', 'Purchase Invoice', 'Purchase Order'] else doc.customer_name %}
 	<b>{{ party_name }}</b>
 
 	{% if doc.contact_display and doc.contact_display != party_name %}
@@ -172,4 +187,4 @@
 			currency: '{{ doc.currency }}'
 		}
 	</script>
-{% endblock %}
\ No newline at end of file
+{% endblock %}
diff --git a/erpnext/templates/pages/order.js b/erpnext/templates/pages/order.js
index 21c3a14..0574cde 100644
--- a/erpnext/templates/pages/order.js
+++ b/erpnext/templates/pages/order.js
@@ -5,7 +5,9 @@
 
 	var loyalty_points_input = document.getElementById("loyalty-point-to-redeem");
 	var loyalty_points_status = document.getElementById("loyalty-points-status");
-	loyalty_points_input.onblur = apply_loyalty_points;
+	if (loyalty_points_input) {
+		loyalty_points_input.onblur = apply_loyalty_points;
+	}
 
 	function apply_loyalty_points() {
 		var loyalty_points = parseInt(loyalty_points_input.value);
@@ -37,4 +39,4 @@
 			});
 		}
 	}
-})
\ No newline at end of file
+})
diff --git a/erpnext/templates/pages/rfq.html b/erpnext/templates/pages/rfq.html
index 591d046..5b27a94 100644
--- a/erpnext/templates/pages/rfq.html
+++ b/erpnext/templates/pages/rfq.html
@@ -22,10 +22,10 @@
 
 {% block page_content %}
 <div class="row">
-    <div class="col-xs-6">
+    <div class="col-6">
         <div class="rfq-supplier">{{ doc.supplier }}</div>
 	</div>
-    <div class="col-xs-6 text-muted text-right h6">
+    <div class="col-6 text-muted text-right h6">
         {{ doc.get_formatted("transaction_date") }}
     </div>
 </div>
@@ -33,16 +33,16 @@
 	<div id="order-container">
 			<div id="rfq-items">
 				<div class="row cart-item-header">
-					<div class="col-sm-5 col-xs-12">
+					<div class="col-sm-5 col-12">
 						{{ _("Items") }}
 					</div>
-					<div class="col-sm-2 col-xs-4 text-right">
+					<div class="col-sm-2 col-4 text-right">
 						{{ _("Qty") }}
 					</div>
-					<div class="col-sm-2 col-xs-4 text-right">
+					<div class="col-sm-2 col-4 text-right">
 						{{ _("Rate") }}
 					</div>
-					<div class="col-sm-3 col-xs-4 text-right">
+					<div class="col-sm-3 col-4 text-right">
 						{{ _("Amount") }}
 					</div>
 				</div>
@@ -55,30 +55,29 @@
 		</div>
         {% if doc.items %}
 		<div class="row grand-total-row">
-			<div class="col-xs-9 text-right">{{ _("Grand Total") }}</div>
-			<div class="col-xs-3 text-right">
+			<div class="col-9 text-right">{{ _("Grand Total") }}</div>
+			<div class="col-3 text-right">
 			{{doc.currency_symbol}}  <span class="tax-grand-total">0.0</span>
 			</div>
 		</div>
         {% endif %}
 		<div class="row terms">
-			<div class="col-xs-6">
+			<div class="col-6">
 				<br><br>
 				<p class="text-muted small">{{ _("Notes: ") }}</p>
 				<textarea class="form-control terms-feedback" style="height: 100px;"></textarea>
 			</div>
 		</div>
-		<hr>
-		<div class="row">
-			<div class="result">
-				<div class="col-xs-12">
-					<p class="text-muted small">{{ _("Quotations: ") }}</p>
-					{% if doc.rfq_links %}
+		<div class="row mt-5">
+			<div class="col-12">
+				<p class="text-muted small">{{ _("Quotations: ") }}</p>
+				{% if doc.rfq_links %}
+					<div class="result">
 						{% for d in doc.rfq_links %}
 							<div class="web-list-item transaction-list-item quotations" idx="{{d.name}}">
 								<div class="row">
 									<div class="col-sm-6">
-										<span class="indicator darkgrey"><a href="/quotations/{{d.name}}">{{d.name}}</a></span>
+										<span class="indicator darkgrey">{{d.name}}</span>
 									</div>
 									<div class="col-sm-3">
 										<span class="small darkgrey">{{d.status}}</span>
@@ -87,10 +86,11 @@
 										<span class="small darkgrey">{{d.transaction_date}}</span>
 									</div>
 								</div>
+								<a class="transaction-item-link" href="/quotations/{{d.name}}">Link</a>
 							</div>
 						{% endfor %}
-					{% endif %}
-				</div>
+					</div>
+				{% endif %}
 			</div>
 		</div>
     </div>
diff --git a/erpnext/translations/af.csv b/erpnext/translations/af.csv
index 374675d..88f8d6f 100644
--- a/erpnext/translations/af.csv
+++ b/erpnext/translations/af.csv
@@ -289,7 +289,6 @@
 DocType: Loan,Repay Over Number of Periods,Terugbetaling oor aantal periodes
 apps/erpnext/erpnext/manufacturing/report/bom_stock_report/bom_stock_report.py,Quantity to Produce can not be less than Zero,Hoeveelheid om te produseer kan nie minder wees as Nul nie
 DocType: Stock Entry,Additional Costs,Addisionele koste
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Customer &gt; Customer Group &gt; Territory,Kliënt&gt; Kliëntegroep&gt; Gebied
 apps/erpnext/erpnext/accounts/doctype/account/account.py,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
@@ -586,6 +585,7 @@
 DocType: Healthcare Settings,Create documents for sample collection,Skep dokumente vir monsterversameling
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py,Payment against {0} {1} cannot be greater than Outstanding Amount {2},Betaling teen {0} {1} kan nie groter wees as Uitstaande bedrag nie {2}
 apps/erpnext/erpnext/patches/v11_0/add_healthcare_service_unit_tree_root.py,All Healthcare Service Units,Alle Gesondheidsorg Diens Eenhede
+apps/erpnext/erpnext/setup/default_energy_point_rules.py,On Converting Opportunity,Op die omskakeling van geleentheid
 DocType: Bank Account,Address HTML,Adres HTML
 DocType: Lead,Mobile No.,Mobiele nommer
 apps/erpnext/erpnext/selling/doctype/pos_closing_voucher/closing_voucher_details.html,Mode of Payments,Betaalmetode
@@ -650,7 +650,6 @@
 DocType: Accounting Dimension,Dimension Name,Dimensie Naam
 apps/erpnext/erpnext/healthcare/setup.py,Resistant,bestand
 apps/erpnext/erpnext/hotels/doctype/hotel_room_reservation/hotel_room_reservation.py,Please set Hotel Room Rate on {},Stel asseblief die kamer prys op ()
-apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py,Please setup numbering series for Attendance via Setup &gt; Numbering Series,Stel nommeringreekse op vir bywoning via Setup&gt; Numbering Series
 DocType: Journal Entry,Multi Currency,Multi Geld
 DocType: Bank Statement Transaction Invoice Item,Invoice Type,Faktuur Tipe
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py,Valid from date must be less than valid upto date,Geldig vanaf die datum moet minder wees as die geldige tot op datum
@@ -765,6 +764,7 @@
 apps/erpnext/erpnext/accounts/page/pos/pos.js,Create a new Customer,Skep &#39;n nuwe kliënt
 apps/erpnext/erpnext/non_profit/report/expiring_memberships/expiring_memberships.py,Expiring On,Verlenging Aan
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,"If multiple Pricing Rules continue to prevail, users are asked to set Priority manually to resolve conflict.","As verskeie prysreglemente voortduur, word gebruikers gevra om Prioriteit handmatig in te stel om konflik op te los."
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js,Purchase Return,Koop opgawe
 apps/erpnext/erpnext/utilities/activation.py,Create Purchase Orders,Skep bestellings
 ,Purchase Register,Aankoopregister
 apps/erpnext/erpnext/healthcare/doctype/patient/patient.py,Patient not found,Pasiënt nie gevind nie
@@ -780,7 +780,6 @@
 DocType: Location,Area UOM,Gebied UOM
 apps/erpnext/erpnext/manufacturing/doctype/workstation/workstation.py,Workstation is closed on the following dates as per Holiday List: {0},Werkstasie is gesluit op die volgende datums soos per Vakansie Lys: {0}
 apps/erpnext/erpnext/selling/page/sales_funnel/sales_funnel.py,Opportunities,Geleenthede
-apps/erpnext/erpnext/www/all-products/index.html,Clear filters,Maak filters skoon
 DocType: Lab Test Template,Single,enkele
 DocType: Compensatory Leave Request,Work From Date,Werk vanaf datum
 DocType: Salary Slip,Total Loan Repayment,Totale Lening Terugbetaling
@@ -823,6 +822,7 @@
 DocType: Account,Old Parent,Ou Ouer
 apps/erpnext/erpnext/education/doctype/program_enrollment_tool/program_enrollment_tool.py,Mandatory field - Academic Year,Verpligte vak - Akademiese Jaar
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py,{0} {1} is not associated with {2} {3},{0} {1} word nie geassosieer met {2} {3}
+DocType: Opportunity,Converted By,Omgeskakel deur
 apps/erpnext/erpnext/public/js/hub/components/ReviewArea.vue,You need to login as a Marketplace User before you can add any reviews.,U moet as &#39;n Marketplace-gebruiker aanmeld voordat u enige resensies kan byvoeg.
 apps/erpnext/erpnext/manufacturing/doctype/job_card/job_card.py,Row {0} : Operation is required against the raw material item {1},Ry {0}: Operasie word benodig teen die rou materiaal item {1}
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py,Please set default payable account for the company {0},Stel asseblief die verstek betaalbare rekening vir die maatskappy {0}
@@ -848,6 +848,8 @@
 DocType: BOM,Work Order,Werks bestelling
 DocType: Sales Invoice,Total Qty,Totale hoeveelheid
 apps/erpnext/erpnext/education/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py,Guardian2 Email ID,Guardian2 E-pos ID
+apps/erpnext/erpnext/hr/doctype/employee_transfer/employee_transfer.py,"Please delete the Employee <a href=""#Form/Employee/{0}"">{0}</a>\
+					to cancel this document","Skrap die werknemer <a href=""#Form/Employee/{0}"">{0}</a> \ om hierdie dokument te kanselleer"
 DocType: Item,Show in Website (Variant),Wys in Webwerf (Variant)
 DocType: Employee,Health Concerns,Gesondheid Kommer
 DocType: Payroll Entry,Select Payroll Period,Kies Payroll Periode
@@ -907,7 +909,6 @@
 DocType: Codification Table,Codification Table,Kodifikasietabel
 DocType: Timesheet Detail,Hrs,ure
 apps/erpnext/erpnext/manufacturing/page/bom_comparison_tool/bom_comparison_tool.js,Changes in {0},Veranderings in {0}
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js,Please select Company,Kies asseblief Maatskappy
 DocType: Employee Skill,Employee Skill,Vaardigheid van werknemers
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.js,Difference Account,Verskilrekening
 DocType: Pricing Rule,Discount on Other Item,Afslag op ander items
@@ -975,6 +976,7 @@
 DocType: BOM,Operating Cost,Bedryfskoste
 DocType: Crop,Produced Items,Geproduseerde Items
 DocType: Bank Statement Transaction Entry,Match Transaction to Invoices,Pas transaksie na fakture
+apps/erpnext/erpnext/erpnext_integrations/exotel_integration.py,Error in Exotel incoming call,Fout tydens inkomende oproep van Exotel
 DocType: Sales Order Item,Gross Profit,Bruto wins
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js,Unblock Invoice,Ontgrendel faktuur
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py,Increment cannot be 0,Toename kan nie 0 wees nie
@@ -1188,6 +1190,7 @@
 DocType: Activity Cost,Activity Type,Aktiwiteitstipe
 DocType: Request for Quotation,For individual supplier,Vir individuele verskaffer
 DocType: BOM Operation,Base Hour Rate(Company Currency),Basissuurkoers (Maatskappy Geld)
+,Qty To Be Billed,Aantal wat gefaktureer moet word
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py,Delivered Amount,Afgelope bedrag
 apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.js,Reserved Qty for Production: Raw materials quantity to make manufacturing items.,Gereserveerde hoeveelheid vir produksie: hoeveelheid grondstowwe om vervaardigingsitems te maak.
 DocType: Loyalty Point Entry Redemption,Redemption Date,Aflossingsdatum
@@ -1306,7 +1309,7 @@
 DocType: Sales Invoice,Commission Rate (%),Kommissie Koers (%)
 apps/erpnext/erpnext/education/doctype/student_group/student_group.py,Please select Program,Kies asseblief Program
 DocType: Project,Estimated Cost,Geskatte koste
-DocType: Request for Quotation,Link to material requests,Skakel na materiaal versoeke
+DocType: Supplier Quotation,Link to material requests,Skakel na materiaal versoeke
 apps/erpnext/erpnext/public/js/hub/pages/Publish.vue,Publish,publiseer
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py,Aerospace,Ruimte
 ,Fichier des Ecritures Comptables [FEC],Fichier des Ecritures Comptables [FEC]
@@ -1319,6 +1322,7 @@
 apps/erpnext/erpnext/utilities/transaction_base.py,Invalid Posting Time,Ongeldige plasings tyd
 DocType: Salary Component,Condition and Formula,Toestand en Formule
 DocType: Lead,Campaign Name,Veldtog Naam
+apps/erpnext/erpnext/setup/default_energy_point_rules.py,On Task Completion,Na voltooiing van die taak
 apps/erpnext/erpnext/hr/doctype/compensatory_leave_request/compensatory_leave_request.py,There is no leave period in between {0} and {1},Daar is geen verlofperiode tussen {0} en {1}
 DocType: Fee Validity,Healthcare Practitioner,Gesondheidsorgpraktisyn
 DocType: Hotel Room,Capacity,kapasiteit
@@ -1663,7 +1667,6 @@
 DocType: Quality Feedback Template,Quality Feedback Template,Kwaliteit-terugvoersjabloon
 apps/erpnext/erpnext/config/education.py,LMS Activity,LMS-aktiwiteit
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py,Internet Publishing,Internet Publishing
-DocType: Prescription Duration,Number,aantal
 apps/erpnext/erpnext/accounts/doctype/opening_invoice_creation_tool/opening_invoice_creation_tool.js,Creating {0} Invoice,Skep {0} faktuur
 DocType: Medical Code,Medical Code Standard,Mediese Kode Standaard
 DocType: Soil Texture,Clay Composition (%),Kleiskomposisie (%)
@@ -1738,6 +1741,7 @@
 DocType: Support Settings,Get Started Sections,Kry begin afdelings
 DocType: Lead,CRM-LEAD-.YYYY.-,CRM-LEAD-.YYYY.-
 DocType: Invoice Discounting,Sanctioned,beboet
+,Base Amount,Basisbedrag
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.js,Total Contribution Amount: {0},Totale Bydrae Bedrag: {0}
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py,Row #{0}: Please specify Serial No for Item {1},Ry # {0}: spesifiseer asseblief die serienommer vir item {1}
 DocType: Payroll Entry,Salary Slips Submitted,Salarisstrokies ingedien
@@ -1955,6 +1959,7 @@
 apps/erpnext/erpnext/utilities/user_progress.py,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.
 DocType: Accounting Dimension,Dimension Defaults,Standaardafmetings
 apps/erpnext/erpnext/crm/report/prospects_engaged_but_not_converted/prospects_engaged_but_not_converted.js,Minimum Lead Age (Days),Minimum leeftyd (Dae)
+apps/erpnext/erpnext/assets/report/fixed_asset_register/fixed_asset_register.py,Available For Use Date,Beskikbaar vir gebruiksdatum
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py,All BOMs,Alle BOM&#39;s
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js,Create Inter Company Journal Entry,Skep &#39;n intermaatskappyjoernaalinskrywing
 DocType: Company,Parent Company,Ouer maatskappy
@@ -2019,6 +2024,7 @@
 ,IRS 1099,IRS 1099
 DocType: Salary Slip,Leave Without Pay,Los sonder betaling
 DocType: Payment Request,Outward,uiterlike
+apps/erpnext/erpnext/setup/default_energy_point_rules.py,On {0} Creation,Op {0} Skepping
 apps/erpnext/erpnext/regional/doctype/gstr_3b_report/gstr_3b_report.html,State/UT Tax,Staat / UT belasting
 ,Trial Balance for Party,Proefbalans vir die Party
 ,Gross and Net Profit Report,Bruto en netto winsverslag
@@ -2134,6 +2140,7 @@
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js,Make Stock Entry,Doen voorraadinskrywing
 DocType: Hotel Room Reservation,Hotel Reservation User,Hotel besprekingsgebruiker
 apps/erpnext/erpnext/projects/doctype/project/project.js,Set Status,Stel status in
+apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py,Please setup numbering series for Attendance via Setup &gt; Numbering Series,Stel nommeringreekse op vir bywoning via Setup&gt; Numbering Series
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py,Please select prefix first,Kies asseblief voorvoegsel eerste
 DocType: Contract,Fulfilment Deadline,Vervaldatum
 apps/erpnext/erpnext/public/js/hub/pages/Home.vue,Near you,Naby jou
@@ -2149,6 +2156,7 @@
 DocType: Announcement,All Students,Alle studente
 apps/erpnext/erpnext/assets/doctype/asset/asset.py,Item {0} must be a non-stock item,Item {0} moet &#39;n nie-voorraaditem wees
 apps/erpnext/erpnext/stock/doctype/batch/batch.js,View Ledger,Bekyk Grootboek
+DocType: Cost Center,Lft,LFT
 DocType: Grading Scale,Intervals,tussenposes
 DocType: Bank Statement Transaction Entry,Reconciled Transactions,Versoende transaksies
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py,Earliest,vroegste
@@ -2264,6 +2272,7 @@
 apps/erpnext/erpnext/hr/doctype/employee_benefit_application/employee_benefit_application.py,As per your assigned Salary Structure you cannot apply for benefits,Volgens u toegewysde Salarisstruktuur kan u nie vir voordele aansoek doen nie
 apps/erpnext/erpnext/stock/doctype/item/item.py,Website Image should be a public file or website URL,Webwerfbeeld moet &#39;n publieke lêer of webwerf-URL wees
 DocType: Purchase Invoice Item,BOM,BOM
+apps/erpnext/erpnext/stock/doctype/item/item.py,Duplicate entry in Manufacturers table,Duplikaatinskrywing in die vervaardigers-tabel
 apps/erpnext/erpnext/setup/doctype/item_group/item_group.js,This is a root item group and cannot be edited.,Dit is &#39;n wortel-item groep en kan nie geredigeer word nie.
 apps/erpnext/erpnext/accounts/doctype/account/account.js,Merge,saam te smelt
 DocType: Journal Entry Account,Purchase Order,Aankoopbestelling
@@ -2408,7 +2417,6 @@
 DocType: Asset,Depreciation Schedules,Waardeverminderingskedules
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.js,Create Sales Invoice,Skep verkoopsfaktuur
 apps/erpnext/erpnext/regional/doctype/gstr_3b_report/gstr_3b_report.html,Ineligible ITC,Ongeskik ITC
-apps/erpnext/erpnext/erpnext_integrations/doctype/shopify_settings/shopify_settings.py,"Support for public app is deprecated. Please setup private app, for more details refer user manual","Ondersteuning vir publieke artikels word verval. Stel asseblief &#39;n privaat program op, vir meer besonderhede, verwys gebruikershandleiding"
 DocType: Task,Dependent Tasks,Afhanklike take
 apps/erpnext/erpnext/regional/report/gstr_1/gstr_1.py,Following accounts might be selected in GST Settings:,Volgende rekeninge kan gekies word in GST-instellings:
 apps/erpnext/erpnext/manufacturing/report/bom_stock_report/bom_stock_report.js,Quantity to Produce,Hoeveelheid om te produseer
@@ -2660,6 +2668,7 @@
 DocType: Water Analysis,Container,houer
 apps/erpnext/erpnext/regional/report/gstr_1/gstr_1.py,Please set valid GSTIN No. in Company Address,Stel &#39;n geldige GSTIN-nommer in in die maatskappy se adres
 apps/erpnext/erpnext/education/utils.py,Student {0} - {1} appears Multiple times in row {2} & {3},Student {0} - {1} verskyn Meervoudige tye in ry {2} &amp; {3}
+apps/erpnext/erpnext/selling/doctype/customer/customer.py,Following fields are mandatory to create address:,Die volgende velde is verpligtend om adres te skep:
 DocType: Item Alternative,Two-way,Tweerigting
 DocType: Item,Manufacturers,vervaardigers
 apps/erpnext/erpnext/accounts/deferred_revenue.py,Error while processing deferred accounting for {0},Fout tydens die verwerking van uitgestelde boekhouding vir {0}
@@ -2734,9 +2743,9 @@
 DocType: Employee,HR-EMP-,HR-EMP-
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py,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: Quality Meeting Minutes,Quality Meeting Minutes,Vergaderminute van gehalte
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Supplier &gt; Supplier Type,Verskaffer&gt; Verskaffer tipe
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py,Employee Referral,Werknemer verwysing
 DocType: Student Group,Set 0 for no limit,Stel 0 vir geen limiet
+DocType: Cost Center,rgt,rgt
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py,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."
 DocType: Customer,Primary Address and Contact Detail,Primêre adres en kontakbesonderhede
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.js,Resend Payment Email,Stuur betaling-e-pos weer
@@ -2846,7 +2855,6 @@
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py,Against Supplier Invoice {0} dated {1},Teen Verskafferfaktuur {0} gedateer {1}
 DocType: Customer,Default Price List,Standaard pryslys
 apps/erpnext/erpnext/assets/doctype/asset/asset.py,Asset Movement record {0} created,Bate Beweging rekord {0} geskep
-apps/erpnext/erpnext/utilities/page/leaderboard/leaderboard.js,No items found.,Geen items gevind nie.
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py,You cannot delete Fiscal Year {0}. Fiscal Year {0} is set as default in Global Settings,U kan nie fiskale jaar {0} uitvee nie. Fiskale jaar {0} word as verstek in Globale instellings gestel
 DocType: Share Transfer,Equity/Liability Account,Ekwiteits- / Aanspreeklikheidsrekening
 apps/erpnext/erpnext/setup/doctype/customer_group/customer_group.py,A customer with the same name already exists,Daar bestaan reeds &#39;n kliënt met dieselfde naam
@@ -2862,6 +2870,7 @@
 apps/erpnext/erpnext/selling/doctype/customer/customer.py,Credit limit has been crossed for customer {0} ({1}/{2}),Kredietlimiet is gekruis vir kliënt {0} ({1} / {2})
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py,Customer required for 'Customerwise Discount',Kliënt benodig vir &#39;Customerwise Discount&#39;
 apps/erpnext/erpnext/config/accounting.py,Update bank payment dates with journals.,Dateer bankrekeningdatums met joernale op.
+,Billed Qty,Aantal fakture
 apps/erpnext/erpnext/stock/doctype/item/item_dashboard.py,Pricing,pryse
 DocType: Employee,Attendance Device ID (Biometric/RF tag ID),Bywoningstoestel-ID (biometriese / RF-etiket-ID)
 DocType: Quotation,Term Details,Termyn Besonderhede
@@ -2883,6 +2892,7 @@
 DocType: Share Transfer,Asset Account,Bate rekening
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js,New release date should be in the future,Nuwe vrystellingdatum sal in die toekoms wees
 DocType: Purchase Invoice,End date of current invoice's period,Einddatum van huidige faktuur se tydperk
+apps/erpnext/erpnext/hr/doctype/employee/employee.py,Please setup Employee Naming System in Human Resource &gt; HR Settings,Stel asseblief &#39;n naamstelsel vir werknemers in vir mensehulpbronne&gt; HR-instellings
 DocType: Lab Test,Technician Name,Tegnikus Naam
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py,"Cannot ensure delivery by Serial No as \
 					Item {0} is added with and without Ensure Delivery by \
@@ -2890,6 +2900,7 @@
 DocType: Accounts Settings,Unlink Payment on Cancellation of Invoice,Ontkoppel betaling met kansellasie van faktuur
 DocType: Bank Reconciliation,From Date,Vanaf datum
 apps/erpnext/erpnext/hr/doctype/vehicle_log/vehicle_log.py,Current Odometer reading entered should be greater than initial Vehicle Odometer {0},Huidige Odometer lees ingevoer moet groter wees as die aanvanklike voertuig odometer {0}
+,Purchase Order Items To Be Received or Billed,Koop bestellingsitems wat ontvang of gefaktureer moet word
 DocType: Restaurant Reservation,No Show,Geen vertoning
 apps/erpnext/erpnext/regional/india/utils.py,You must be a registered supplier to generate e-Way Bill,U moet &#39;n geregistreerde verskaffer wees om e-Way Bill te kan genereer
 DocType: Shipping Rule Country,Shipping Rule Country,Poslys Land
@@ -2932,6 +2943,7 @@
 apps/erpnext/erpnext/templates/generators/item/item_add_to_cart.html,View in Cart,Kyk in die winkelwagen
 DocType: Employee Checkin,Shift Actual Start,Skuif die werklike begin
 DocType: Tally Migration,Is Day Book Data Imported,Word dagboekdata ingevoer
+,Purchase Order Items To Be Received or Billed1,Bestelitems wat ontvang moet word of gefaktureer moet word1
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py,Marketing Expenses,Bemarkingsuitgawes
 apps/erpnext/erpnext/stock/doctype/pick_list/pick_list.py,{0} units of {1} is not available.,{0} eenhede van {1} is nie beskikbaar nie.
 ,Item Shortage Report,Item kortverslag
@@ -3155,7 +3167,6 @@
 apps/erpnext/erpnext/public/js/call_popup/call_popup.js,View all issues from {0},Kyk na alle uitgawes vanaf {0}
 DocType: Quality Inspection,MAT-QA-.YYYY.-,MAT-QA-.YYYY.-
 DocType: Quality Meeting Table,Quality Meeting Table,Kwaliteit vergadering tafel
-apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,Stel Naming Series in vir {0} via Setup&gt; Settings&gt; Naming Series
 apps/erpnext/erpnext/templates/pages/help.html,Visit the forums,Besoek die forums
 DocType: Student,Student Mobile Number,Student Mobiele Nommer
 DocType: Item,Has Variants,Het Varianten
@@ -3297,6 +3308,7 @@
 DocType: Homepage Section,Section Cards,Afdelingskaarte
 ,Campaign Efficiency,Veldtogdoeltreffendheid
 DocType: Discussion,Discussion,bespreking
+apps/erpnext/erpnext/setup/default_energy_point_rules.py,On Sales Order Submission,Met die indiening van verkoopsbestellings
 DocType: Bank Transaction,Transaction ID,Transaksie ID
 DocType: Payroll Entry,Deduct Tax For Unsubmitted Tax Exemption Proof,Aftrekbelasting vir nie-aangemelde belastingvrystellingbewys
 DocType: Volunteer,Anytime,enige tyd
@@ -3304,7 +3316,6 @@
 DocType: Employee Tax Exemption Proof Submission,Employee Tax Exemption Proof Submission,Werknemersbelastingvrystelling Bewysvoorlegging
 DocType: Patient,Surgical History,Chirurgiese Geskiedenis
 DocType: Bank Statement Settings Item,Mapped Header,Gekoppelde kop
-apps/erpnext/erpnext/hr/doctype/employee/employee.py,Please setup Employee Naming System in Human Resource &gt; HR Settings,Stel asseblief &#39;n naamstelsel vir werknemers in vir mensehulpbronne&gt; HR-instellings
 DocType: Employee,Resignation Letter Date,Bedankingsbrief Datum
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Pricing Rules are further filtered based on quantity.,Prysreëls word verder gefiltreer op grond van hoeveelheid.
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py,Please set the Date Of Joining for employee {0},Stel asseblief die datum van aansluiting vir werknemer {0}
@@ -3318,6 +3329,7 @@
 DocType: Bank Statement Settings,Mapped Items,Gemerkte items
 DocType: Amazon MWS Settings,IT,DIT
 DocType: Chapter,Chapter,Hoofstuk
+,Fixed Asset Register,Vaste bateregister
 apps/erpnext/erpnext/utilities/user_progress.py,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,Select BOM and Qty for Production,Kies BOM en hoeveelheid vir produksie
@@ -3453,7 +3465,6 @@
 apps/erpnext/erpnext/templates/emails/reorder_item.html,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
 apps/erpnext/erpnext/controllers/accounts_controller.py,Account {0} is invalid. Account Currency must be {1},Rekening {0} is ongeldig. Rekeninggeldeenheid moet {1} wees
 apps/erpnext/erpnext/hr/doctype/salary_structure_assignment/salary_structure_assignment.py,From Date {0} cannot be after employee's relieving Date {1},Vanaf datum {0} kan nie na werknemer se verligting wees nie Datum {1}
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py,Debit Note {0} has been created automatically,Debietnota {0} is outomaties geskep
 apps/erpnext/erpnext/accounts/doctype/payment_order/payment_order.js,Create Payment Entries,Skep betalingsinskrywings
 DocType: Supplier,Is Internal Supplier,Is Interne Verskaffer
 DocType: Employee,Create User Permission,Skep gebruikertoestemming
@@ -4012,7 +4023,6 @@
 DocType: Project User,Project Status,Projek Status
 DocType: UOM,Check this to disallow fractions. (for Nos),Kontroleer dit om breuke te ontbreek. (vir Nos)
 DocType: Student Admission Program,Naming Series (for Student Applicant),Naming Series (vir Studente Aansoeker)
-apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.py,UOM Conversion factor ({0} -&gt; {1}) not found for item: {2},UOM-omskakelingsfaktor ({0} -&gt; {1}) nie vir item gevind nie: {2}
 apps/erpnext/erpnext/hr/doctype/retention_bonus/retention_bonus.py,Bonus Payment Date cannot be a past date,Bonus Betalingsdatum kan nie &#39;n vervaldatum wees nie
 DocType: Travel Request,Copy of Invitation/Announcement,Afskrif van Uitnodiging / Aankondiging
 DocType: Practitioner Service Unit Schedule,Practitioner Service Unit Schedule,Praktisyns Diens Eenheidskedule
@@ -4160,6 +4170,7 @@
 apps/erpnext/erpnext/utilities/user_progress.py,Setup Company,Setup Company
 ,Lab Test Report,Lab Test Report
 DocType: Employee Benefit Application,Employee Benefit Application,Werknemervoordeel Aansoek
+apps/erpnext/erpnext/accounts/doctype/invoice_discounting/invoice_discounting.py,Row({0}): {1} is already discounted in {2},Ry ({0}): {1} is alreeds afslag op {2}
 apps/erpnext/erpnext/hr/doctype/additional_salary/additional_salary.py,Additional Salary Component Exists.,Bykomende salarisonderdele bestaan.
 DocType: Purchase Invoice,Unregistered,ongeregistreerde
 DocType: Student Applicant,Application Date,Aansoek Datum
@@ -4238,7 +4249,6 @@
 DocType: Journal Entry,Accounting Entries,Rekeningkundige Inskrywings
 DocType: Job Card Time Log,Job Card Time Log,Jobkaart Tydlogboek
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,"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."
-apps/erpnext/erpnext/education/doctype/instructor/instructor.py,Please setup Instructor Naming System in Education &gt; Education Settings,Stel asb. Die opvoeder-benamingstelsel op in onderwys&gt; Onderwysinstellings
 DocType: Journal Entry,Paid Loan,Betaalde lening
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py,Duplicate Entry. Please check Authorization Rule {0},Duplikaat Inskrywing. Gaan asseblief die magtigingsreël {0}
 DocType: Journal Entry Account,Reference Due Date,Verwysingsdatum
@@ -4255,7 +4265,6 @@
 apps/erpnext/erpnext/templates/pages/projects.html,No time sheets,Geen tydskrifte nie
 DocType: GoCardless Mandate,GoCardless Customer,GoCardless kliënt
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py,Leave Type {0} cannot be carry-forwarded,Verlof tipe {0} kan nie deurstuur word nie
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Item Code &gt; Item Group &gt; Brand,Itemkode&gt; Itemgroep&gt; Merk
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py,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
 DocType: Leave Encashment,Payroll,betaalstaat
@@ -4370,7 +4379,6 @@
 DocType: Stock Ledger Entry,Actual Qty After Transaction,Werklike hoeveelheid na transaksie
 ,Pending SO Items For Purchase Request,Hangende SO-items vir aankoopversoek
 apps/erpnext/erpnext/education/doctype/student_admission/student_admission.py,Student Admissions,Studente Toelatings
-apps/erpnext/erpnext/accounts/party.py,{0} {1} is disabled,{0} {1} is gedeaktiveer
 DocType: Supplier,Billing Currency,Billing Valuta
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py,Extra Large,Ekstra groot
 DocType: Loan,Loan Application,Leningsaansoek
@@ -4447,7 +4455,6 @@
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py,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/accounts/doctype/accounting_dimension/accounting_dimension.py,Creating Dimensions...,Skep dimensies ...
 apps/erpnext/erpnext/education/doctype/student_group_creation_tool/student_group_creation_tool.py,Student Group Name is mandatory in row {0},Studentegroepnaam is verpligtend in ry {0}
-DocType: Customer Credit Limit,Bypass credit limit_check,Omkring kredietlimiet_kontroleer
 DocType: Homepage,Products to be shown on website homepage,Produkte wat op die tuisblad van die webwerf gewys word
 DocType: HR Settings,Password Policy,Wagwoordbeleid
 apps/erpnext/erpnext/setup/doctype/customer_group/customer_group.js,This is a root customer group and cannot be edited.,Dit is &#39;n wortelkundegroep en kan nie geredigeer word nie.
@@ -4739,6 +4746,7 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py,Row {0}: Advance against Customer must be credit,Ry {0}: Voorskot teen kliënt moet krediet wees
 DocType: Quality Meeting,Quality Meeting,Kwaliteit vergadering
 apps/erpnext/erpnext/accounts/doctype/account/account.js,Non-Group to Group,Nie-Groep tot Groep
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,Stel Naming Series in vir {0} via Setup&gt; Settings&gt; Naming Series
 DocType: Employee,ERPNext User,ERPNext gebruiker
 apps/erpnext/erpnext/education/doctype/student_group_creation_tool/student_group_creation_tool.py,Batch is mandatory in row {0},Joernaal is verpligtend in ry {0}
 DocType: Company,Default Buying Terms,Standaard koopvoorwaardes
@@ -5033,6 +5041,7 @@
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py,No {0} found for Inter Company Transactions.,Geen {0} gevind vir intermaatskappy transaksies nie.
 DocType: Travel Itinerary,Rented Car,Huurde motor
 apps/erpnext/erpnext/public/js/hub/components/profile_dialog.js,About your Company,Oor jou maatskappy
+apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.js,Show Stock Ageing Data,Wys data oor veroudering
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py,Credit To account must be a Balance Sheet account,Krediet Vir rekening moet &#39;n balansstaatrekening wees
 DocType: Donor,Donor,Skenker
 DocType: Global Defaults,Disable In Words,Deaktiveer in woorde
@@ -5047,8 +5056,10 @@
 DocType: Practitioner Schedule,Schedule Name,Skedule Naam
 apps/erpnext/erpnext/regional/doctype/gstr_3b_report/gstr_3b_report.py,Please enter GSTIN and state for the Company Address {0},Voer GSTIN in en meld die maatskappyadres {0}
 DocType: Currency Exchange,For Buying,Vir koop
+apps/erpnext/erpnext/setup/default_energy_point_rules.py,On Purchase Order Submission,By die indiening van bestellings
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js,Add All Suppliers,Voeg alle verskaffers by
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py,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/accounts/doctype/pricing_rule/pricing_rule.js,Customer &gt; Customer Group &gt; Territory,Kliënt&gt; Klantegroep&gt; Gebied
 DocType: Tally Migration,Parties,partye
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js,Browse BOM,Blaai deur BOM
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py,Secured Loans,Beveiligde Lenings
@@ -5080,6 +5091,7 @@
 apps/erpnext/erpnext/stock/doctype/item_alternative/item_alternative.py,Not allow to set alternative item for the item {0},Moenie toelaat dat alternatiewe item vir die item {0}
 apps/erpnext/erpnext/hr/doctype/leave_block_list/leave_block_list.py,Date is repeated,Datum word herhaal
 apps/erpnext/erpnext/accounts/print_format/payment_receipt_voucher/payment_receipt_voucher.html,Authorized Signatory,Gemagtigde ondertekenaar
+apps/erpnext/erpnext/education/doctype/instructor/instructor.py,Please setup Instructor Naming System in Education &gt; Education Settings,Stel asb. Die opvoeder-benamingstelsel op in onderwys&gt; Onderwysinstellings
 apps/erpnext/erpnext/regional/doctype/gstr_3b_report/gstr_3b_report.html,Net ITC Available(A) - (B),Netto ITC beskikbaar (A) - (B)
 apps/erpnext/erpnext/education/doctype/fee_schedule/fee_schedule.js,Create Fees,Skep Fooie
 DocType: Project,Total Purchase Cost (via Purchase Invoice),Totale Aankoopprys (via Aankoopfaktuur)
@@ -5100,6 +5112,7 @@
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.js,Message Sent,Boodskap gestuur
 apps/erpnext/erpnext/accounts/doctype/account/account.py,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/assets/report/fixed_asset_register/fixed_asset_register.py,Vendor Name,Verkopernaam
 DocType: Quiz Result,Wrong,Verkeerde
 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)
@@ -5343,6 +5356,7 @@
 DocType: Stock Settings,Auto Material Request,Auto Materiaal Versoek
 DocType: Woocommerce Settings,API consumer secret,API verbruikers geheim
 DocType: Delivery Note Item,Available Batch Qty at From Warehouse,Beskikbare joernaal by From Warehouse
+,Received Qty Amount,Hoeveelheid ontvang
 DocType: Salary Slip,Gross Pay - Total Deduction - Loan Repayment,Bruto Betaling - Totale Aftrekking - Lening Terugbetaling
 DocType: Bank Account,Last Integration Date,Laaste integrasiedatum
 DocType: Expense Claim,Expense Taxes and Charges,Belasting en heffings
@@ -5801,6 +5815,8 @@
 DocType: Drug Prescription,Hour,Uur
 DocType: Restaurant Order Entry,Last Sales Invoice,Laaste Verkoopfaktuur
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py,Please select Qty against item {0},Kies asseblief hoeveelheid teen item {0}
+apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py,Latest Age,Jongste ouderdom
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js,Transfer Material to Supplier,Oordra materiaal na verskaffer
 apps/erpnext/erpnext/hr/report/loan_repayment/loan_repayment.py,EMI,EMI
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py,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
@@ -5824,7 +5840,6 @@
 apps/erpnext/erpnext/hr/doctype/employee_benefit_application/employee_benefit_application.py,"An amount of {0} already claimed for the component {1},\
 						 set the amount equal or greater than {2}","&#39;N Bedrag van {0} wat reeds vir die komponent {1} geëis is, stel die bedrag gelyk of groter as {2}"
 DocType: Shipping Rule,Shipping Rule Conditions,Posbusvoorwaardes
-DocType: Purchase Invoice,Export Type,Uitvoer Tipe
 DocType: Salary Slip Loan,Salary Slip Loan,Salaris Slip Lening
 DocType: BOM Update Tool,The new BOM after replacement,Die nuwe BOM na vervanging
 ,Point of Sale,Punt van koop
@@ -5944,7 +5959,6 @@
 DocType: Purchase Order Item,Blanket Order Rate,Dekking bestelkoers
 ,Customer Ledger Summary,Opsomming oor klante grootboek
 apps/erpnext/erpnext/hooks.py,Certification,sertifisering
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js,Are you sure you want to make debit note?,Is u seker dat u &#39;n debietnota wil maak?
 DocType: Bank Guarantee,Clauses and Conditions,Klousules en Voorwaardes
 DocType: Serial No,Creation Document Type,Skepping dokument tipe
 DocType: Amazon MWS Settings,ES,ES
@@ -5982,8 +5996,6 @@
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py,Financial Services,Finansiële dienste
 DocType: Student Sibling,Student ID,Student ID
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.js,For Quantity must be greater than zero,Vir Hoeveelheid moet groter as nul wees
-apps/erpnext/erpnext/hr/doctype/employee_transfer/employee_transfer.py,"Please delete the Employee <a href=""#Form/Employee/{0}"">{0}</a>\
-					to cancel this document","Skrap die werknemer <a href=""#Form/Employee/{0}"">{0}</a> \ om hierdie dokument te kanselleer"
 apps/erpnext/erpnext/config/projects.py,Types of activities for Time Logs,Soorte aktiwiteite vir Time Logs
 DocType: Opening Invoice Creation Tool,Sales,verkope
 DocType: Stock Entry Detail,Basic Amount,Basiese Bedrag
@@ -6062,6 +6074,7 @@
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py,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,Send Supplier Emails,Stuur verskaffer e-pos
+DocType: Asset Movement,ACC-ASM-.YYYY.-,ACC-ASM-.YYYY.-
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py,"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
 apps/erpnext/erpnext/hr/doctype/employee_onboarding/employee_onboarding.py,Submit this to create the Employee record,Dien dit in om die Werknemers rekord te skep
@@ -6139,7 +6152,6 @@
 DocType: Sales Team,Contact No.,Kontaknommer.
 apps/erpnext/erpnext/templates/includes/cart/cart_address.html,Billing Address is same as Shipping Address,Faktuuradres is dieselfde as afleweringsadres
 DocType: Bank Reconciliation,Payment Entries,Betalingsinskrywings
-apps/erpnext/erpnext/erpnext_integrations/doctype/shopify_settings/shopify_settings.py,Access token or Shopify URL missing,Toegang token of Shopify-URL ontbreek
 DocType: Location,Latitude,Latitude
 DocType: Work Order,Scrap Warehouse,Scrap Warehouse
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py,"Warehouse required at Row No {0}, please set default warehouse for the item {1} for the company {2}","Pakhuis benodig by ry nr {0}, stel asseblief standaard pakhuis vir die item {1} vir die maatskappy {2}"
@@ -6182,7 +6194,6 @@
 DocType: Job Offer Term,Value / Description,Waarde / beskrywing
 apps/erpnext/erpnext/controllers/accounts_controller.py,"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
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js,Are you sure you want to make credit note?,Is u seker dat u &#39;n kredietnota wil maak?
 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,Debit and Credit not equal for {0} #{1}. Difference is {2}.,Debiet en Krediet nie gelyk aan {0} # {1}. Verskil is {2}.
@@ -6307,6 +6318,7 @@
 DocType: Purchase Invoice,Taxes and Charges Added,Belasting en heffings bygevoeg
 apps/erpnext/erpnext/assets/doctype/asset/asset.py,Depreciation Row {0}: Next Depreciation Date cannot be before Available-for-use Date,Waardevermindering-ry {0}: Volgende waarderingsdatum kan nie voor die datum beskikbaar wees vir gebruik nie
 ,Sales Funnel,Verkope trechter
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Item Code &gt; Item Group &gt; Brand,Itemkode&gt; Itemgroep&gt; Merk
 apps/erpnext/erpnext/setup/doctype/company/company.py,Abbreviation is mandatory,Afkorting is verpligtend
 DocType: Project,Task Progress,Taak vordering
 apps/erpnext/erpnext/templates/includes/navbar/navbar_items.html,Cart,wa
@@ -6550,6 +6562,7 @@
 DocType: Employee Grade,Employee Grade,Werknemersgraad
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py,Piecework,stukwerk
 DocType: GSTR 3B Report,June,Junie
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Supplier &gt; Supplier Type,Verskaffer&gt; Verskaffer tipe
 DocType: Share Balance,From No,Van No
 DocType: Shift Type,Early Exit Grace Period,Genade tydperk vir vroeë uitgang
 DocType: Task,Actual Time (in Hours),Werklike tyd (in ure)
@@ -6832,6 +6845,7 @@
 DocType: Warehouse,Warehouse Name,Pakhuisnaam
 DocType: Naming Series,Select Transaction,Kies transaksie
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py,Please enter Approving Role or Approving User,Voer asseblief &#39;n goedgekeurde rol of goedgekeurde gebruiker in
+apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.py,UOM Conversion factor ({0} -&gt; {1}) not found for item: {2},UOM-omskakelingsfaktor ({0} -&gt; {1}) nie vir item gevind nie: {2}
 apps/erpnext/erpnext/support/doctype/service_level_agreement/service_level_agreement.py,Service Level Agreement with Entity Type {0} and Entity {1} already exists.,Diensvlakooreenkoms met entiteitstipe {0} en entiteit {1} bestaan reeds.
 DocType: Journal Entry,Write Off Entry,Skryf Uit Inskrywing
 DocType: BOM,Rate Of Materials Based On,Mate van materiaal gebaseer op
@@ -7022,6 +7036,7 @@
 DocType: Quality Inspection Reading,Quality Inspection Reading,Kwaliteit Inspeksie Lees
 apps/erpnext/erpnext/stock/doctype/stock_settings/stock_settings.py,`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/stock/report/stock_balance/stock_balance.py,Earliest Age,Die vroegste ouderdom
 apps/erpnext/erpnext/utilities/user_progress.py,Set a sales goal you'd like to achieve for your company.,Stel &#39;n verkoopsdoel wat u vir u onderneming wil bereik.
 DocType: Quality Goal,Revision,hersiening
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js,Healthcare Services,Gesondheidsorgdienste
@@ -7065,6 +7080,7 @@
 apps/erpnext/erpnext/healthcare/doctype/patient_encounter/patient_encounter.js,Schedule Discharge,Skedule ontslag
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py,Cheques and Deposits incorrectly cleared,Tjeks en deposito&#39;s is verkeerd skoongemaak
 DocType: Homepage Section Card,Homepage Section Card,Tuisblad Afdelingskaart
+,Amount To Be Billed,Bedrag wat gehef moet word
 apps/erpnext/erpnext/accounts/doctype/account/account.py,Account {0}: You can not assign itself as parent account,Rekening {0}: Jy kan nie homself as ouerrekening toewys nie
 DocType: Purchase Invoice Item,Price List Rate,Pryslys
 apps/erpnext/erpnext/utilities/activation.py,Create customer quotes,Skep kliënte kwotasies
@@ -7117,6 +7133,7 @@
 DocType: Supplier Scorecard Criteria,Supplier Scorecard Criteria,Verskaffer Scorecard Criteria
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py,Please select Start Date and End Date for Item {0},Kies asseblief begin datum en einddatum vir item {0}
 DocType: Maintenance Schedule,MAT-MSH-.YYYY.-,MAT-MSH-.YYYY.-
+,Amount to Receive,Bedrag om te ontvang
 apps/erpnext/erpnext/education/doctype/student_group_creation_tool/student_group_creation_tool.py,Course is mandatory in row {0},Kursus is verpligtend in ry {0}
 apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py,From date can not be greater than than To date,Vanaf die datum kan nie groter wees as tot op datum nie
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py,To date cannot be before from date,Tot op datum kan nie voor die datum wees nie
@@ -7364,7 +7381,6 @@
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js,BOM and Manufacturing Quantity are required,BOM en Vervaardiging Hoeveelhede word benodig
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js,Ageing Range 2,Veroudering Reeks 2
 DocType: SG Creation Tool Course,Max Strength,Maksimum sterkte
-apps/erpnext/erpnext/accounts/doctype/account/account.py,"Account {0} already exists in child company {1}. The following fields have different values, they should be same:<ul><li>{2}</li></ul>",Rekening {0} bestaan reeds in kinderonderneming {1}. Die volgende velde het verskillende waardes; hulle moet dieselfde wees: <ul><li> {2} </li></ul>
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py,Installing presets,Voorinstellings installeer
 DocType: Fee Schedule,EDU-FSH-.YYYY.-,EDU-FSH-.YYYY.-
 apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js,No Delivery Note selected for Customer {},Geen afleweringsnota gekies vir kliënt {}
@@ -7572,6 +7588,7 @@
 DocType: Delivery Note,Print Without Amount,Druk Sonder Bedrag
 apps/erpnext/erpnext/accounts/report/asset_depreciation_ledger/asset_depreciation_ledger.py,Depreciation Date,Depresiasie Datum
 ,Work Orders in Progress,Werkopdragte in die proses
+DocType: Customer Credit Limit,Bypass Credit Limit Check,Omskakeling van kredietlimietlimiet
 DocType: Issue,Support Team,Ondersteuningspan
 apps/erpnext/erpnext/stock/report/batch_item_expiry_status/batch_item_expiry_status.py,Expiry (In Days),Vervaldatum (In Dae)
 DocType: Appraisal,Total Score (Out of 5),Totale telling (uit 5)
@@ -7755,6 +7772,7 @@
 DocType: Sales Invoice,Customer GSTIN,Kliënt GSTIN
 DocType: Crop Cycle,List of diseases detected on the field. When selected it'll automatically add a list of tasks to deal with the disease ,"Lys van siektes wat op die veld bespeur word. Wanneer dit gekies word, sal dit outomaties &#39;n lys take byvoeg om die siekte te hanteer"
 apps/erpnext/erpnext/manufacturing/page/bom_comparison_tool/bom_comparison_tool.js,BOM 1,BOM 1
+apps/erpnext/erpnext/assets/report/fixed_asset_register/fixed_asset_register.py,Asset Id,Bate-id
 apps/erpnext/erpnext/healthcare/doctype/healthcare_service_unit/healthcare_service_unit.js,This is a root healthcare service unit and cannot be edited.,Dit is &#39;n wortelgesondheidsdiens-eenheid en kan nie geredigeer word nie.
 DocType: Asset Repair,Repair Status,Herstel Status
 apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.js,"Requested Qty: Quantity requested for purchase, but not ordered.","Aangevraagde hoeveelheid: Aantal wat gevra word om te koop, maar nie bestel nie."
diff --git a/erpnext/translations/am.csv b/erpnext/translations/am.csv
index 6808df4..8277608 100644
--- a/erpnext/translations/am.csv
+++ b/erpnext/translations/am.csv
@@ -289,7 +289,6 @@
 DocType: Loan,Repay Over Number of Periods,ጊዜዎች በላይ ቁጥር ብድራትን
 apps/erpnext/erpnext/manufacturing/report/bom_stock_report/bom_stock_report.py,Quantity to Produce can not be less than Zero,የምርት መጠን ከዜሮ በታች መሆን አይችልም።
 DocType: Stock Entry,Additional Costs,ተጨማሪ ወጪዎች
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Customer &gt; Customer Group &gt; Territory,የደንበኛ&gt; የደንበኛ ቡድን&gt; ክልል።
 apps/erpnext/erpnext/accounts/doctype/account/account.py,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
@@ -585,6 +584,7 @@
 DocType: Healthcare Settings,Create documents for sample collection,ለ ናሙና ስብስብ ሰነዶችን ይፍጠሩ
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py,Payment against {0} {1} cannot be greater than Outstanding Amount {2},ላይ ክፍያ {0} {1} ያልተከፈሉ መጠን በላይ ሊሆን አይችልም {2}
 apps/erpnext/erpnext/patches/v11_0/add_healthcare_service_unit_tree_root.py,All Healthcare Service Units,ሁሉም የጤና ጥበቃ አገልግሎት ክፍሎች
+apps/erpnext/erpnext/setup/default_energy_point_rules.py,On Converting Opportunity,ዕድልን በመለወጥ ላይ።
 DocType: Bank Account,Address HTML,አድራሻ ኤችቲኤምኤል
 DocType: Lead,Mobile No.,የተንቀሳቃሽ ስልክ ቁጥር
 apps/erpnext/erpnext/selling/doctype/pos_closing_voucher/closing_voucher_details.html,Mode of Payments,የከፈሉበት ሁኔታ
@@ -649,7 +649,6 @@
 DocType: Accounting Dimension,Dimension Name,የልኬት ስም።
 apps/erpnext/erpnext/healthcare/setup.py,Resistant,መቋቋም የሚችል
 apps/erpnext/erpnext/hotels/doctype/hotel_room_reservation/hotel_room_reservation.py,Please set Hotel Room Rate on {},እባክዎን የሆቴል የክፍል ደረጃ በ {} ላይ ያዘጋጁ
-apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py,Please setup numbering series for Attendance via Setup &gt; Numbering Series,እባክዎን ለተማሪ ተገኝተው በማዋቀር&gt; በቁጥር ተከታታይ በኩል ያዘጋጁ።
 DocType: Journal Entry,Multi Currency,ባለብዙ ምንዛሬ
 DocType: Bank Statement Transaction Invoice Item,Invoice Type,የደረሰኝ አይነት
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py,Valid from date must be less than valid upto date,ከቀን ጀምሮ ተቀባይነት ያለው ከሚሰራበት ቀን ያነሰ መሆን አለበት።
@@ -763,6 +762,7 @@
 apps/erpnext/erpnext/accounts/page/pos/pos.js,Create a new Customer,አዲስ ደንበኛ ይፍጠሩ
 apps/erpnext/erpnext/non_profit/report/expiring_memberships/expiring_memberships.py,Expiring On,ጊዜው የሚያልፍበት
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,"If multiple Pricing Rules continue to prevail, users are asked to set Priority manually to resolve conflict.","በርካታ የዋጋ ደንቦች አይችሉአትም የሚቀጥሉ ከሆነ, ተጠቃሚዎች ግጭት ለመፍታት በእጅ ቅድሚያ ለማዘጋጀት ይጠየቃሉ."
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js,Purchase Return,የግዢ ተመለስ
 apps/erpnext/erpnext/utilities/activation.py,Create Purchase Orders,የግዢ ትዕዛዞች ፍጠር
 ,Purchase Register,የግዢ ይመዝገቡ
 apps/erpnext/erpnext/healthcare/doctype/patient/patient.py,Patient not found,ታካሚ አልተገኘም
@@ -778,7 +778,6 @@
 DocType: Location,Area UOM,አካባቢ UOM
 apps/erpnext/erpnext/manufacturing/doctype/workstation/workstation.py,Workstation is closed on the following dates as per Holiday List: {0},ከገቢር በአል ዝርዝር መሰረት በሚከተሉት ቀናት ላይ ዝግ ነው: {0}
 apps/erpnext/erpnext/selling/page/sales_funnel/sales_funnel.py,Opportunities,ዕድሎች
-apps/erpnext/erpnext/www/all-products/index.html,Clear filters,ማጣሪያዎችን ያፅዱ ፡፡
 DocType: Lab Test Template,Single,ያላገባ
 DocType: Compensatory Leave Request,Work From Date,ከስራ ቀን ጀምሮ
 DocType: Salary Slip,Total Loan Repayment,ጠቅላላ ብድር የሚያየን
@@ -821,6 +820,7 @@
 DocType: Account,Old Parent,የድሮ ወላጅ
 apps/erpnext/erpnext/education/doctype/program_enrollment_tool/program_enrollment_tool.py,Mandatory field - Academic Year,አስገዳጅ መስክ - የትምህርት ዓመት
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py,{0} {1} is not associated with {2} {3},{0} {1} ከ {2} {3} ጋር አልተያያዘም
+DocType: Opportunity,Converted By,የተቀየረው በ
 apps/erpnext/erpnext/public/js/hub/components/ReviewArea.vue,You need to login as a Marketplace User before you can add any reviews.,ማንኛውንም ግምገማዎች ማከል ከመቻልዎ በፊት እንደ የገቢያ ቦታ ተጠቃሚ መግባት ያስፈልግዎታል።
 apps/erpnext/erpnext/manufacturing/doctype/job_card/job_card.py,Row {0} : Operation is required against the raw material item {1},ረድፍ {0}: ከሽኩት ንጥረ ነገር ጋር {1}
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py,Please set default payable account for the company {0},ኩባንያው ነባሪ ተከፋይ መለያ ለማዘጋጀት እባክዎ {0}
@@ -846,6 +846,8 @@
 DocType: BOM,Work Order,የሥራ ትዕዛዝ
 DocType: Sales Invoice,Total Qty,ጠቅላላ ብዛት
 apps/erpnext/erpnext/education/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py,Guardian2 Email ID,Guardian2 ኢሜይል መታወቂያ
+apps/erpnext/erpnext/hr/doctype/employee_transfer/employee_transfer.py,"Please delete the Employee <a href=""#Form/Employee/{0}"">{0}</a>\
+					to cancel this document","ይህንን ሰነድ ለመሰረዝ እባክዎ ሰራተኛውን <a href=""#Form/Employee/{0}"">{0}</a> \ ያጥፉ።"
 DocType: Item,Show in Website (Variant),የድር ጣቢያ ውስጥ አሳይ (ተለዋጭ)
 DocType: Employee,Health Concerns,የጤና ሰጋት
 DocType: Payroll Entry,Select Payroll Period,የደመወዝ ክፍያ ክፍለ ይምረጡ
@@ -905,7 +907,6 @@
 DocType: Codification Table,Codification Table,የማጣቀሻ ሰንጠረዥ
 DocType: Timesheet Detail,Hrs,ሰዓቶች
 apps/erpnext/erpnext/manufacturing/page/bom_comparison_tool/bom_comparison_tool.js,Changes in {0},በ {0} ውስጥ ለውጦች
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js,Please select Company,ኩባንያ ይምረጡ
 DocType: Employee Skill,Employee Skill,የሰራተኛ ችሎታ።
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.js,Difference Account,ልዩነት መለያ
 DocType: Pricing Rule,Discount on Other Item,በሌላ ንጥል ላይ ቅናሽ።
@@ -973,6 +974,7 @@
 DocType: BOM,Operating Cost,የክወና ወጪ
 DocType: Crop,Produced Items,የተመረቱ ዕቃዎች
 DocType: Bank Statement Transaction Entry,Match Transaction to Invoices,የግንኙነት ጥያቄ ወደ ክፍያ መጠየቂያዎች
+apps/erpnext/erpnext/erpnext_integrations/exotel_integration.py,Error in Exotel incoming call,በ Exotel ገቢ ጥሪ ውስጥ ስህተት።
 DocType: Sales Order Item,Gross Profit,አጠቃላይ ትርፍ
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js,Unblock Invoice,ደረሰኝን አታግድ
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py,Increment cannot be 0,ጭማሬ 0 መሆን አይችልም
@@ -1186,6 +1188,7 @@
 DocType: Activity Cost,Activity Type,የእንቅስቃሴ አይነት
 DocType: Request for Quotation,For individual supplier,ግለሰብ አቅራቢ ለ
 DocType: BOM Operation,Base Hour Rate(Company Currency),የመሠረት ሰዓት ተመን (የኩባንያ የምንዛሬ)
+,Qty To Be Billed,እንዲከፍሉ
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py,Delivered Amount,ደርሷል መጠን
 apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.js,Reserved Qty for Production: Raw materials quantity to make manufacturing items.,ለምርቶቹ የተቀመጡ ጫፎች-ለማኑፋክቸሪንግ ዕቃዎች የሚውሉ ጥሬ ዕቃዎች ብዛት።
 DocType: Loyalty Point Entry Redemption,Redemption Date,የመቤዠት ቀን
@@ -1304,7 +1307,7 @@
 DocType: Sales Invoice,Commission Rate (%),ኮሚሽን ተመን (%)
 apps/erpnext/erpnext/education/doctype/student_group/student_group.py,Please select Program,እባክዎ ይምረጡ ፕሮግራም
 DocType: Project,Estimated Cost,የተገመተው ወጪ
-DocType: Request for Quotation,Link to material requests,ቁሳዊ ጥያቄዎች አገናኝ
+DocType: Supplier Quotation,Link to material requests,ቁሳዊ ጥያቄዎች አገናኝ
 apps/erpnext/erpnext/public/js/hub/pages/Publish.vue,Publish,አትም
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py,Aerospace,ኤሮስፔስ
 ,Fichier des Ecritures Comptables [FEC],የምዕራፍ ቅዱሳት መጻሕፍትን መዝገቦች [FEC]
@@ -1317,6 +1320,7 @@
 apps/erpnext/erpnext/utilities/transaction_base.py,Invalid Posting Time,ልክ ያልሆነ የመለጠጫ ጊዜ
 DocType: Salary Component,Condition and Formula,ሁኔታ እና ቀመር
 DocType: Lead,Campaign Name,የዘመቻ ስም
+apps/erpnext/erpnext/setup/default_energy_point_rules.py,On Task Completion,ተግባር ማጠናቀቅ ላይ።
 apps/erpnext/erpnext/hr/doctype/compensatory_leave_request/compensatory_leave_request.py,There is no leave period in between {0} and {1},በ {0} እና በ {1} መካከል የጊዜ እረፍት የለም.
 DocType: Fee Validity,Healthcare Practitioner,የጤና አጠባበቅ ባለሙያ
 DocType: Hotel Room,Capacity,ችሎታ
@@ -1661,7 +1665,6 @@
 DocType: Quality Feedback Template,Quality Feedback Template,የጥራት ግብረ መልስ አብነት።
 apps/erpnext/erpnext/config/education.py,LMS Activity,LMS እንቅስቃሴ።
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py,Internet Publishing,የኢንተርኔት ህትመት
-DocType: Prescription Duration,Number,ቁጥር
 apps/erpnext/erpnext/accounts/doctype/opening_invoice_creation_tool/opening_invoice_creation_tool.js,Creating {0} Invoice,{0} ደረሰኝ በመፍጠር ላይ
 DocType: Medical Code,Medical Code Standard,የሕክምና ኮድ መደበኛ
 DocType: Soil Texture,Clay Composition (%),የሸክላ አዘጋጅ (%)
@@ -1736,6 +1739,7 @@
 DocType: Support Settings,Get Started Sections,ክፍሎችን ይጀምሩ
 DocType: Lead,CRM-LEAD-.YYYY.-,CRM-LEAD-YYYY.-
 DocType: Invoice Discounting,Sanctioned,ማዕቀብ
+,Base Amount,የመነሻ መጠን
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.js,Total Contribution Amount: {0},ጠቅላላ ድጎማ መጠን: {0}
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py,Row #{0}: Please specify Serial No for Item {1},የረድፍ # {0}: ንጥል ምንም መለያ ይግለጹ {1}
 DocType: Payroll Entry,Salary Slips Submitted,የደመወዝ ወረቀቶች ተረክበዋል
@@ -1953,6 +1957,7 @@
 apps/erpnext/erpnext/utilities/user_progress.py,List a few of your suppliers. They could be organizations or individuals.,የእርስዎ አቅራቢዎች መካከል ጥቂቶቹን ዘርዝር. እነዚህ ድርጅቶች ወይም ግለሰቦች ሊሆን ይችላል.
 DocType: Accounting Dimension,Dimension Defaults,ልኬቶች ነባሪዎች።
 apps/erpnext/erpnext/crm/report/prospects_engaged_but_not_converted/prospects_engaged_but_not_converted.js,Minimum Lead Age (Days),ዝቅተኛው ሊድ ዕድሜ (ቀኖች)
+apps/erpnext/erpnext/assets/report/fixed_asset_register/fixed_asset_register.py,Available For Use Date,ለአጠቃቀም ቀን ይገኛል።
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py,All BOMs,ሁሉም BOMs
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js,Create Inter Company Journal Entry,የኢንተር ኩባንያ ጆርናል ግባን ይፍጠሩ ፡፡
 DocType: Company,Parent Company,ወላጅ ኩባንያ
@@ -2017,6 +2022,7 @@
 ,IRS 1099,IRS 1099
 DocType: Salary Slip,Leave Without Pay,Pay ያለ ውጣ
 DocType: Payment Request,Outward,ወደ ውጪ
+apps/erpnext/erpnext/setup/default_energy_point_rules.py,On {0} Creation,በ {0} ፈጠራ ላይ።
 apps/erpnext/erpnext/regional/doctype/gstr_3b_report/gstr_3b_report.html,State/UT Tax,ግዛት / UT ግብር
 ,Trial Balance for Party,ፓርቲው በችሎት ባላንስ
 ,Gross and Net Profit Report,ጠቅላላ እና የተጣራ ትርፍ ሪፖርት ፡፡
@@ -2132,6 +2138,7 @@
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js,Make Stock Entry,የአክሲዮን ግባን ያድርጉ ፡፡
 DocType: Hotel Room Reservation,Hotel Reservation User,የሆቴል መያዣ ተጠቃሚ
 apps/erpnext/erpnext/projects/doctype/project/project.js,Set Status,ሁኔታን ያዘጋጁ።
+apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py,Please setup numbering series for Attendance via Setup &gt; Numbering Series,እባክዎን ለተማሪ ተገኝተው በማዋቀር&gt; በቁጥር ተከታታይ በኩል ያዘጋጁ።
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py,Please select prefix first,መጀመሪያ ቅድመ ቅጥያ ይምረጡ
 DocType: Contract,Fulfilment Deadline,የማረጋገጫ ጊዜ ገደብ
 apps/erpnext/erpnext/public/js/hub/pages/Home.vue,Near you,በአጠገብህ
@@ -2147,6 +2154,7 @@
 DocType: Announcement,All Students,ሁሉም ተማሪዎች
 apps/erpnext/erpnext/assets/doctype/asset/asset.py,Item {0} must be a non-stock item,{0} ንጥል ያልሆነ-የአክሲዮን ንጥል መሆን አለበት
 apps/erpnext/erpnext/stock/doctype/batch/batch.js,View Ledger,ይመልከቱ የሒሳብ መዝገብ
+DocType: Cost Center,Lft,Lft
 DocType: Grading Scale,Intervals,ክፍተቶች
 DocType: Bank Statement Transaction Entry,Reconciled Transactions,የተመሳሰሉ ግዢዎች
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py,Earliest,የጥንቶቹ
@@ -2262,6 +2270,7 @@
 apps/erpnext/erpnext/hr/doctype/employee_benefit_application/employee_benefit_application.py,As per your assigned Salary Structure you cannot apply for benefits,በተመደበው የደመወዝ ስነስርዓት መሰረት ለእርዳታ ማመልከት አይችሉም
 apps/erpnext/erpnext/stock/doctype/item/item.py,Website Image should be a public file or website URL,የድር ጣቢያ ምስል ይፋዊ ፋይል ወይም ድር ጣቢያ ዩ አር ኤል መሆን አለበት
 DocType: Purchase Invoice Item,BOM,BOM
+apps/erpnext/erpnext/stock/doctype/item/item.py,Duplicate entry in Manufacturers table,በአምራቾች ሠንጠረዥ ውስጥ የተባዛ ግቤት።
 apps/erpnext/erpnext/setup/doctype/item_group/item_group.js,This is a root item group and cannot be edited.,ይህ ሥር ንጥል ቡድን ነው እና አርትዕ ሊደረግ አይችልም.
 apps/erpnext/erpnext/accounts/doctype/account/account.js,Merge,አዋህደኝ
 DocType: Journal Entry Account,Purchase Order,የግዢ ትእዛዝ
@@ -2406,7 +2415,6 @@
 DocType: Asset,Depreciation Schedules,የእርጅና መርሐግብሮች
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.js,Create Sales Invoice,የሽያጭ መጠየቂያ ደረሰኝ ይፍጠሩ።
 apps/erpnext/erpnext/regional/doctype/gstr_3b_report/gstr_3b_report.html,Ineligible ITC,ብቁ ያልሆነ አይ.ሲ.ሲ.
-apps/erpnext/erpnext/erpnext_integrations/doctype/shopify_settings/shopify_settings.py,"Support for public app is deprecated. Please setup private app, for more details refer user manual",የወል መተግበሪያ ድጋፍ ተቋርጧል. የተጠቃሚ መመሪያን ለተጨማሪ ዝርዝሮች እባክዎን የግል መተግበሪያውን ያዋቅሩ
 DocType: Task,Dependent Tasks,ጥገኛ ተግባራት
 apps/erpnext/erpnext/regional/report/gstr_1/gstr_1.py,Following accounts might be selected in GST Settings:,መለያዎችን በመከተል በ GST ቅንብሮች ውስጥ ሊመረጡ ይችላሉ:
 apps/erpnext/erpnext/manufacturing/report/bom_stock_report/bom_stock_report.js,Quantity to Produce,ብዛት ለማምረት።
@@ -2658,6 +2666,7 @@
 DocType: Water Analysis,Container,ኮንቴይነር
 apps/erpnext/erpnext/regional/report/gstr_1/gstr_1.py,Please set valid GSTIN No. in Company Address,እባክዎ በኩባንያው አድራሻ ውስጥ ትክክለኛ የሆነውን GSTIN ቁጥር ያዘጋጁ።
 apps/erpnext/erpnext/education/utils.py,Student {0} - {1} appears Multiple times in row {2} & {3},ተማሪ {0} - {1} ረድፍ ውስጥ ብዙ ጊዜ ተጠቅሷል {2} እና {3}
+apps/erpnext/erpnext/selling/doctype/customer/customer.py,Following fields are mandatory to create address:,አድራሻን ለመፍጠር የሚከተሉ መስኮች የግድ ናቸው
 DocType: Item Alternative,Two-way,ባለሁለት አቅጣጫ
 DocType: Item,Manufacturers,አምራቾች ፡፡
 apps/erpnext/erpnext/accounts/deferred_revenue.py,Error while processing deferred accounting for {0},ለ {0} የተላለፈውን የሂሳብ አያያዝ ሂደት ላይ ስህተት
@@ -2732,9 +2741,9 @@
 DocType: Employee,HR-EMP-,HR-EMP-
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py,User {0} doesn't have any default POS Profile. Check Default at Row {1} for this User.,ተጠቃሚ {0} ምንም ነባሪ POS የመገለጫ ስም የለውም. ለዚህ ተጠቃሚ ነባሪ {1} ላይ ነባሪ ይመልከቱ.
 DocType: Quality Meeting Minutes,Quality Meeting Minutes,ጥራት ያለው ስብሰባ ደቂቃዎች ፡፡
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Supplier &gt; Supplier Type,አቅራቢ&gt; የአቅራቢ ዓይነት።
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py,Employee Referral,ሠራተኛ ሪፈራል
 DocType: Student Group,Set 0 for no limit,ምንም ገደብ ለ 0 አዘጋጅ
+DocType: Cost Center,rgt,rgt
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py,The day(s) on which you are applying for leave are holidays. You need not apply for leave.,እርስዎ ፈቃድ የሚያመለክቱ ናቸው ላይ ያለው ቀን (ዎች) በዓላት ናቸው. እናንተ ፈቃድን ለማግኘት ማመልከት አይገባም.
 DocType: Customer,Primary Address and Contact Detail,ተቀዳሚ አድራሻ እና የእውቂያ ዝርዝሮች
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.js,Resend Payment Email,የክፍያ ኢሜይል ላክ
@@ -2844,7 +2853,6 @@
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py,Against Supplier Invoice {0} dated {1},አቅራቢው ላይ የደረሰኝ {0} የተዘጋጀው {1}
 DocType: Customer,Default Price List,ነባሪ ዋጋ ዝርዝር
 apps/erpnext/erpnext/assets/doctype/asset/asset.py,Asset Movement record {0} created,የንብረት እንቅስቃሴ መዝገብ {0} ተፈጥሯል
-apps/erpnext/erpnext/utilities/page/leaderboard/leaderboard.js,No items found.,ምንም ንጥሎች አልተገኙም.
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py,You cannot delete Fiscal Year {0}. Fiscal Year {0} is set as default in Global Settings,አንተ መሰረዝ አይችሉም በጀት ዓመት {0}. በጀት ዓመት {0} አቀፍ ቅንብሮች ውስጥ እንደ ነባሪ ተዘጋጅቷል
 DocType: Share Transfer,Equity/Liability Account,የፍትሃዊነት / ተጠያቂነት መለያን
 apps/erpnext/erpnext/setup/doctype/customer_group/customer_group.py,A customer with the same name already exists,ተመሳሳይ ስም ያለው ደንበኛ አስቀድሞ አለ
@@ -2860,6 +2868,7 @@
 apps/erpnext/erpnext/selling/doctype/customer/customer.py,Credit limit has been crossed for customer {0} ({1}/{2}),ለደንበኛ {0} ({1} / {2}) የብድር መጠን ተላልፏል.
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py,Customer required for 'Customerwise Discount',&#39;Customerwise ቅናሽ »ያስፈልጋል የደንበኛ
 apps/erpnext/erpnext/config/accounting.py,Update bank payment dates with journals.,መጽሔቶች ጋር የባንክ የክፍያ ቀኖችን ያዘምኑ.
+,Billed Qty,ሂሳብ የተከፈሉ
 apps/erpnext/erpnext/stock/doctype/item/item_dashboard.py,Pricing,የዋጋ
 DocType: Employee,Attendance Device ID (Biometric/RF tag ID),ተገኝነት መሣሪያ መታወቂያ (ባዮሜትሪክ / አርኤፍ መለያ መለያ)
 DocType: Quotation,Term Details,የሚለው ቃል ዝርዝሮች
@@ -2881,6 +2890,7 @@
 DocType: Share Transfer,Asset Account,የንብረት መለያ
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js,New release date should be in the future,አዲስ የተለቀቀበት ቀን ለወደፊቱ መሆን አለበት።
 DocType: Purchase Invoice,End date of current invoice's period,የአሁኑ መጠየቂያ ያለው ክፍለ ጊዜ መጨረሻ ቀን
+apps/erpnext/erpnext/hr/doctype/employee/employee.py,Please setup Employee Naming System in Human Resource &gt; HR Settings,በሰብአዊ ሀብት&gt; የሰው ሠራሽ ቅንብሮች ውስጥ የሰራተኛ መለያ ስም መስሪያ ስርዓት ያዋቅሩ ፡፡
 DocType: Lab Test,Technician Name,የቴክኒክ ስም
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py,"Cannot ensure delivery by Serial No as \
 					Item {0} is added with and without Ensure Delivery by \
@@ -2888,6 +2898,7 @@
 DocType: Accounts Settings,Unlink Payment on Cancellation of Invoice,የደረሰኝ ስረዛ ላይ ክፍያ አታገናኝ
 DocType: Bank Reconciliation,From Date,ቀን ጀምሮ
 apps/erpnext/erpnext/hr/doctype/vehicle_log/vehicle_log.py,Current Odometer reading entered should be greater than initial Vehicle Odometer {0},ገባ የአሁኑ Odometer ንባብ የመጀመሪያ የተሽከርካሪ Odometer የበለጠ መሆን አለበት {0}
+,Purchase Order Items To Be Received or Billed,እንዲቀበሉ ወይም እንዲከፍሉ የትዕዛዝ ዕቃዎች ይግዙ።
 DocType: Restaurant Reservation,No Show,አልመጣም
 apps/erpnext/erpnext/regional/india/utils.py,You must be a registered supplier to generate e-Way Bill,የኢ-ቢል ሂሳብ ለማመንጨት የተመዘገበ አቅራቢ መሆን አለብዎት ፡፡
 DocType: Shipping Rule Country,Shipping Rule Country,መላኪያ ደንብ አገር
@@ -2930,6 +2941,7 @@
 apps/erpnext/erpnext/templates/generators/item/item_add_to_cart.html,View in Cart,ጨመር ውስጥ ይመልከቱ
 DocType: Employee Checkin,Shift Actual Start,Shift ትክክለኛ ጅምር።
 DocType: Tally Migration,Is Day Book Data Imported,የቀን መጽሐፍ ውሂብ ነው የመጣው።
+,Purchase Order Items To Be Received or Billed1,እንዲቀበሉ ወይም እንዲከፍሉ ትዕዛዝ ዕቃዎች ይግዙ።
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py,Marketing Expenses,የገበያ ወጪ
 apps/erpnext/erpnext/stock/doctype/pick_list/pick_list.py,{0} units of {1} is not available.,{0} የ {1} ክፍሎች አልተገኙም።
 ,Item Shortage Report,ንጥል እጥረት ሪፖርት
@@ -3293,6 +3305,7 @@
 DocType: Homepage Section,Section Cards,የክፍል ካርዶች
 ,Campaign Efficiency,የዘመቻ ቅልጥፍና
 DocType: Discussion,Discussion,ዉይይት
+apps/erpnext/erpnext/setup/default_energy_point_rules.py,On Sales Order Submission,በሽያጭ ማዘዣ ላይ
 DocType: Bank Transaction,Transaction ID,የግብይት መታወቂያ
 DocType: Payroll Entry,Deduct Tax For Unsubmitted Tax Exemption Proof,ላለተወገደ የግብር ነጻነት ማስረጃ ግብር መክፈል
 DocType: Volunteer,Anytime,በማንኛውም ጊዜ
@@ -3300,7 +3313,6 @@
 DocType: Employee Tax Exemption Proof Submission,Employee Tax Exemption Proof Submission,የተጣራ ከግብር ነፃ የመሆን ማረጋገጫ ማስረጃ
 DocType: Patient,Surgical History,የቀዶ ጥገና ታሪክ
 DocType: Bank Statement Settings Item,Mapped Header,ካርታ ራስጌ ርእስ
-apps/erpnext/erpnext/hr/doctype/employee/employee.py,Please setup Employee Naming System in Human Resource &gt; HR Settings,በሰብአዊ ሀብት&gt; የሰው ሠራሽ ቅንጅቶች ውስጥ የሰራተኛ መለያ ስም መስጫ ስርዓትን ያዋቅሩ ፡፡
 DocType: Employee,Resignation Letter Date,የሥራ መልቀቂያ ደብዳቤ ቀን
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Pricing Rules are further filtered based on quantity.,የዋጋ ደንቦች ተጨማሪ በብዛት ላይ ተመስርተው ይጣራሉ.
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py,Please set the Date Of Joining for employee {0},ሠራተኛ ለማግኘት በመቀላቀል ቀን ማዘጋጀት እባክዎ {0}
@@ -3314,6 +3326,7 @@
 DocType: Bank Statement Settings,Mapped Items,የተቀረጹ እቃዎች
 DocType: Amazon MWS Settings,IT,IT
 DocType: Chapter,Chapter,ምዕራፍ
+,Fixed Asset Register,የቋሚ ንብረት ምዝገባ
 apps/erpnext/erpnext/utilities/user_progress.py,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,Select BOM and Qty for Production,ለምርት BOM እና ብዛት ይምረጡ
@@ -3449,7 +3462,6 @@
 apps/erpnext/erpnext/templates/emails/reorder_item.html,Following Material Requests have been raised automatically based on Item's re-order level,ቁሳዊ ጥያቄዎች የሚከተሉት ንጥል ዳግም-ትዕዛዝ ደረጃ ላይ ተመስርቶ በራስ-ሰር ከፍ ተደርጓል
 apps/erpnext/erpnext/controllers/accounts_controller.py,Account {0} is invalid. Account Currency must be {1},መለያ {0} ልክ ያልሆነ ነው. መለያ ምንዛሬ መሆን አለበት {1}
 apps/erpnext/erpnext/hr/doctype/salary_structure_assignment/salary_structure_assignment.py,From Date {0} cannot be after employee's relieving Date {1},ከቀን {0} የሠራተኛውን እፎይታ ቀን በኋላ መሆን አይችልም {1}
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py,Debit Note {0} has been created automatically,የዴቢት ማስታወሻ {0} በራስ-ሰር ተፈጠረ።
 apps/erpnext/erpnext/accounts/doctype/payment_order/payment_order.js,Create Payment Entries,የክፍያ ግቤቶችን ይፍጠሩ።
 DocType: Supplier,Is Internal Supplier,ውስጣዊ አቅራቢ
 DocType: Employee,Create User Permission,የተጠቃሚ ፍቃድ ፍጠር
@@ -4008,7 +4020,6 @@
 DocType: Project User,Project Status,የፕሮጀክት ሁኔታ
 DocType: UOM,Check this to disallow fractions. (for Nos),ክፍልፋዮች እንዲከለክል ይህን ይመልከቱ. (ቁጥሮች ለ)
 DocType: Student Admission Program,Naming Series (for Student Applicant),ተከታታይ እየሰየሙ (የተማሪ አመልካች ለ)
-apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.py,UOM Conversion factor ({0} -&gt; {1}) not found for item: {2},UOM የልወጣ ሁኔታ ({0} -&gt; {1}) ለእንጥል አልተገኘም {{2}
 apps/erpnext/erpnext/hr/doctype/retention_bonus/retention_bonus.py,Bonus Payment Date cannot be a past date,የብድር ክፍያ ቀነ-ገደብ ያለፈበት ቀን ሊሆን አይችልም
 DocType: Travel Request,Copy of Invitation/Announcement,የሥራ መደብ ማስታወቂያ
 DocType: Practitioner Service Unit Schedule,Practitioner Service Unit Schedule,የአለማዳች አገልግሎት ክፍል ዕቅድ
@@ -4156,6 +4167,7 @@
 apps/erpnext/erpnext/utilities/user_progress.py,Setup Company,Setup Company
 ,Lab Test Report,የቤተ ሙከራ ሙከራ ሪፖርት
 DocType: Employee Benefit Application,Employee Benefit Application,የሰራተኛ ጥቅማ ጥቅም ማመልከቻ
+apps/erpnext/erpnext/accounts/doctype/invoice_discounting/invoice_discounting.py,Row({0}): {1} is already discounted in {2},ረድፍ ({0}): {1} በ {2} ውስጥ ቀድሞውኑ ቅናሽ ተደርጓል
 apps/erpnext/erpnext/hr/doctype/additional_salary/additional_salary.py,Additional Salary Component Exists.,ተጨማሪ የደመወዝ አካል ክፍሎች
 DocType: Purchase Invoice,Unregistered,ያልተመዘገበ
 DocType: Student Applicant,Application Date,የመተግበሪያ ቀን
@@ -4232,7 +4244,6 @@
 DocType: Journal Entry,Accounting Entries,አካውንቲንግ ግቤቶችን
 DocType: Job Card Time Log,Job Card Time Log,የሥራ ካርድ ጊዜ ምዝግብ ማስታወሻ ፡፡
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,"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; አጻጻፍ ውስጥ ይካተታል."
-apps/erpnext/erpnext/education/doctype/instructor/instructor.py,Please setup Instructor Naming System in Education &gt; Education Settings,እባክዎ በትምህርቱ&gt; የትምህርት ቅንብሮች ውስጥ የትምህርት አሰጣጥ / መለያ መመሪያን ያዋቅሩ።
 DocType: Journal Entry,Paid Loan,የሚከፈል ብድር
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py,Duplicate Entry. Please check Authorization Rule {0},Entry አባዛ. ያረጋግጡ ማረጋገጫ አገዛዝ {0}
 DocType: Journal Entry Account,Reference Due Date,ማጣቀሻ ቀነ ገደብ
@@ -4249,7 +4260,6 @@
 apps/erpnext/erpnext/templates/pages/projects.html,No time sheets,ምንም ጊዜ ሉሆች
 DocType: GoCardless Mandate,GoCardless Customer,GoCardless ደንበኛ
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py,Leave Type {0} cannot be carry-forwarded,{0} መሸከም-ማስተላለፍ አይቻልም አይነት ይነሱ
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Item Code &gt; Item Group &gt; Brand,የንጥል ኮድ&gt; የንጥል ቡድን&gt; የምርት ስም።
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py,Maintenance Schedule is not generated for all the items. Please click on 'Generate Schedule',ጥገና ፕሮግራም ሁሉም ንጥሎች የመነጨ አይደለም. &#39;አመንጭ ፕሮግራም »ላይ ጠቅ ያድርጉ
 ,To Produce,ለማምረት
 DocType: Leave Encashment,Payroll,የመክፈል ዝርዝር
@@ -4364,7 +4374,6 @@
 DocType: Stock Ledger Entry,Actual Qty After Transaction,ግብይት በኋላ ትክክለኛው ብዛት
 ,Pending SO Items For Purchase Request,የግዢ ጥያቄ ስለዚህ ንጥሎች በመጠባበቅ ላይ
 apps/erpnext/erpnext/education/doctype/student_admission/student_admission.py,Student Admissions,የተማሪ ምዝገባ
-apps/erpnext/erpnext/accounts/party.py,{0} {1} is disabled,{0} {1} ተሰናክሏል
 DocType: Supplier,Billing Currency,አከፋፈል ምንዛሬ
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py,Extra Large,በጣም ትልቅ
 DocType: Loan,Loan Application,የብድር ማመልከቻ
@@ -4441,7 +4450,6 @@
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py,Only Leave Applications with status 'Approved' and 'Rejected' can be submitted,ብቻ ማቅረብ ይችላሉ &#39;ተቀባይነት አላገኘም&#39; &#39;ጸድቋል »እና ሁኔታ ጋር መተግበሪያዎች ውጣ
 apps/erpnext/erpnext/accounts/doctype/accounting_dimension/accounting_dimension.py,Creating Dimensions...,ልኬቶችን በመፍጠር ላይ ...
 apps/erpnext/erpnext/education/doctype/student_group_creation_tool/student_group_creation_tool.py,Student Group Name is mandatory in row {0},የተማሪ ቡድን ስም ረድፍ ላይ ግዴታ ነው {0}
-DocType: Customer Credit Limit,Bypass credit limit_check,የብድር ወሰን_መጠን ማለፍ
 DocType: Homepage,Products to be shown on website homepage,ምርቶች ድር መነሻ ገጽ ላይ የሚታየውን
 DocType: HR Settings,Password Policy,የይለፍ ቃል ፖሊሲ
 apps/erpnext/erpnext/setup/doctype/customer_group/customer_group.js,This is a root customer group and cannot be edited.,ይህ ሥር የደንበኛ ቡድን ነው እና አርትዕ ሊደረግ አይችልም.
@@ -5027,6 +5035,7 @@
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py,No {0} found for Inter Company Transactions.,ለድርጅት ኩባንያዎች ግብይት አልተገኘም {0}.
 DocType: Travel Itinerary,Rented Car,የተከራየች መኪና
 apps/erpnext/erpnext/public/js/hub/components/profile_dialog.js,About your Company,ስለ የእርስዎ ኩባንያ
+apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.js,Show Stock Ageing Data,የአክሲዮን እርጅናን ውሂብ አሳይ።
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py,Credit To account must be a Balance Sheet account,መለያ ወደ ክሬዲት ሚዛን ሉህ መለያ መሆን አለበት
 DocType: Donor,Donor,ለጋሽ
 DocType: Global Defaults,Disable In Words,ቃላት ውስጥ አሰናክል
@@ -5041,8 +5050,10 @@
 DocType: Practitioner Schedule,Schedule Name,መርሐግብር ያስይዙ
 apps/erpnext/erpnext/regional/doctype/gstr_3b_report/gstr_3b_report.py,Please enter GSTIN and state for the Company Address {0},እባክዎ GSTIN ን ያስገቡ እና የኩባንያውን አድራሻ ያስገቡ {0}
 DocType: Currency Exchange,For Buying,ለግዢ
+apps/erpnext/erpnext/setup/default_energy_point_rules.py,On Purchase Order Submission,የግcha ትዕዛዝ ማቅረቢያ ላይ።
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js,Add All Suppliers,ሁሉንም አቅራቢዎች አክል
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py,Row #{0}: Allocated Amount cannot be greater than outstanding amount.,የረድፍ # {0}: የተመደበ መጠን የላቀ መጠን የበለጠ ሊሆን አይችልም.
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Customer &gt; Customer Group &gt; Territory,የደንበኛ&gt; የደንበኛ ቡድን&gt; ክልል።
 DocType: Tally Migration,Parties,ፓርቲዎች ፡፡
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js,Browse BOM,አስስ BOM
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py,Secured Loans,ደህንነቱ የተጠበቀ ብድሮች
@@ -5074,6 +5085,7 @@
 apps/erpnext/erpnext/stock/doctype/item_alternative/item_alternative.py,Not allow to set alternative item for the item {0},ለንጥል የተለየ አማራጭ ለማዘጋጀት አይፈቀድም {0}
 apps/erpnext/erpnext/hr/doctype/leave_block_list/leave_block_list.py,Date is repeated,ቀን ተደግሟል
 apps/erpnext/erpnext/accounts/print_format/payment_receipt_voucher/payment_receipt_voucher.html,Authorized Signatory,የተፈቀደላቸው የፈራሚ
+apps/erpnext/erpnext/education/doctype/instructor/instructor.py,Please setup Instructor Naming System in Education &gt; Education Settings,እባክዎ በትምህርቱ&gt; የትምህርት ቅንብሮች ውስጥ አስተማሪ ስም ማጎሪያ ስርዓት ያዋቅሩ።
 apps/erpnext/erpnext/regional/doctype/gstr_3b_report/gstr_3b_report.html,Net ITC Available(A) - (B),የተጣራ ITC ይገኛል (ሀ) - (ለ)
 apps/erpnext/erpnext/education/doctype/fee_schedule/fee_schedule.js,Create Fees,ክፍያዎች ይፍጠሩ
 DocType: Project,Total Purchase Cost (via Purchase Invoice),ጠቅላላ የግዢ ዋጋ (የግዢ ደረሰኝ በኩል)
@@ -5094,6 +5106,7 @@
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.js,Message Sent,መልዕክት ተልኳል
 apps/erpnext/erpnext/accounts/doctype/account/account.py,Account with child nodes cannot be set as ledger,ልጅ እንደ አንጓዎች ጋር መለያ የመቁጠር ሊዘጋጅ አይችልም
 DocType: C-Form,II,II
+apps/erpnext/erpnext/assets/report/fixed_asset_register/fixed_asset_register.py,Vendor Name,የአቅራቢ ስም።
 DocType: Quiz Result,Wrong,ስህተት።
 DocType: Sales Invoice,Rate at which Price list currency is converted to customer's base currency,ፍጥነት ዋጋ ዝርዝር ምንዛሬ ላይ የደንበኛ መሰረት ከሆነው ምንዛሬ በመለወጥ ላይ ነው
 DocType: Purchase Invoice Item,Net Amount (Company Currency),የተጣራ መጠን (የኩባንያ የምንዛሬ)
@@ -5336,6 +5349,7 @@
 DocType: Stock Settings,Auto Material Request,ራስ-ሐሳብ ያለው ጥያቄ
 DocType: Woocommerce Settings,API consumer secret,የኤ.ፒ.አይ ተጠቃሚ ቁልፍ
 DocType: Delivery Note Item,Available Batch Qty at From Warehouse,መጋዘን ከ ላይ ይገኛል ባች ብዛት
+,Received Qty Amount,የተቀበለው የቁጥር መጠን።
 DocType: Salary Slip,Gross Pay - Total Deduction - Loan Repayment,ጠቅላላ ክፍያ - ጠቅላላ ተቀናሽ - የብድር የሚያየን
 DocType: Bank Account,Last Integration Date,የመጨረሻው የተቀናጀ ቀን።
 DocType: Expense Claim,Expense Taxes and Charges,የወጪ ግብሮች እና ክፍያዎች
@@ -5794,6 +5808,8 @@
 DocType: Drug Prescription,Hour,ሰአት
 DocType: Restaurant Order Entry,Last Sales Invoice,የመጨረሻው የሽያጭ ደረሰኝ
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py,Please select Qty against item {0},እባክዎ ከንጥል {0} ላይ Qty ን ይምረጡ
+apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py,Latest Age,የቅርብ ጊዜ ዕድሜ።
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js,Transfer Material to Supplier,ቁሳቁሶችን ለአቅራቢው ያስተላልፉ።
 apps/erpnext/erpnext/hr/report/loan_repayment/loan_repayment.py,EMI,ኢ.ኢ.አ.
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py,New Serial No cannot have Warehouse. Warehouse must be set by Stock Entry or Purchase Receipt,አዲስ መለያ ምንም መጋዘን ሊኖረው አይችልም. መጋዘን የክምችት Entry ወይም የግዢ ደረሰኝ በ መዘጋጀት አለበት
 DocType: Lead,Lead Type,በእርሳስ አይነት
@@ -5817,7 +5833,6 @@
 apps/erpnext/erpnext/hr/doctype/employee_benefit_application/employee_benefit_application.py,"An amount of {0} already claimed for the component {1},\
 						 set the amount equal or greater than {2}",ለክፍለ አካል ቀድሞውኑ {0} የይገባኛል ጥያቄ {1} ፣ \ መጠኑን ከ {2} እኩል ወይም እኩል እንዲሆን ያዘጋጁ
 DocType: Shipping Rule,Shipping Rule Conditions,የመርከብ ደ ሁኔታዎች
-DocType: Purchase Invoice,Export Type,ወደ ውጪ ላክ
 DocType: Salary Slip Loan,Salary Slip Loan,የደመወዝ ወረቀት ብድር
 DocType: BOM Update Tool,The new BOM after replacement,ምትክ በኋላ ወደ አዲሱ BOM
 ,Point of Sale,የሽያጭ ነጥብ
@@ -5937,7 +5952,6 @@
 DocType: Purchase Order Item,Blanket Order Rate,የበራሪ ትዕዛዝ ተመን
 ,Customer Ledger Summary,የደንበኛ ሌዘር ማጠቃለያ ፡፡
 apps/erpnext/erpnext/hooks.py,Certification,የዕውቅና ማረጋገጫ
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js,Are you sure you want to make debit note?,እርግጠኛ ነዎት የቀጥታ ክፍያ ማስታወሻ ማድረግ ይፈልጋሉ?
 DocType: Bank Guarantee,Clauses and Conditions,ደንቦች እና ሁኔታዎች
 DocType: Serial No,Creation Document Type,የፍጥረት የሰነድ አይነት
 DocType: Amazon MWS Settings,ES,ES
@@ -5975,8 +5989,6 @@
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py,Financial Services,የፋይናንስ አገልግሎቶች
 DocType: Student Sibling,Student ID,የተማሪ መታወቂያ
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.js,For Quantity must be greater than zero,መጠኑ ከዜሮ መብለጥ አለበት
-apps/erpnext/erpnext/hr/doctype/employee_transfer/employee_transfer.py,"Please delete the Employee <a href=""#Form/Employee/{0}"">{0}</a>\
-					to cancel this document","ይህንን ሰነድ ለመሰረዝ እባክዎ ሰራተኛውን <a href=""#Form/Employee/{0}"">{0}</a> \ ያጥፉ።"
 apps/erpnext/erpnext/config/projects.py,Types of activities for Time Logs,ጊዜ ምዝግብ እንቅስቃሴዎች አይነቶች
 DocType: Opening Invoice Creation Tool,Sales,የሽያጭ
 DocType: Stock Entry Detail,Basic Amount,መሰረታዊ መጠን
@@ -6055,6 +6067,7 @@
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py,Print and Stationery,አትም የጽህፈት
 DocType: Stock Settings,Show Barcode Field,አሳይ ባርኮድ መስክ
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js,Send Supplier Emails,አቅራቢው ኢሜይሎች ላክ
+DocType: Asset Movement,ACC-ASM-.YYYY.-,ACC-ASM-.YYYY.-
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py,"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,በራሱ የተፈጠረ
 apps/erpnext/erpnext/hr/doctype/employee_onboarding/employee_onboarding.py,Submit this to create the Employee record,የሰራተኛ መዝገብ ለመፍጠር ይህን ያስገቡ
@@ -6132,7 +6145,6 @@
 DocType: Sales Team,Contact No.,የእውቂያ ቁጥር
 apps/erpnext/erpnext/templates/includes/cart/cart_address.html,Billing Address is same as Shipping Address,የክፍያ መጠየቂያ አድራሻ ከመርከብ መላኪያ አድራሻ ጋር አንድ ነው።
 DocType: Bank Reconciliation,Payment Entries,የክፍያ ግቤቶች
-apps/erpnext/erpnext/erpnext_integrations/doctype/shopify_settings/shopify_settings.py,Access token or Shopify URL missing,የዩ አር ኤል መዳረሻ ወይም የዩቲዩብ መሸጥ ይጎድላል
 DocType: Location,Latitude,ኬክሮስ
 DocType: Work Order,Scrap Warehouse,ቁራጭ መጋዘን
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py,"Warehouse required at Row No {0}, please set default warehouse for the item {1} for the company {2}",በ Row No {0} ውስጥ መጋዘን ያስፈልጋሉ ፣ እባክዎ ለዕቃው ነባሪ መጋዘን ያቅርቡ {1} ለኩባንያው {2}
@@ -6175,7 +6187,6 @@
 DocType: Job Offer Term,Value / Description,እሴት / መግለጫ
 apps/erpnext/erpnext/controllers/accounts_controller.py,"Row #{0}: Asset {1} cannot be submitted, it is already {2}","የረድፍ # {0}: የንብረት {1} ማስገባት አይችልም, ቀድሞውንም ነው {2}"
 DocType: Tax Rule,Billing Country,አከፋፈል አገር
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js,Are you sure you want to make credit note?,እርግጠኛ ነዎት የብድር ማስታወሻ ማድረግ ይፈልጋሉ?
 DocType: Purchase Order Item,Expected Delivery Date,የሚጠበቀው የመላኪያ ቀን
 DocType: Restaurant Order Entry,Restaurant Order Entry,የምግብ ቤት የመግቢያ ግቢ
 apps/erpnext/erpnext/accounts/general_ledger.py,Debit and Credit not equal for {0} #{1}. Difference is {2}.,ዴቢት እና የብድር {0} ለ # እኩል አይደለም {1}. ልዩነት ነው; {2}.
@@ -6300,6 +6311,7 @@
 DocType: Purchase Invoice,Taxes and Charges Added,ግብሮች እና ክፍያዎች ታክሏል
 apps/erpnext/erpnext/assets/doctype/asset/asset.py,Depreciation Row {0}: Next Depreciation Date cannot be before Available-for-use Date,የአከፋፈል ቅደም ተከተልን {0}: የሚቀጥለው የአለሜሽን ቀን ከክፍያ ጋር ለመገናኘት የሚውል ቀን ከመሆኑ በፊት ሊሆን አይችልም
 ,Sales Funnel,የሽያጭ ማጥለያ
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Item Code &gt; Item Group &gt; Brand,የንጥል ኮድ&gt; የንጥል ቡድን&gt; የምርት ስም።
 apps/erpnext/erpnext/setup/doctype/company/company.py,Abbreviation is mandatory,ምህጻረ ቃል የግዴታ ነው
 DocType: Project,Task Progress,ተግባር ሂደት
 apps/erpnext/erpnext/templates/includes/navbar/navbar_items.html,Cart,ጋሪ
@@ -6543,6 +6555,7 @@
 DocType: Employee Grade,Employee Grade,የሰራተኛ ደረጃ
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py,Piecework,ጭማቂዎች
 DocType: GSTR 3B Report,June,ሰኔ
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Supplier &gt; Supplier Type,አቅራቢ&gt; የአቅራቢ ዓይነት።
 DocType: Share Balance,From No,ከ
 DocType: Shift Type,Early Exit Grace Period,ቀደምት የመልቀቂያ ጊዜ።
 DocType: Task,Actual Time (in Hours),(ሰዓቶች ውስጥ) ትክክለኛ ሰዓት
@@ -6827,6 +6840,7 @@
 DocType: Warehouse,Warehouse Name,የመጋዘን ስም
 DocType: Naming Series,Select Transaction,ይምረጡ የግብይት
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py,Please enter Approving Role or Approving User,ሚና በማፅደቅ ወይም የተጠቃሚ በማፅደቅ ያስገቡ
+apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.py,UOM Conversion factor ({0} -&gt; {1}) not found for item: {2},UOM የልወጣ ሁኔታ ({0} -&gt; {1}) ለእንጥል አልተገኘም {{2}
 apps/erpnext/erpnext/support/doctype/service_level_agreement/service_level_agreement.py,Service Level Agreement with Entity Type {0} and Entity {1} already exists.,የአገልግሎት ደረጃ ስምምነት ከድርጅት ዓይነት {0} እና ህጋዊ አካል {1} ቀድሞውኑ አለ።
 DocType: Journal Entry,Write Off Entry,Entry ጠፍቷል ይጻፉ
 DocType: BOM,Rate Of Materials Based On,ደረጃ ይስጡ እቃዎች ላይ የተመረኮዘ ላይ
@@ -7016,6 +7030,7 @@
 DocType: Quality Inspection Reading,Quality Inspection Reading,የጥራት ምርመራ ንባብ
 apps/erpnext/erpnext/stock/doctype/stock_settings/stock_settings.py,`Freeze Stocks Older Than` should be smaller than %d days.,`እሰር አክሲዮኖች የቆየ Than`% d ቀኖች ያነሰ መሆን ይኖርበታል.
 DocType: Tax Rule,Purchase Tax Template,የግብር አብነት ግዢ
+apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py,Earliest Age,የመጀመሪያ ዘመን
 apps/erpnext/erpnext/utilities/user_progress.py,Set a sales goal you'd like to achieve for your company.,ለኩባንያዎ ሊያገኙት የሚፈልጉትን የሽያጭ ግብ ያዘጋጁ.
 DocType: Quality Goal,Revision,ክለሳ
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js,Healthcare Services,የጤና እንክብካቤ አገልግሎቶች
@@ -7059,6 +7074,7 @@
 apps/erpnext/erpnext/healthcare/doctype/patient_encounter/patient_encounter.js,Schedule Discharge,መርሃግብር መውጣት
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py,Cheques and Deposits incorrectly cleared,Cheques እና ተቀማጭ ትክክል ጸድቷል
 DocType: Homepage Section Card,Homepage Section Card,የመነሻ ገጽ ክፍል ካርድ።
+,Amount To Be Billed,የሚከፍለው መጠን
 apps/erpnext/erpnext/accounts/doctype/account/account.py,Account {0}: You can not assign itself as parent account,መለያ {0}: አንተ ወላጅ መለያ ራሱን እንደ መመደብ አይችሉም
 DocType: Purchase Invoice Item,Price List Rate,የዋጋ ዝርዝር ተመን
 apps/erpnext/erpnext/utilities/activation.py,Create customer quotes,የደንበኛ ጥቅሶችን ፍጠር
@@ -7111,6 +7127,7 @@
 DocType: Supplier Scorecard Criteria,Supplier Scorecard Criteria,የአምራች ነጥብ መሥፈርት መስፈርት
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py,Please select Start Date and End Date for Item {0},ንጥል ለ የመጀመሪያ ቀን እና ማብቂያ ቀን ይምረጡ {0}
 DocType: Maintenance Schedule,MAT-MSH-.YYYY.-,MAT-MSH-yYYY.-
+,Amount to Receive,የገንዘብ መጠን ለመቀበል
 apps/erpnext/erpnext/education/doctype/student_group_creation_tool/student_group_creation_tool.py,Course is mandatory in row {0},ኮርስ ረድፍ ላይ ግዴታ ነው {0}
 apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py,From date can not be greater than than To date,ከቀን ቀን በላይ ሊሆን አይችልም።
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py,To date cannot be before from date,ቀን ወደ ቀን ጀምሮ በፊት መሆን አይችልም
@@ -7358,7 +7375,6 @@
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js,BOM and Manufacturing Quantity are required,BOM እና ማኑፋክቸሪንግ ብዛት ያስፈልጋሉ
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js,Ageing Range 2,ጥበቃና ክልል 2
 DocType: SG Creation Tool Course,Max Strength,ከፍተኛ ጥንካሬ
-apps/erpnext/erpnext/accounts/doctype/account/account.py,"Account {0} already exists in child company {1}. The following fields have different values, they should be same:<ul><li>{2}</li></ul>",መለያ {0} አስቀድሞ በልጆች ኩባንያ ውስጥ አለ {1}። የሚከተሉት መስኮች የተለያዩ እሴቶች አሏቸው ፣ ተመሳሳይ መሆን አለባቸው <ul><li> {2} </li></ul>
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py,Installing presets,ቅድመ-ቅምዶችን በመጫን ላይ
 DocType: Fee Schedule,EDU-FSH-.YYYY.-,EDU-FSH-yYYYY.-
 apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js,No Delivery Note selected for Customer {},ለደንበኛ {@} ለማድረስ የማድረሻ መላኪያ አልተሰጠም
@@ -7566,6 +7582,7 @@
 DocType: Delivery Note,Print Without Amount,መጠን ያለ አትም
 apps/erpnext/erpnext/accounts/report/asset_depreciation_ledger/asset_depreciation_ledger.py,Depreciation Date,የእርጅና ቀን
 ,Work Orders in Progress,የስራዎች በሂደት ላይ
+DocType: Customer Credit Limit,Bypass Credit Limit Check,የብድር ገደብ ማጣሪያ ማለፍ።
 DocType: Issue,Support Team,የድጋፍ ቡድን
 apps/erpnext/erpnext/stock/report/batch_item_expiry_status/batch_item_expiry_status.py,Expiry (In Days),(ቀኖች ውስጥ) የሚቃጠልበት
 DocType: Appraisal,Total Score (Out of 5),(5 ውጪ) አጠቃላይ ነጥብ
@@ -7749,6 +7766,7 @@
 DocType: Sales Invoice,Customer GSTIN,የደንበኛ GSTIN
 DocType: Crop Cycle,List of diseases detected on the field. When selected it'll automatically add a list of tasks to deal with the disease ,በመስኩ ላይ የተገኙ የበሽታዎች ዝርዝር. ከተመረጠ በኋላ በሽታው ለመከላከል የሥራ ዝርዝርን ይጨምራል
 apps/erpnext/erpnext/manufacturing/page/bom_comparison_tool/bom_comparison_tool.js,BOM 1,BOM 1
+apps/erpnext/erpnext/assets/report/fixed_asset_register/fixed_asset_register.py,Asset Id,የንብረት መታወቂያ ፡፡
 apps/erpnext/erpnext/healthcare/doctype/healthcare_service_unit/healthcare_service_unit.js,This is a root healthcare service unit and cannot be edited.,ይህ ስር የሰደደ የጤና አገልግሎት አገልግሎት ክፍል ስለሆነ ማስተካከል አይቻልም.
 DocType: Asset Repair,Repair Status,የጥገና ሁኔታ
 apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.js,"Requested Qty: Quantity requested for purchase, but not ordered.",የተጠየቁ ጫፎች ብዛት ለግ for ተጠይቋል ፣ ግን አልተሰጠም።
diff --git a/erpnext/translations/ar.csv b/erpnext/translations/ar.csv
index a7ff3ac..60c5b51 100644
--- a/erpnext/translations/ar.csv
+++ b/erpnext/translations/ar.csv
@@ -289,7 +289,6 @@
 DocType: Loan,Repay Over Number of Periods,سداد على عدد فترات
 apps/erpnext/erpnext/manufacturing/report/bom_stock_report/bom_stock_report.py,Quantity to Produce can not be less than Zero,لا يمكن أن تكون كمية الإنتاج أقل من الصفر
 DocType: Stock Entry,Additional Costs,تكاليف إضافية
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Customer &gt; Customer Group &gt; Territory,العملاء&gt; مجموعة العملاء&gt; الإقليم
 apps/erpnext/erpnext/accounts/doctype/account/account.py,Account with existing transaction can not be converted to group.,لا يمكن تحويل حساب جرت عليه أي عملية إلى تصنيف مجموعة
 DocType: Lead,Product Enquiry,الإستفسار عن المنتج
 DocType: Education Settings,Validate Batch for Students in Student Group,التحقق من صحة الدفعة للطلاب في مجموعة الطلاب
@@ -586,6 +585,7 @@
 DocType: Healthcare Settings,Create documents for sample collection,إنشاء مستندات لجمع العينات
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py,Payment against {0} {1} cannot be greater than Outstanding Amount {2},الدفعة مقابل {0} {1} لا يمكن أن تكون أكبر من المبلغ القائم {2}
 apps/erpnext/erpnext/patches/v11_0/add_healthcare_service_unit_tree_root.py,All Healthcare Service Units,جميع وحدات خدمات الرعاية الصحية
+apps/erpnext/erpnext/setup/default_energy_point_rules.py,On Converting Opportunity,حول تحويل الفرص
 DocType: Bank Account,Address HTML,عنوان HTML
 DocType: Lead,Mobile No.,رقم الجوال
 apps/erpnext/erpnext/selling/doctype/pos_closing_voucher/closing_voucher_details.html,Mode of Payments,طريقة الدفع
@@ -650,7 +650,6 @@
 DocType: Accounting Dimension,Dimension Name,اسم البعد
 apps/erpnext/erpnext/healthcare/setup.py,Resistant,مقاومة
 apps/erpnext/erpnext/hotels/doctype/hotel_room_reservation/hotel_room_reservation.py,Please set Hotel Room Rate on {},يرجى تحديد سعر غرفة الفندق على {}
-apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py,Please setup numbering series for Attendance via Setup &gt; Numbering Series,يرجى إعداد سلسلة الترقيم للحضور عبر الإعداد&gt; سلسلة الترقيم
 DocType: Journal Entry,Multi Currency,متعدد العملات
 DocType: Bank Statement Transaction Invoice Item,Invoice Type,نوع الفاتورة
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py,Valid from date must be less than valid upto date,صالح من تاريخ يجب أن يكون أقل من تاريخ يصل صالح
@@ -765,6 +764,7 @@
 apps/erpnext/erpnext/accounts/page/pos/pos.js,Create a new Customer,إنشاء زبون جديد
 apps/erpnext/erpnext/non_profit/report/expiring_memberships/expiring_memberships.py,Expiring On,تنتهي في
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,"If multiple Pricing Rules continue to prevail, users are asked to set Priority manually to resolve conflict.",إذا استمر ظهور قواعد تسعير المتعددة، يطلب من المستخدمين تعيين الأولوية يدويا لحل التعارض.
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js,Purchase Return,شراء العودة
 apps/erpnext/erpnext/utilities/activation.py,Create Purchase Orders,إنشاء أمر شراء
 ,Purchase Register,سجل شراء
 apps/erpnext/erpnext/healthcare/doctype/patient/patient.py,Patient not found,لم يتم العثور على المريض
@@ -780,7 +780,6 @@
 DocType: Location,Area UOM,وحدة قياس المساحة
 apps/erpnext/erpnext/manufacturing/doctype/workstation/workstation.py,Workstation is closed on the following dates as per Holiday List: {0},مغلق محطة العمل في التواريخ التالية وفقا لقائمة عطلة: {0}
 apps/erpnext/erpnext/selling/page/sales_funnel/sales_funnel.py,Opportunities,الفرص
-apps/erpnext/erpnext/www/all-products/index.html,Clear filters,مرشحات واضحة
 DocType: Lab Test Template,Single,أعزب
 DocType: Compensatory Leave Request,Work From Date,العمل من التاريخ
 DocType: Salary Slip,Total Loan Repayment,إجمالي سداد القروض
@@ -823,6 +822,7 @@
 DocType: Account,Old Parent,الحساب الأب السابق
 apps/erpnext/erpnext/education/doctype/program_enrollment_tool/program_enrollment_tool.py,Mandatory field - Academic Year,حقل إلزامي - السنة الأكاديمية
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py,{0} {1} is not associated with {2} {3},{0} {1} غير مرتبط {2} {3}
+DocType: Opportunity,Converted By,تحويل بواسطة
 apps/erpnext/erpnext/public/js/hub/components/ReviewArea.vue,You need to login as a Marketplace User before you can add any reviews.,تحتاج إلى تسجيل الدخول كمستخدم Marketplace قبل أن تتمكن من إضافة أي مراجعات.
 apps/erpnext/erpnext/manufacturing/doctype/job_card/job_card.py,Row {0} : Operation is required against the raw material item {1},الصف {0}: العملية مطلوبة مقابل عنصر المادة الخام {1}
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py,Please set default payable account for the company {0},يرجى تعيين الحساب الافتراضي المستحق للشركة {0}
@@ -848,6 +848,8 @@
 DocType: BOM,Work Order,أمر العمل
 DocType: Sales Invoice,Total Qty,إجمالي الكمية
 apps/erpnext/erpnext/education/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py,Guardian2 Email ID,Guardian2 معرف البريد الإلكتروني
+apps/erpnext/erpnext/hr/doctype/employee_transfer/employee_transfer.py,"Please delete the Employee <a href=""#Form/Employee/{0}"">{0}</a>\
+					to cancel this document","يرجى حذف الموظف <a href=""#Form/Employee/{0}"">{0}</a> \ لإلغاء هذا المستند"
 DocType: Item,Show in Website (Variant),مشاهدة في موقع (البديل)
 DocType: Employee,Health Concerns,شؤون صحية
 DocType: Payroll Entry,Select Payroll Period,تحديد فترة دفع الرواتب
@@ -907,7 +909,6 @@
 DocType: Codification Table,Codification Table,جدول التدوين
 DocType: Timesheet Detail,Hrs,ساعات
 apps/erpnext/erpnext/manufacturing/page/bom_comparison_tool/bom_comparison_tool.js,Changes in {0},التغييرات في {0}
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js,Please select Company,يرجى اختيار الشركة
 DocType: Employee Skill,Employee Skill,مهارة الموظف
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.js,Difference Account,حساب الفرق
 DocType: Pricing Rule,Discount on Other Item,خصم على بند آخر
@@ -975,6 +976,7 @@
 DocType: BOM,Operating Cost,تكاليف التشغيل
 DocType: Crop,Produced Items,العناصر المنتجة
 DocType: Bank Statement Transaction Entry,Match Transaction to Invoices,مطابقة المعاملة بالفواتير
+apps/erpnext/erpnext/erpnext_integrations/exotel_integration.py,Error in Exotel incoming call,خطأ في Exotel مكالمة واردة
 DocType: Sales Order Item,Gross Profit,الربح الإجمالي
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js,Unblock Invoice,الافراج عن الفاتورة
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py,Increment cannot be 0,لا يمكن أن تكون الزيادة 0
@@ -1188,6 +1190,7 @@
 DocType: Activity Cost,Activity Type,نوع النشاط
 DocType: Request for Quotation,For individual supplier,عن مورد فردي
 DocType: BOM Operation,Base Hour Rate(Company Currency),سعر الساعة الأساسي (عملة الشركة)
+,Qty To Be Billed,الكمية المطلوب دفعها
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py,Delivered Amount,القيمة التي تم تسليمها
 apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.js,Reserved Qty for Production: Raw materials quantity to make manufacturing items.,الكمية المخصصة للإنتاج: كمية المواد الخام لتصنيع المواد.
 DocType: Loyalty Point Entry Redemption,Redemption Date,تاريخ الاسترداد
@@ -1306,7 +1309,7 @@
 DocType: Sales Invoice,Commission Rate (%),نسبة العمولة (٪)
 apps/erpnext/erpnext/education/doctype/student_group/student_group.py,Please select Program,يرجى تحديد البرنامج
 DocType: Project,Estimated Cost,التكلفة التقديرية
-DocType: Request for Quotation,Link to material requests,رابط لطلبات المادية
+DocType: Supplier Quotation,Link to material requests,رابط لطلبات المادية
 apps/erpnext/erpnext/public/js/hub/pages/Publish.vue,Publish,نشر
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py,Aerospace,الفضاء
 ,Fichier des Ecritures Comptables [FEC],فيشير ديس إكوريتورس كومبتابليز [فيك]
@@ -1319,6 +1322,7 @@
 apps/erpnext/erpnext/utilities/transaction_base.py,Invalid Posting Time,وقت نشر غير صالح
 DocType: Salary Component,Condition and Formula,الشرط و الصيغة
 DocType: Lead,Campaign Name,اسم الحملة
+apps/erpnext/erpnext/setup/default_energy_point_rules.py,On Task Completion,على إنجاز المهمة
 apps/erpnext/erpnext/hr/doctype/compensatory_leave_request/compensatory_leave_request.py,There is no leave period in between {0} and {1},لا توجد فترة إجازة بين {0} و {1}
 DocType: Fee Validity,Healthcare Practitioner,طبيب الرعاية الصحية
 DocType: Hotel Room,Capacity,سعة
@@ -1682,7 +1686,6 @@
 DocType: Quality Feedback Template,Quality Feedback Template,قالب ملاحظات الجودة
 apps/erpnext/erpnext/config/education.py,LMS Activity,نشاط LMS
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py,Internet Publishing,نشر على شبكة الإنترنت
-DocType: Prescription Duration,Number,رقم
 apps/erpnext/erpnext/accounts/doctype/opening_invoice_creation_tool/opening_invoice_creation_tool.js,Creating {0} Invoice,إنشاء الفاتورة {0}
 DocType: Medical Code,Medical Code Standard,الرمز الطبي القياسي
 DocType: Soil Texture,Clay Composition (%),تركيب الطين (٪)
@@ -1757,6 +1760,7 @@
 DocType: Support Settings,Get Started Sections,تبدأ الأقسام
 DocType: Lead,CRM-LEAD-.YYYY.-,CRM-LEAD-.YYYY.-
 DocType: Invoice Discounting,Sanctioned,تقرها
+,Base Amount,كمية أساسية
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.js,Total Contribution Amount: {0},إجمالي مبلغ المساهمة: {0}
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py,Row #{0}: Please specify Serial No for Item {1},الصف # {0}: يرجى تحديد رقم التسلسلي للتاريخ {1}
 DocType: Payroll Entry,Salary Slips Submitted,قسائم الرواتب المقدمة
@@ -1974,6 +1978,7 @@
 apps/erpnext/erpnext/utilities/user_progress.py,List a few of your suppliers. They could be organizations or individuals.,ادرج بعض من الموردين الخاصين بك. ويمكن أن يكونوا منظمات أو أفراد.
 DocType: Accounting Dimension,Dimension Defaults,افتراضيات البعد
 apps/erpnext/erpnext/crm/report/prospects_engaged_but_not_converted/prospects_engaged_but_not_converted.js,Minimum Lead Age (Days),الحد الأدنى لعمر الزبون المحتمل (أيام)
+apps/erpnext/erpnext/assets/report/fixed_asset_register/fixed_asset_register.py,Available For Use Date,متاح للاستخدام تاريخ
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py,All BOMs,كل الأصناف المركبة
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js,Create Inter Company Journal Entry,إنشاء Inter Journal Journal Entry
 DocType: Company,Parent Company,الشركة الام
@@ -2038,6 +2043,7 @@
 ,IRS 1099,مصلحة الضرائب 1099
 DocType: Salary Slip,Leave Without Pay,إجازة بدون راتب
 DocType: Payment Request,Outward,نحو الخارج
+apps/erpnext/erpnext/setup/default_energy_point_rules.py,On {0} Creation,في {0} الإنشاء
 apps/erpnext/erpnext/regional/doctype/gstr_3b_report/gstr_3b_report.html,State/UT Tax,الدولة / ضريبة UT
 ,Trial Balance for Party,ميزان المراجعة للحزب
 ,Gross and Net Profit Report,تقرير الربح الإجمالي والصافي
@@ -2153,6 +2159,7 @@
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js,Make Stock Entry,جعل دخول الأسهم
 DocType: Hotel Room Reservation,Hotel Reservation User,فندق حجز المستخدم
 apps/erpnext/erpnext/projects/doctype/project/project.js,Set Status,تعيين الحالة
+apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py,Please setup numbering series for Attendance via Setup &gt; Numbering Series,يرجى إعداد سلسلة الترقيم للحضور عبر الإعداد&gt; سلسلة الترقيم
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py,Please select prefix first,الرجاء اختيار البادئة اولا
 DocType: Contract,Fulfilment Deadline,الموعد النهائي للوفاء
 apps/erpnext/erpnext/public/js/hub/pages/Home.vue,Near you,بالقرب منك
@@ -2168,6 +2175,7 @@
 DocType: Announcement,All Students,جميع الطلاب
 apps/erpnext/erpnext/assets/doctype/asset/asset.py,Item {0} must be a non-stock item,البند {0} يجب أن يكون بند لايتعلق بالمخزون
 apps/erpnext/erpnext/stock/doctype/batch/batch.js,View Ledger,.عرض حساب الاستاد
+DocType: Cost Center,Lft,LFT
 DocType: Grading Scale,Intervals,فترات
 DocType: Bank Statement Transaction Entry,Reconciled Transactions,المعاملات المربوطة
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py,Earliest,أولا
@@ -2283,6 +2291,7 @@
 apps/erpnext/erpnext/hr/doctype/employee_benefit_application/employee_benefit_application.py,As per your assigned Salary Structure you cannot apply for benefits,حسب هيكل الرواتب المعيّن الخاص بك ، لا يمكنك التقدم بطلب للحصول على مخصصات
 apps/erpnext/erpnext/stock/doctype/item/item.py,Website Image should be a public file or website URL,وينبغي أن يكون موقع صورة ملف العامة أو عنوان الموقع
 DocType: Purchase Invoice Item,BOM,فاتورة المواد
+apps/erpnext/erpnext/stock/doctype/item/item.py,Duplicate entry in Manufacturers table,إدخال مكرر في جدول الشركات المصنعة
 apps/erpnext/erpnext/setup/doctype/item_group/item_group.js,This is a root item group and cannot be edited.,هذه هي مجموعة البند الجذرية والتي لا يمكن تحريرها.
 apps/erpnext/erpnext/accounts/doctype/account/account.js,Merge,دمج
 DocType: Journal Entry Account,Purchase Order,أمر الشراء
@@ -2427,7 +2436,6 @@
 DocType: Asset,Depreciation Schedules,جداول الاهلاك الزمنية
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.js,Create Sales Invoice,إنشاء فاتورة مبيعات
 apps/erpnext/erpnext/regional/doctype/gstr_3b_report/gstr_3b_report.html,Ineligible ITC,غير مؤهل ITC
-apps/erpnext/erpnext/erpnext_integrations/doctype/shopify_settings/shopify_settings.py,"Support for public app is deprecated. Please setup private app, for more details refer user manual",تم إيقاف دعم التطبيق العام. يرجى إعداد التطبيق الخاص ، لمزيد من التفاصيل راجع دليل المستخدم
 DocType: Task,Dependent Tasks,المهام التابعة
 apps/erpnext/erpnext/regional/report/gstr_1/gstr_1.py,Following accounts might be selected in GST Settings:,قد يتم اختيار الحسابات التالية في إعدادات ضريبة السلع والخدمات:
 apps/erpnext/erpnext/manufacturing/report/bom_stock_report/bom_stock_report.js,Quantity to Produce,كمية لإنتاج
@@ -2680,6 +2688,7 @@
 DocType: Water Analysis,Container,حاوية
 apps/erpnext/erpnext/regional/report/gstr_1/gstr_1.py,Please set valid GSTIN No. in Company Address,يرجى ضبط رقم GSTIN صالح في عنوان الشركة
 apps/erpnext/erpnext/education/utils.py,Student {0} - {1} appears Multiple times in row {2} & {3},طالب {0} - {1} يبدو مرات متعددة في الصف {2} &amp; {3}
+apps/erpnext/erpnext/selling/doctype/customer/customer.py,Following fields are mandatory to create address:,الحقول التالية إلزامية لإنشاء العنوان:
 DocType: Item Alternative,Two-way,في اتجاهين
 DocType: Item,Manufacturers,مصنعين
 apps/erpnext/erpnext/accounts/deferred_revenue.py,Error while processing deferred accounting for {0},خطأ أثناء معالجة المحاسبة المؤجلة لـ {0}
@@ -2754,9 +2763,9 @@
 DocType: Employee,HR-EMP-,HR-EMP-
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py,User {0} doesn't have any default POS Profile. Check Default at Row {1} for this User.,المستخدم {0} ليس لديه أي ملف تعريف افتراضي ل بوس. تحقق من الافتراضي في الصف {1} لهذا المستخدم.
 DocType: Quality Meeting Minutes,Quality Meeting Minutes,محضر اجتماع الجودة
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Supplier &gt; Supplier Type,مورد&gt; نوع المورد
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py,Employee Referral,إحالة موظف
 DocType: Student Group,Set 0 for no limit,مجموعة 0 لأي حد
+DocType: Cost Center,rgt,RGT
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py,The day(s) on which you are applying for leave are holidays. You need not apply for leave.,اليوم (أيام) التي تقدم بطلب للحصول على إجازة هي العطل.لا تحتاج إلى تقديم طلب للحصول الإجازة.
 DocType: Customer,Primary Address and Contact Detail,العنوان الرئيسي وتفاصيل الاتصال
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.js,Resend Payment Email,إعادة إرسال الدفعة عبر البريد الإلكتروني
@@ -2866,7 +2875,6 @@
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py,Against Supplier Invoice {0} dated {1},مقابل فاتورة المورد {0} بتاريخ {1}
 DocType: Customer,Default Price List,قائمة الأسعار الافتراضي
 apps/erpnext/erpnext/assets/doctype/asset/asset.py,Asset Movement record {0} created,سجل حركة الأصول {0} تم إنشاؤه
-apps/erpnext/erpnext/utilities/page/leaderboard/leaderboard.js,No items found.,لم يتم العثور على العناصر.
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py,You cannot delete Fiscal Year {0}. Fiscal Year {0} is set as default in Global Settings,لا يمكنك حذف السنة المالية {0}. تم تحديد السنة المالية {0} كأفتراضي في الإعدادات الشاملة
 DocType: Share Transfer,Equity/Liability Account,حساب الأسهم / المسؤولية
 apps/erpnext/erpnext/setup/doctype/customer_group/customer_group.py,A customer with the same name already exists,يوجد عميل يحمل الاسم نفسه من قبل
@@ -2882,6 +2890,7 @@
 apps/erpnext/erpnext/selling/doctype/customer/customer.py,Credit limit has been crossed for customer {0} ({1}/{2}),تم تجاوز حد الائتمان للعميل {0} ({1} / {2})
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py,Customer required for 'Customerwise Discount',الزبون مطلوب للخصم المعني بالزبائن
 apps/erpnext/erpnext/config/accounting.py,Update bank payment dates with journals.,تحديث تواريخ الدفع البنكي مع المجلات.
+,Billed Qty,الفواتير الكمية
 apps/erpnext/erpnext/stock/doctype/item/item_dashboard.py,Pricing,التسعير
 DocType: Employee,Attendance Device ID (Biometric/RF tag ID),معرف جهاز الحضور (معرف بطاقة الهوية / RF)
 DocType: Quotation,Term Details,تفاصيل الشروط
@@ -2903,6 +2912,7 @@
 DocType: Share Transfer,Asset Account,حساب الأصول
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js,New release date should be in the future,يجب أن يكون تاريخ الإصدار الجديد في المستقبل
 DocType: Purchase Invoice,End date of current invoice's period,تاريخ نهاية فترة الفاتورة الحالية
+apps/erpnext/erpnext/hr/doctype/employee/employee.py,Please setup Employee Naming System in Human Resource &gt; HR Settings,يرجى إعداد نظام تسمية الموظفين في الموارد البشرية&gt; إعدادات الموارد البشرية
 DocType: Lab Test,Technician Name,اسم فني
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py,"Cannot ensure delivery by Serial No as \
 					Item {0} is added with and without Ensure Delivery by \
@@ -2910,6 +2920,7 @@
 DocType: Accounts Settings,Unlink Payment on Cancellation of Invoice,إلغاء ربط الدفع على إلغاء الفاتورة
 DocType: Bank Reconciliation,From Date,من تاريخ
 apps/erpnext/erpnext/hr/doctype/vehicle_log/vehicle_log.py,Current Odometer reading entered should be greater than initial Vehicle Odometer {0},ينبغي أن تكون القراءة الحالية لعداد المسافات اكبر من القراءة السابقة لعداد المسافات للمركبة {0}
+,Purchase Order Items To Be Received or Billed,بنود أمر الشراء المطلوب استلامها أو تحرير فواتيرها
 DocType: Restaurant Reservation,No Show,لا إظهار
 apps/erpnext/erpnext/regional/india/utils.py,You must be a registered supplier to generate e-Way Bill,يجب أن تكون موردًا مسجلاً لإنشاء فاتورة e-Way
 DocType: Shipping Rule Country,Shipping Rule Country,بلد قاعدة الشحن
@@ -2952,6 +2963,7 @@
 apps/erpnext/erpnext/templates/generators/item/item_add_to_cart.html,View in Cart,عرض في العربة
 DocType: Employee Checkin,Shift Actual Start,التحول الفعلي البداية
 DocType: Tally Migration,Is Day Book Data Imported,يتم استيراد بيانات دفتر اليوم
+,Purchase Order Items To Be Received or Billed1,بنود أمر الشراء المطلوب استلامها أو فاتورة 1
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py,Marketing Expenses,نفقات تسويقية
 apps/erpnext/erpnext/stock/doctype/pick_list/pick_list.py,{0} units of {1} is not available.,{0} وحدات {1} غير متاحة.
 ,Item Shortage Report,تقرير نقص الصنف
@@ -3177,7 +3189,6 @@
 apps/erpnext/erpnext/public/js/call_popup/call_popup.js,View all issues from {0},عرض جميع المشكلات من {0}
 DocType: Quality Inspection,MAT-QA-.YYYY.-,MAT-QA-.YYYY.-
 DocType: Quality Meeting Table,Quality Meeting Table,جدول اجتماع الجودة
-apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,يرجى تعيين سلسلة التسمية لـ {0} عبر الإعداد&gt; الإعدادات&gt; سلسلة التسمية
 apps/erpnext/erpnext/templates/pages/help.html,Visit the forums,زيارة المنتديات
 DocType: Student,Student Mobile Number,طالب عدد موبايل
 DocType: Item,Has Variants,يحتوي على متغيرات
@@ -3319,6 +3330,7 @@
 DocType: Homepage Section,Section Cards,بطاقات القسم
 ,Campaign Efficiency,كفاءة الحملة
 DocType: Discussion,Discussion,نقاش
+apps/erpnext/erpnext/setup/default_energy_point_rules.py,On Sales Order Submission,على تقديم طلب المبيعات
 DocType: Bank Transaction,Transaction ID,رقم المعاملات
 DocType: Payroll Entry,Deduct Tax For Unsubmitted Tax Exemption Proof,خصم الضريبة للحصول على إعفاء من الضرائب غير معتمد
 DocType: Volunteer,Anytime,في أي وقت
@@ -3326,7 +3338,6 @@
 DocType: Employee Tax Exemption Proof Submission,Employee Tax Exemption Proof Submission,إقرار الإعفاء من ضريبة الموظف
 DocType: Patient,Surgical History,التاريخ الجراحي
 DocType: Bank Statement Settings Item,Mapped Header,رأس المعين
-apps/erpnext/erpnext/hr/doctype/employee/employee.py,Please setup Employee Naming System in Human Resource &gt; HR Settings,يرجى إعداد نظام تسمية الموظفين في الموارد البشرية&gt; إعدادات الموارد البشرية
 DocType: Employee,Resignation Letter Date,تاريخ رسالة الإستقالة
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Pricing Rules are further filtered based on quantity.,كما تتم فلترت قواعد التسعير على أساس الكمية.
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py,Please set the Date Of Joining for employee {0},يرجى تحديد تاريخ الالتحاق بالموظف {0}
@@ -3340,6 +3351,7 @@
 DocType: Bank Statement Settings,Mapped Items,الاصناف المعينة
 DocType: Amazon MWS Settings,IT,IT
 DocType: Chapter,Chapter,الفصل
+,Fixed Asset Register,سجل الأصول الثابتة
 apps/erpnext/erpnext/utilities/user_progress.py,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,Select BOM and Qty for Production,حدد BOM والكمية للإنتاج
@@ -3475,7 +3487,6 @@
 apps/erpnext/erpnext/templates/emails/reorder_item.html,Following Material Requests have been raised automatically based on Item's re-order level,تم رفع طلبات المواد التالية تلقائيا بناء على مستوى اعادة الطلب للبنود
 apps/erpnext/erpnext/controllers/accounts_controller.py,Account {0} is invalid. Account Currency must be {1},الحساب {0} غير صحيح. يجب أن تكون عملة الحساب {1}
 apps/erpnext/erpnext/hr/doctype/salary_structure_assignment/salary_structure_assignment.py,From Date {0} cannot be after employee's relieving Date {1},من تاريخ {0} لا يمكن أن يكون بعد تاريخ التخفيف من الموظف {1}
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py,Debit Note {0} has been created automatically,تم إنشاء ملاحظة الخصم {0} تلقائيًا
 apps/erpnext/erpnext/accounts/doctype/payment_order/payment_order.js,Create Payment Entries,إنشاء إدخالات الدفع
 DocType: Supplier,Is Internal Supplier,هو المورد الداخلي
 DocType: Employee,Create User Permission,إنشاء صلاحية المستخدم
@@ -4034,7 +4045,6 @@
 DocType: Project User,Project Status,حالة المشروع
 DocType: UOM,Check this to disallow fractions. (for Nos),حدد هذا الخيار لعدم السماح بالكسور مع الارقام (for Nos)
 DocType: Student Admission Program,Naming Series (for Student Applicant),تسمية تسلسلية (الطالب مقدم الطلب)
-apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.py,UOM Conversion factor ({0} -&gt; {1}) not found for item: {2},معامل تحويل UOM ({0} -&gt; {1}) غير موجود للعنصر: {2}
 apps/erpnext/erpnext/hr/doctype/retention_bonus/retention_bonus.py,Bonus Payment Date cannot be a past date,لا يمكن أن يكون تاريخ الدفع المكافأ تاريخًا سابقًا
 DocType: Travel Request,Copy of Invitation/Announcement,نسخة من الدعوة / الإعلان
 DocType: Practitioner Service Unit Schedule,Practitioner Service Unit Schedule,جدول وحدة خدمة الممارس
@@ -4202,6 +4212,7 @@
 apps/erpnext/erpnext/utilities/user_progress.py,Setup Company,شركة الإعداد
 ,Lab Test Report,تقرير اختبار المختبر
 DocType: Employee Benefit Application,Employee Benefit Application,تطبيق مزايا الموظف
+apps/erpnext/erpnext/accounts/doctype/invoice_discounting/invoice_discounting.py,Row({0}): {1} is already discounted in {2},الصف ({0}): {1} مخصوم بالفعل في {2}
 apps/erpnext/erpnext/hr/doctype/additional_salary/additional_salary.py,Additional Salary Component Exists.,مكون الراتب الإضافي موجود.
 DocType: Purchase Invoice,Unregistered,غير مسجل
 DocType: Student Applicant,Application Date,تاريخ التقديم
@@ -4280,7 +4291,6 @@
 DocType: Journal Entry,Accounting Entries,القيود المحاسبة
 DocType: Job Card Time Log,Job Card Time Log,سجل وقت بطاقة العمل
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,"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;.
-apps/erpnext/erpnext/education/doctype/instructor/instructor.py,Please setup Instructor Naming System in Education &gt; Education Settings,يرجى إعداد نظام تسمية المدرب في التعليم&gt; إعدادات التعليم
 DocType: Journal Entry,Paid Loan,قرض مدفوع
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py,Duplicate Entry. Please check Authorization Rule {0},إدخال مكرر. يرجى التحقق من قاعدة التخويل {0}
 DocType: Journal Entry Account,Reference Due Date,تاريخ الاستحقاق المرجعي
@@ -4297,7 +4307,6 @@
 apps/erpnext/erpnext/templates/pages/projects.html,No time sheets,لا يوجد سجل التوقيت
 DocType: GoCardless Mandate,GoCardless Customer,عميل GoCardless
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py,Leave Type {0} cannot be carry-forwarded,نوع الإجازة {0} لا يمكن ان ترحل الي العام التالي
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Item Code &gt; Item Group &gt; Brand,كود الصنف&gt; مجموعة الصنف&gt; العلامة التجارية
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py,Maintenance Schedule is not generated for all the items. Please click on 'Generate Schedule',"لم يتم إنشاء جدول الصيانة لجميع الاصناف. يرجى النقر على ""إنشاء الجدول الزمني"""
 ,To Produce,لإنتاج
 DocType: Leave Encashment,Payroll,دفع الرواتب
@@ -4412,7 +4421,6 @@
 DocType: Stock Ledger Entry,Actual Qty After Transaction,الكمية الفعلية بعد العملية
 ,Pending SO Items For Purchase Request,اصناف كتيرة معلقة  لطلب الشراء
 apps/erpnext/erpnext/education/doctype/student_admission/student_admission.py,Student Admissions,قبول الطلاب
-apps/erpnext/erpnext/accounts/party.py,{0} {1} is disabled,{0} {1} معطل
 DocType: Supplier,Billing Currency,الفواتير العملات
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py,Extra Large,كبير جدا
 DocType: Loan,Loan Application,طلب القرض
@@ -4489,7 +4497,6 @@
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py,Only Leave Applications with status 'Approved' and 'Rejected' can be submitted,يمكن فقط تقديم  (طلب الاجازة ) الذي حالته (موافق عليه) و (مرفوض)
 apps/erpnext/erpnext/accounts/doctype/accounting_dimension/accounting_dimension.py,Creating Dimensions...,إنشاء الأبعاد ...
 apps/erpnext/erpnext/education/doctype/student_group_creation_tool/student_group_creation_tool.py,Student Group Name is mandatory in row {0},طالب اسم المجموعة هو إلزامي في الصف {0}
-DocType: Customer Credit Limit,Bypass credit limit_check,تجاوز الائتمان limit_check
 DocType: Homepage,Products to be shown on website homepage,المنتجات التي سيتم عرضها على الصفحة الرئيسية للموقع الإلكتروني
 DocType: HR Settings,Password Policy,سياسة كلمة المرور
 apps/erpnext/erpnext/setup/doctype/customer_group/customer_group.js,This is a root customer group and cannot be edited.,هذه هي مجموعة العملاء الجذرية والتي لا يمكن تحريرها.
@@ -4793,6 +4800,7 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py,Row {0}: Advance against Customer must be credit,الصف {0}:  الدفعة المقدمة مقابل الزبائن يجب أن تكون دائن
 DocType: Quality Meeting,Quality Meeting,اجتماع الجودة
 apps/erpnext/erpnext/accounts/doctype/account/account.js,Non-Group to Group,من تصنيف (غير المجموعة) إلى تصنيف ( المجموعة)
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,يرجى تعيين سلسلة التسمية لـ {0} عبر الإعداد&gt; الإعدادات&gt; سلسلة التسمية
 DocType: Employee,ERPNext User,ERPNext المستخدم
 apps/erpnext/erpnext/education/doctype/student_group_creation_tool/student_group_creation_tool.py,Batch is mandatory in row {0},الدفعة إلزامية على التوالي {0}
 DocType: Company,Default Buying Terms,شروط الشراء الافتراضية
@@ -5087,6 +5095,7 @@
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py,No {0} found for Inter Company Transactions.,لم يتم العثور على {0} معاملات Inter Company.
 DocType: Travel Itinerary,Rented Car,سيارة مستأجرة
 apps/erpnext/erpnext/public/js/hub/components/profile_dialog.js,About your Company,عن شركتك
+apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.js,Show Stock Ageing Data,عرض البيانات شيخوخة الأسهم
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py,Credit To account must be a Balance Sheet account,دائن الى حساب يجب أن يكون من حسابات قائمة المركز المالي
 DocType: Donor,Donor,الجهات المانحة
 DocType: Global Defaults,Disable In Words,تعطيل خاصية التفقيط
@@ -5101,8 +5110,10 @@
 DocType: Practitioner Schedule,Schedule Name,اسم الجدول الزمني
 apps/erpnext/erpnext/regional/doctype/gstr_3b_report/gstr_3b_report.py,Please enter GSTIN and state for the Company Address {0},يرجى إدخال GSTIN والدولة لعنوان الشركة {0}
 DocType: Currency Exchange,For Buying,للشراء
+apps/erpnext/erpnext/setup/default_energy_point_rules.py,On Purchase Order Submission,عند تقديم طلب الشراء
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js,Add All Suppliers,إضافة جميع الموردين
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py,Row #{0}: Allocated Amount cannot be greater than outstanding amount.,الصف # {0}: المبلغ المخصص لا يمكن أن يكون أكبر من المبلغ المستحق.
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Customer &gt; Customer Group &gt; Territory,العملاء&gt; مجموعة العملاء&gt; الإقليم
 DocType: Tally Migration,Parties,حفلات
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js,Browse BOM,تصفح قائمة المواد
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py,Secured Loans,القروض المضمونة
@@ -5134,6 +5145,7 @@
 apps/erpnext/erpnext/stock/doctype/item_alternative/item_alternative.py,Not allow to set alternative item for the item {0},لا تسمح بتعيين عنصر بديل للعنصر {0}
 apps/erpnext/erpnext/hr/doctype/leave_block_list/leave_block_list.py,Date is repeated,التاريخ مكرر
 apps/erpnext/erpnext/accounts/print_format/payment_receipt_voucher/payment_receipt_voucher.html,Authorized Signatory,المخول بالتوقيع
+apps/erpnext/erpnext/education/doctype/instructor/instructor.py,Please setup Instructor Naming System in Education &gt; Education Settings,يرجى إعداد نظام تسمية المدرب في التعليم&gt; إعدادات التعليم
 apps/erpnext/erpnext/regional/doctype/gstr_3b_report/gstr_3b_report.html,Net ITC Available(A) - (B),صافي ITC المتوفر (A) - (B)
 apps/erpnext/erpnext/education/doctype/fee_schedule/fee_schedule.js,Create Fees,إنشاء رسوم
 DocType: Project,Total Purchase Cost (via Purchase Invoice),مجموع تكلفة الشراء (عن طريق شراء الفاتورة)
@@ -5154,6 +5166,7 @@
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.js,Message Sent,تم ارسال الرسالة
 apps/erpnext/erpnext/accounts/doctype/account/account.py,Account with child nodes cannot be set as ledger,الحساب الذي لديه حسابات فرعية لا يمكن تعيينه كحساب استاذ
 DocType: C-Form,II,II
+apps/erpnext/erpnext/assets/report/fixed_asset_register/fixed_asset_register.py,Vendor Name,اسم البائع
 DocType: Quiz Result,Wrong,خطأ
 DocType: Sales Invoice,Rate at which Price list currency is converted to customer's base currency,المعدل الذي يتم تحويل سعر العملة العملة الأساسية القائمة لالعملاء
 DocType: Purchase Invoice Item,Net Amount (Company Currency),صافي المبلغ  ( بعملة الشركة )
@@ -5397,6 +5410,7 @@
 DocType: Stock Settings,Auto Material Request,طلب مواد تلقائي
 DocType: Woocommerce Settings,API consumer secret,كلمة مرور مستخدم API
 DocType: Delivery Note Item,Available Batch Qty at From Warehouse,متوفر (كمية باتش) عند (من المخزن)
+,Received Qty Amount,الكمية المستلمة
 DocType: Salary Slip,Gross Pay - Total Deduction - Loan Repayment,اجمالي الأجر - إجمالي الخصم - سداد القروض
 DocType: Bank Account,Last Integration Date,تاريخ التكامل الأخير
 DocType: Expense Claim,Expense Taxes and Charges,مصاريف الضرائب والرسوم
@@ -5855,6 +5869,8 @@
 DocType: Drug Prescription,Hour,الساعة
 DocType: Restaurant Order Entry,Last Sales Invoice,آخر فاتورة المبيعات
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py,Please select Qty against item {0},الرجاء اختيار الكمية ضد العنصر {0}
+apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py,Latest Age,مرحلة متأخرة
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js,Transfer Material to Supplier,نقل المواد إلى المورد
 apps/erpnext/erpnext/hr/report/loan_repayment/loan_repayment.py,EMI,EMI
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py,New Serial No cannot have Warehouse. Warehouse must be set by Stock Entry or Purchase Receipt,المسلسل الجديد غير ممكن للمستودع . يجب ان يكون المستودع مجهز من حركة المخزون او المشتريات المستلمة
 DocType: Lead,Lead Type,نوع الزبون المحتمل
@@ -5878,7 +5894,6 @@
 apps/erpnext/erpnext/hr/doctype/employee_benefit_application/employee_benefit_application.py,"An amount of {0} already claimed for the component {1},\
 						 set the amount equal or greater than {2}",مبلغ {0} تمت المطالبة به بالفعل للمكوِّن {1} ، \ اضبط المبلغ مساويًا أو أكبر من {2}
 DocType: Shipping Rule,Shipping Rule Conditions,شروط قاعدة الشحن
-DocType: Purchase Invoice,Export Type,نوع التصدير
 DocType: Salary Slip Loan,Salary Slip Loan,قرض كشف الراتب
 DocType: BOM Update Tool,The new BOM after replacement,وBOM الجديدة بعد استبدال
 ,Point of Sale,نقطة بيع
@@ -5998,7 +6013,6 @@
 DocType: Purchase Order Item,Blanket Order Rate,بطالة سعر النظام
 ,Customer Ledger Summary,ملخص دفتر الأستاذ
 apps/erpnext/erpnext/hooks.py,Certification,شهادة
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js,Are you sure you want to make debit note?,هل أنت متأكد أنك تريد تدوين المدين؟
 DocType: Bank Guarantee,Clauses and Conditions,الشروط والأحكام
 DocType: Serial No,Creation Document Type,إنشاء نوع الوثيقة
 DocType: Amazon MWS Settings,ES,ES
@@ -6036,8 +6050,6 @@
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py,Financial Services,الخدمات المالية
 DocType: Student Sibling,Student ID,هوية الطالب
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.js,For Quantity must be greater than zero,يجب أن تكون الكمية أكبر من الصفر
-apps/erpnext/erpnext/hr/doctype/employee_transfer/employee_transfer.py,"Please delete the Employee <a href=""#Form/Employee/{0}"">{0}</a>\
-					to cancel this document","يرجى حذف الموظف <a href=""#Form/Employee/{0}"">{0}</a> \ لإلغاء هذا المستند"
 apps/erpnext/erpnext/config/projects.py,Types of activities for Time Logs,أنواع الأنشطة لسجلات الوقت
 DocType: Opening Invoice Creation Tool,Sales,مبيعات
 DocType: Stock Entry Detail,Basic Amount,المبلغ الأساسي
@@ -6116,6 +6128,7 @@
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py,Print and Stationery,طباعة وقرطاسية
 DocType: Stock Settings,Show Barcode Field,مشاهدة الباركود الميدان
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js,Send Supplier Emails,إرسال رسائل البريد الإلكتروني مزود
+DocType: Asset Movement,ACC-ASM-.YYYY.-,ACC-ASM-.YYYY.-
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py,"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,إنشاء تلقائي
 apps/erpnext/erpnext/hr/doctype/employee_onboarding/employee_onboarding.py,Submit this to create the Employee record,إرسال هذا لإنشاء سجل الموظف
@@ -6193,7 +6206,6 @@
 DocType: Sales Team,Contact No.,الاتصال رقم
 apps/erpnext/erpnext/templates/includes/cart/cart_address.html,Billing Address is same as Shipping Address,عنوان الفواتير هو نفس عنوان الشحن
 DocType: Bank Reconciliation,Payment Entries,ادخال دفعات
-apps/erpnext/erpnext/erpnext_integrations/doctype/shopify_settings/shopify_settings.py,Access token or Shopify URL missing,الوصول إلى الرمز المميز أو رابط المتجر مفقود
 DocType: Location,Latitude,خط العرض
 DocType: Work Order,Scrap Warehouse,الخردة مستودع
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py,"Warehouse required at Row No {0}, please set default warehouse for the item {1} for the company {2}",مستودع مطلوب في الصف رقم {0} ، يرجى تعيين المستودع الافتراضي للبند {1} للشركة {2}
@@ -6236,7 +6248,6 @@
 DocType: Job Offer Term,Value / Description,القيمة / الوصف
 apps/erpnext/erpnext/controllers/accounts_controller.py,"Row #{0}: Asset {1} cannot be submitted, it is already {2}",الصف # {0}: الاصل {1} لا يمكن تقديمه ، لانه بالفعل {2}
 DocType: Tax Rule,Billing Country,بلد إرسال الفواتير
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js,Are you sure you want to make credit note?,هل أنت متأكد أنك تريد عمل مذكرة ائتمان؟
 DocType: Purchase Order Item,Expected Delivery Date,تاريخ التسليم المتوقع
 DocType: Restaurant Order Entry,Restaurant Order Entry,مطعم دخول الطلب
 apps/erpnext/erpnext/accounts/general_ledger.py,Debit and Credit not equal for {0} #{1}. Difference is {2}.,المدين و الدائن غير متساوي ل {0} # {1}. الفرق هو {2}.
@@ -6361,6 +6372,7 @@
 DocType: Purchase Invoice,Taxes and Charges Added,أضيفت الضرائب والرسوم
 apps/erpnext/erpnext/assets/doctype/asset/asset.py,Depreciation Row {0}: Next Depreciation Date cannot be before Available-for-use Date,صف الإهلاك {0}: لا يمكن أن يكون تاريخ الاستهلاك التالي قبل تاريخ المتاح للاستخدام
 ,Sales Funnel,قمع المبيعات
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Item Code &gt; Item Group &gt; Brand,كود الصنف&gt; مجموعة الصنف&gt; العلامة التجارية
 apps/erpnext/erpnext/setup/doctype/company/company.py,Abbreviation is mandatory,الاسم المختصر إلزامي
 DocType: Project,Task Progress,تقدم المهمة
 apps/erpnext/erpnext/templates/includes/navbar/navbar_items.html,Cart,عربة
@@ -6605,6 +6617,7 @@
 DocType: Employee Grade,Employee Grade,درجة الموظف
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py,Piecework,الأجرة المدفوعة لكمية العمل المنجز
 DocType: GSTR 3B Report,June,يونيو
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Supplier &gt; Supplier Type,مورد&gt; نوع المورد
 DocType: Share Balance,From No,من رقم
 DocType: Shift Type,Early Exit Grace Period,الخروج المبكر فترة سماح
 DocType: Task,Actual Time (in Hours),الوقت الفعلي (بالساعات)
@@ -6891,6 +6904,7 @@
 DocType: Warehouse,Warehouse Name,اسم المستودع
 DocType: Naming Series,Select Transaction,حدد المعاملات
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py,Please enter Approving Role or Approving User,الرجاء إدخال صلاحية المخول بالتصديق أو المستخدم المخول بالتصديق
+apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.py,UOM Conversion factor ({0} -&gt; {1}) not found for item: {2},معامل تحويل UOM ({0} -&gt; {1}) غير موجود للعنصر: {2}
 apps/erpnext/erpnext/support/doctype/service_level_agreement/service_level_agreement.py,Service Level Agreement with Entity Type {0} and Entity {1} already exists.,اتفاقية مستوى الخدمة مع نوع الكيان {0} والكيان {1} موجودة بالفعل.
 DocType: Journal Entry,Write Off Entry,شطب الدخول
 DocType: BOM,Rate Of Materials Based On,سعرالمواد استنادا على
@@ -7082,6 +7096,7 @@
 DocType: Quality Inspection Reading,Quality Inspection Reading,جودة التفتيش القراءة
 apps/erpnext/erpnext/stock/doctype/stock_settings/stock_settings.py,`Freeze Stocks Older Than` should be smaller than %d days.,` تجميد المخزون الأقدم من يجب أن يكون أقل من ٪ d يوم ` .
 DocType: Tax Rule,Purchase Tax Template,قالب الضرائب على المشتريات
+apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py,Earliest Age,أقدم عمر
 apps/erpnext/erpnext/utilities/user_progress.py,Set a sales goal you'd like to achieve for your company.,عين هدف المبيعات الذي تريد تحقيقه لشركتك.
 DocType: Quality Goal,Revision,مراجعة
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js,Healthcare Services,خدمات الرعاية الصحية
@@ -7125,6 +7140,7 @@
 apps/erpnext/erpnext/healthcare/doctype/patient_encounter/patient_encounter.js,Schedule Discharge,الجدول الزمني التفريغ
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py,Cheques and Deposits incorrectly cleared,الشيكات والودائع موضحة او المقاصة تمت بشكل غير صحيح
 DocType: Homepage Section Card,Homepage Section Card,بطاقة قسم الصفحة الرئيسية
+,Amount To Be Billed,المبلغ الذي ستتم محاسبته
 apps/erpnext/erpnext/accounts/doctype/account/account.py,Account {0}: You can not assign itself as parent account,الحساب {0}: لا يمكنك جعله حساب رئيسي
 DocType: Purchase Invoice Item,Price List Rate,قائمة الأسعار قيم
 apps/erpnext/erpnext/utilities/activation.py,Create customer quotes,إنشاء عروض مسعرة للزبائن
@@ -7177,6 +7193,7 @@
 DocType: Supplier Scorecard Criteria,Supplier Scorecard Criteria,معايير بطاقة تقييم الموردين
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py,Please select Start Date and End Date for Item {0},الرجاء تحديد تاريخ البدء وتاريخ الانتهاء للبند {0}
 DocType: Maintenance Schedule,MAT-MSH-.YYYY.-,MAT-MSH-.YYYY.-
+,Amount to Receive,المبلغ لتلقي
 apps/erpnext/erpnext/education/doctype/student_group_creation_tool/student_group_creation_tool.py,Course is mandatory in row {0},المقرر إلزامية في الصف {0}
 apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py,From date can not be greater than than To date,من تاريخ لا يمكن أن يكون أكبر من إلى
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py,To date cannot be before from date,(الى تاريخ) لا يمكن ان يكون قبل (من تاريخ)
@@ -7425,7 +7442,6 @@
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js,BOM and Manufacturing Quantity are required,مطلوب، قائمة مكونات المواد و كمية التصنيع
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js,Ageing Range 2,مدى العمر 2
 DocType: SG Creation Tool Course,Max Strength,القوة القصوى
-apps/erpnext/erpnext/accounts/doctype/account/account.py,"Account {0} already exists in child company {1}. The following fields have different values, they should be same:<ul><li>{2}</li></ul>","الحساب {0} موجود بالفعل في الشركة التابعة {1}. الحقول التالية لها قيم مختلفة ، يجب أن تكون هي نفسها: <ul style=""""><li style=""""> {2} </li></ul>"
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py,Installing presets,تثبيت الإعدادات المسبقة
 DocType: Fee Schedule,EDU-FSH-.YYYY.-,EDU-FSH-.YYYY.-
 apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js,No Delivery Note selected for Customer {},لم يتم تحديد ملاحظة التسليم للعميل {}
@@ -7633,6 +7649,7 @@
 DocType: Delivery Note,Print Without Amount,طباعة بدون قيمة
 apps/erpnext/erpnext/accounts/report/asset_depreciation_ledger/asset_depreciation_ledger.py,Depreciation Date,تاريخ الإهلاك
 ,Work Orders in Progress,أوامر العمل في التقدم
+DocType: Customer Credit Limit,Bypass Credit Limit Check,تجاوز حد الائتمان الشيك
 DocType: Issue,Support Team,فريق الدعم
 apps/erpnext/erpnext/stock/report/batch_item_expiry_status/batch_item_expiry_status.py,Expiry (In Days),انتهاء (في يوم)
 DocType: Appraisal,Total Score (Out of 5),مجموع نقاط (من 5)
@@ -7816,6 +7833,7 @@
 DocType: Sales Invoice,Customer GSTIN,العميل غستين
 DocType: Crop Cycle,List of diseases detected on the field. When selected it'll automatically add a list of tasks to deal with the disease ,قائمة الأمراض المكتشفة في الميدان. عند اختيارها سوف تضيف تلقائيا قائمة من المهام للتعامل مع المرض
 apps/erpnext/erpnext/manufacturing/page/bom_comparison_tool/bom_comparison_tool.js,BOM 1,BOM 1
+apps/erpnext/erpnext/assets/report/fixed_asset_register/fixed_asset_register.py,Asset Id,معرف الأصول
 apps/erpnext/erpnext/healthcare/doctype/healthcare_service_unit/healthcare_service_unit.js,This is a root healthcare service unit and cannot be edited.,هذا هو وحدة خدمة الرعاية الصحية الجذر ولا يمكن تحريرها.
 DocType: Asset Repair,Repair Status,حالة الإصلاح
 apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.js,"Requested Qty: Quantity requested for purchase, but not ordered.",طلب الكمية : الكمية المطلوبة للشراء ، ولكن ليس أمر .
diff --git a/erpnext/translations/bg.csv b/erpnext/translations/bg.csv
index f6f689e..ab0fb60 100644
--- a/erpnext/translations/bg.csv
+++ b/erpnext/translations/bg.csv
@@ -289,7 +289,6 @@
 DocType: Loan,Repay Over Number of Periods,Погасяване Над брой периоди
 apps/erpnext/erpnext/manufacturing/report/bom_stock_report/bom_stock_report.py,Quantity to Produce can not be less than Zero,Количеството за производство не може да бъде по-малко от нула
 DocType: Stock Entry,Additional Costs,Допълнителни разходи
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Customer &gt; Customer Group &gt; Territory,Клиент&gt; Клиентска група&gt; Територия
 apps/erpnext/erpnext/accounts/doctype/account/account.py,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,Валидирайте партида за студенти в студентска група
@@ -586,6 +585,7 @@
 DocType: Healthcare Settings,Create documents for sample collection,Създаване на документи за събиране на проби
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py,Payment against {0} {1} cannot be greater than Outstanding Amount {2},"Заплащане срещу {0} {1} не може да бъде по-голяма от дължимата сума, {2}"
 apps/erpnext/erpnext/patches/v11_0/add_healthcare_service_unit_tree_root.py,All Healthcare Service Units,Всички звена за здравни услуги
+apps/erpnext/erpnext/setup/default_energy_point_rules.py,On Converting Opportunity,Относно възможността за конвертиране
 DocType: Bank Account,Address HTML,Адрес HTML
 DocType: Lead,Mobile No.,Моб. номер
 apps/erpnext/erpnext/selling/doctype/pos_closing_voucher/closing_voucher_details.html,Mode of Payments,Начин на плащане
@@ -650,7 +650,6 @@
 DocType: Accounting Dimension,Dimension Name,Име на величината
 apps/erpnext/erpnext/healthcare/setup.py,Resistant,устойчив
 apps/erpnext/erpnext/hotels/doctype/hotel_room_reservation/hotel_room_reservation.py,Please set Hotel Room Rate on {},"Моля, посочете цената на стаята в хотел {}"
-apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py,Please setup numbering series for Attendance via Setup &gt; Numbering Series,"Моля, настройте сериите за номериране на посещаемостта чрез Настройка&gt; Серия за номериране"
 DocType: Journal Entry,Multi Currency,Много валути
 DocType: Bank Statement Transaction Invoice Item,Invoice Type,Вид фактура
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py,Valid from date must be less than valid upto date,Валидно от датата трябва да е по-малко от валидната до дата
@@ -765,6 +764,7 @@
 apps/erpnext/erpnext/accounts/page/pos/pos.js,Create a new Customer,Създаване на нов клиент
 apps/erpnext/erpnext/non_profit/report/expiring_memberships/expiring_memberships.py,Expiring On,Изтичане на On
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,"If multiple Pricing Rules continue to prevail, users are asked to set Priority manually to resolve conflict.","Ако няколко ценови правила продължават да преобладават, потребителите се приканват да се настрои приоритет ръчно да разрешите конфликт."
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js,Purchase Return,Покупка Return
 apps/erpnext/erpnext/utilities/activation.py,Create Purchase Orders,Създаване на поръчки за покупка
 ,Purchase Register,Покупка Регистрация
 apps/erpnext/erpnext/healthcare/doctype/patient/patient.py,Patient not found,Пациентът не е намерен
@@ -780,7 +780,6 @@
 DocType: Location,Area UOM,Площ UOM
 apps/erpnext/erpnext/manufacturing/doctype/workstation/workstation.py,Workstation is closed on the following dates as per Holiday List: {0},"Workstation е затворен на следните дати, както на Holiday Списък: {0}"
 apps/erpnext/erpnext/selling/page/sales_funnel/sales_funnel.py,Opportunities,Възможности
-apps/erpnext/erpnext/www/all-products/index.html,Clear filters,Изчистване на филтрите
 DocType: Lab Test Template,Single,Единичен
 DocType: Compensatory Leave Request,Work From Date,Работа от дата
 DocType: Salary Slip,Total Loan Repayment,Общо кредит за погасяване
@@ -823,6 +822,7 @@
 DocType: Account,Old Parent,Предишен родител
 apps/erpnext/erpnext/education/doctype/program_enrollment_tool/program_enrollment_tool.py,Mandatory field - Academic Year,Задължително поле - академична година
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py,{0} {1} is not associated with {2} {3},{0} {1} не е свързана с {2} {3}
+DocType: Opportunity,Converted By,Преобразувано от
 apps/erpnext/erpnext/public/js/hub/components/ReviewArea.vue,You need to login as a Marketplace User before you can add any reviews.,"Трябва да влезете като потребител на Marketplace, преди да можете да добавяте отзиви."
 apps/erpnext/erpnext/manufacturing/doctype/job_card/job_card.py,Row {0} : Operation is required against the raw material item {1},Ред {0}: Необходима е операция срещу елемента на суровината {1}
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py,Please set default payable account for the company {0},"Моля, задайте по подразбиране платим акаунт за фирмата {0}"
@@ -848,6 +848,8 @@
 DocType: BOM,Work Order,Работна поръчка
 DocType: Sales Invoice,Total Qty,Общо Количество
 apps/erpnext/erpnext/education/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py,Guardian2 Email ID,Идентификационен номер на
+apps/erpnext/erpnext/hr/doctype/employee_transfer/employee_transfer.py,"Please delete the Employee <a href=""#Form/Employee/{0}"">{0}</a>\
+					to cancel this document","Моля, изтрийте Служителя <a href=""#Form/Employee/{0}"">{0}</a> \, за да отмените този документ"
 DocType: Item,Show in Website (Variant),Покажи в уебсайта (вариант)
 DocType: Employee,Health Concerns,Здравни проблеми
 DocType: Payroll Entry,Select Payroll Period,Изберете ТРЗ Период
@@ -907,7 +909,6 @@
 DocType: Codification Table,Codification Table,Кодификационна таблица
 DocType: Timesheet Detail,Hrs,Часове
 apps/erpnext/erpnext/manufacturing/page/bom_comparison_tool/bom_comparison_tool.js,Changes in {0},Промени в {0}
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js,Please select Company,Моля изберете фирма
 DocType: Employee Skill,Employee Skill,Умение на служителите
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.js,Difference Account,Разлика Акаунт
 DocType: Pricing Rule,Discount on Other Item,Отстъпка за друг артикул
@@ -975,6 +976,7 @@
 DocType: BOM,Operating Cost,Експлоатационни разходи
 DocType: Crop,Produced Items,Произведени елементи
 DocType: Bank Statement Transaction Entry,Match Transaction to Invoices,Сравняване на транзакциите с фактури
+apps/erpnext/erpnext/erpnext_integrations/exotel_integration.py,Error in Exotel incoming call,Грешка при входящо повикване в Exotel
 DocType: Sales Order Item,Gross Profit,Брутна Печалба
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js,Unblock Invoice,Деблокиране на фактурата
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py,Increment cannot be 0,Увеличаване не може да бъде 0
@@ -1188,6 +1190,7 @@
 DocType: Activity Cost,Activity Type,Вид Дейност
 DocType: Request for Quotation,For individual supplier,За отделен доставчик
 DocType: BOM Operation,Base Hour Rate(Company Currency),Базова цена на час (Валута на компанията)
+,Qty To Be Billed,"Количество, за да бъдете таксувани"
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py,Delivered Amount,Доставени Сума
 apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.js,Reserved Qty for Production: Raw materials quantity to make manufacturing items.,"Количество, запазено за производство: количество суровини за производство на производствени артикули."
 DocType: Loyalty Point Entry Redemption,Redemption Date,Дата на обратно изкупуване
@@ -1306,7 +1309,7 @@
 DocType: Sales Invoice,Commission Rate (%),Комисионен процент (%)
 apps/erpnext/erpnext/education/doctype/student_group/student_group.py,Please select Program,"Моля, изберете Програма"
 DocType: Project,Estimated Cost,Очаквани разходи
-DocType: Request for Quotation,Link to material requests,Препратка към материални искания
+DocType: Supplier Quotation,Link to material requests,Препратка към материални искания
 apps/erpnext/erpnext/public/js/hub/pages/Publish.vue,Publish,публикувам
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py,Aerospace,Космически
 ,Fichier des Ecritures Comptables [FEC],Fichier des Ecritures Comptables [FEC]
@@ -1319,6 +1322,7 @@
 apps/erpnext/erpnext/utilities/transaction_base.py,Invalid Posting Time,Невалидно време за публикуване
 DocType: Salary Component,Condition and Formula,Състояние и формула
 DocType: Lead,Campaign Name,Име на кампанията
+apps/erpnext/erpnext/setup/default_energy_point_rules.py,On Task Completion,При изпълнение на задачата
 apps/erpnext/erpnext/hr/doctype/compensatory_leave_request/compensatory_leave_request.py,There is no leave period in between {0} and {1},Няма период на отпуск между {0} и {1}
 DocType: Fee Validity,Healthcare Practitioner,Здравен практикуващ
 DocType: Hotel Room,Capacity,Капацитет
@@ -1663,7 +1667,6 @@
 DocType: Quality Feedback Template,Quality Feedback Template,Качествен обратен шаблон
 apps/erpnext/erpnext/config/education.py,LMS Activity,LMS дейност
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py,Internet Publishing,Internet Publishing
-DocType: Prescription Duration,Number,номер
 apps/erpnext/erpnext/accounts/doctype/opening_invoice_creation_tool/opening_invoice_creation_tool.js,Creating {0} Invoice,Създаване на {0} фактура
 DocType: Medical Code,Medical Code Standard,Стандартен медицински код
 DocType: Soil Texture,Clay Composition (%),Състав на глина (%)
@@ -1738,6 +1741,7 @@
 DocType: Support Settings,Get Started Sections,Стартирайте секциите
 DocType: Lead,CRM-LEAD-.YYYY.-,CRM-LEAD-.YYYY.-
 DocType: Invoice Discounting,Sanctioned,санкционирана
+,Base Amount,Базова сума
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.js,Total Contribution Amount: {0},Обща сума на приноса: {0}
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py,Row #{0}: Please specify Serial No for Item {1},"Row # {0}: Моля, посочете Пореден № за позиция {1}"
 DocType: Payroll Entry,Salary Slips Submitted,Предоставени са фишове за заплати
@@ -1955,6 +1959,7 @@
 apps/erpnext/erpnext/utilities/user_progress.py,List a few of your suppliers. They could be organizations or individuals.,Изборите някои от вашите доставчици. Те могат да бъдат организации или индивидуални лица.
 DocType: Accounting Dimension,Dimension Defaults,Размери по подразбиране
 apps/erpnext/erpnext/crm/report/prospects_engaged_but_not_converted/prospects_engaged_but_not_converted.js,Minimum Lead Age (Days),Минимална водеща възраст (дни)
+apps/erpnext/erpnext/assets/report/fixed_asset_register/fixed_asset_register.py,Available For Use Date,Достъпна за употреба дата
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py,All BOMs,Всички спецификации на материали
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js,Create Inter Company Journal Entry,Създаване на записите в Inter Company Journal
 DocType: Company,Parent Company,Компанията-майка
@@ -2019,6 +2024,7 @@
 ,IRS 1099,IRS 1099
 DocType: Salary Slip,Leave Without Pay,Неплатен отпуск
 DocType: Payment Request,Outward,навън
+apps/erpnext/erpnext/setup/default_energy_point_rules.py,On {0} Creation,На {0} Създаване
 apps/erpnext/erpnext/regional/doctype/gstr_3b_report/gstr_3b_report.html,State/UT Tax,Държавен / НТ данък
 ,Trial Balance for Party,Оборотка за партньор
 ,Gross and Net Profit Report,Отчет за брутната и нетната печалба
@@ -2134,6 +2140,7 @@
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js,Make Stock Entry,Направете запис на акции
 DocType: Hotel Room Reservation,Hotel Reservation User,Потребителски резервационен хотел
 apps/erpnext/erpnext/projects/doctype/project/project.js,Set Status,Задаване на състояние
+apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py,Please setup numbering series for Attendance via Setup &gt; Numbering Series,"Моля, настройте сериите за номериране на посещаемостта чрез Настройка&gt; Серия за номериране"
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py,Please select prefix first,Моля изберете префикс първо
 DocType: Contract,Fulfilment Deadline,Краен срок за изпълнение
 apps/erpnext/erpnext/public/js/hub/pages/Home.vue,Near you,Близо до вас
@@ -2149,6 +2156,7 @@
 DocType: Announcement,All Students,Всички студенти
 apps/erpnext/erpnext/assets/doctype/asset/asset.py,Item {0} must be a non-stock item,"Позиция {0} трябва да е позиция, която не се с наличности"
 apps/erpnext/erpnext/stock/doctype/batch/batch.js,View Ledger,Показване на счетоводна книга
+DocType: Cost Center,Lft,Lft
 DocType: Grading Scale,Intervals,Интервали
 DocType: Bank Statement Transaction Entry,Reconciled Transactions,Съгласувани транзакции
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py,Earliest,Най-ранната
@@ -2264,6 +2272,7 @@
 apps/erpnext/erpnext/hr/doctype/employee_benefit_application/employee_benefit_application.py,As per your assigned Salary Structure you cannot apply for benefits,Според назначената структура на заплатите не можете да кандидатствате за обезщетения
 apps/erpnext/erpnext/stock/doctype/item/item.py,Website Image should be a public file or website URL,Сайт на снимката трябва да бъде държавна файл или уеб сайт URL
 DocType: Purchase Invoice Item,BOM,BOM
+apps/erpnext/erpnext/stock/doctype/item/item.py,Duplicate entry in Manufacturers table,Дублиран запис в таблицата на производителите
 apps/erpnext/erpnext/setup/doctype/item_group/item_group.js,This is a root item group and cannot be edited.,Това е главната позиция група и не може да се редактира.
 apps/erpnext/erpnext/accounts/doctype/account/account.js,Merge,сливам
 DocType: Journal Entry Account,Purchase Order,Поръчка
@@ -2408,7 +2417,6 @@
 DocType: Asset,Depreciation Schedules,Амортизационни Списъци
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.js,Create Sales Invoice,Създайте фактура за продажби
 apps/erpnext/erpnext/regional/doctype/gstr_3b_report/gstr_3b_report.html,Ineligible ITC,Недопустим ITC
-apps/erpnext/erpnext/erpnext_integrations/doctype/shopify_settings/shopify_settings.py,"Support for public app is deprecated. Please setup private app, for more details refer user manual","Поддръжката за публично приложение е отхвърлена. Моля, задайте частно приложение, за повече подробности вижте ръководството за потребителя"
 DocType: Task,Dependent Tasks,Зависими задачи
 apps/erpnext/erpnext/regional/report/gstr_1/gstr_1.py,Following accounts might be selected in GST Settings:,Следните профили могат да бъдат избрани в настройките на GST:
 apps/erpnext/erpnext/manufacturing/report/bom_stock_report/bom_stock_report.js,Quantity to Produce,Количество за производство
@@ -2660,6 +2668,7 @@
 DocType: Water Analysis,Container,Контейнер
 apps/erpnext/erpnext/regional/report/gstr_1/gstr_1.py,Please set valid GSTIN No. in Company Address,"Моля, задайте валиден номер GSTIN в адрес на компанията"
 apps/erpnext/erpnext/education/utils.py,Student {0} - {1} appears Multiple times in row {2} & {3},Студент {0} - {1} се появява няколко пъти в ред {2} и {3}
+apps/erpnext/erpnext/selling/doctype/customer/customer.py,Following fields are mandatory to create address:,Следните полета са задължителни за създаване на адрес:
 DocType: Item Alternative,Two-way,Двупосочен
 DocType: Item,Manufacturers,Производители
 apps/erpnext/erpnext/accounts/deferred_revenue.py,Error while processing deferred accounting for {0},Грешка при обработката на отложено отчитане за {0}
@@ -2734,9 +2743,9 @@
 DocType: Employee,HR-EMP-,HR-EMP-
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py,User {0} doesn't have any default POS Profile. Check Default at Row {1} for this User.,Потребителят {0} няма профили по подразбиране за POS. Проверете по подразбиране в ред {1} за този потребител.
 DocType: Quality Meeting Minutes,Quality Meeting Minutes,Качествени минути на срещата
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Supplier &gt; Supplier Type,Доставчик&gt; Тип доставчик
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py,Employee Referral,Служебни препоръки
 DocType: Student Group,Set 0 for no limit,Определете 0 за без лимит
+DocType: Cost Center,rgt,RGT
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py,The day(s) on which you are applying for leave are holidays. You need not apply for leave.,"Деня (и), на който кандидатствате за отпуск е празник. Не е нужно да кандидатствате за отпуск."
 DocType: Customer,Primary Address and Contact Detail,Основен адрес и данни за контакт
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.js,Resend Payment Email,Повторно изпращане на плащане Email
@@ -2846,7 +2855,6 @@
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py,Against Supplier Invoice {0} dated {1},Срещу фактура от доставчик {0} от {1}
 DocType: Customer,Default Price List,Ценоразпис по подразбиране
 apps/erpnext/erpnext/assets/doctype/asset/asset.py,Asset Movement record {0} created,Движение на актив {0} е създаден
-apps/erpnext/erpnext/utilities/page/leaderboard/leaderboard.js,No items found.,Няма намерени елементи.
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py,You cannot delete Fiscal Year {0}. Fiscal Year {0} is set as default in Global Settings,Вие не можете да изтривате фискална година {0}. Фискална година {0} е зададена по подразбиране в Global Settings
 DocType: Share Transfer,Equity/Liability Account,Сметка за собствен капитал / отговорност
 apps/erpnext/erpnext/setup/doctype/customer_group/customer_group.py,A customer with the same name already exists,Клиент със същото име вече съществува
@@ -2862,6 +2870,7 @@
 apps/erpnext/erpnext/selling/doctype/customer/customer.py,Credit limit has been crossed for customer {0} ({1}/{2}),Кредитният лимит е прекратен за клиенти {0} ({1} / {2})
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py,Customer required for 'Customerwise Discount',"Клиент е необходим за ""Customerwise Discount"""
 apps/erpnext/erpnext/config/accounting.py,Update bank payment dates with journals.,Актуализиране дати банкови платежни с списания.
+,Billed Qty,Сметка Кол
 apps/erpnext/erpnext/stock/doctype/item/item_dashboard.py,Pricing,Ценообразуване
 DocType: Employee,Attendance Device ID (Biometric/RF tag ID),Идентификационен номер на устройството за присъствие (идентификатор на биометричен / RF етикет)
 DocType: Quotation,Term Details,Условия - Детайли
@@ -2883,6 +2892,7 @@
 DocType: Share Transfer,Asset Account,Активна сметка
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js,New release date should be in the future,Нова дата на издаване трябва да бъде в бъдеще
 DocType: Purchase Invoice,End date of current invoice's period,Крайна дата на периода на текущата фактура за
+apps/erpnext/erpnext/hr/doctype/employee/employee.py,Please setup Employee Naming System in Human Resource &gt; HR Settings,"Моля, настройте системата за именуване на служители в Човешки ресурси&gt; Настройки за човешки ресурси"
 DocType: Lab Test,Technician Name,Име на техник
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py,"Cannot ensure delivery by Serial No as \
 					Item {0} is added with and without Ensure Delivery by \
@@ -2890,6 +2900,7 @@
 DocType: Accounts Settings,Unlink Payment on Cancellation of Invoice,Прекратяване на връзката с плащане при анулиране на фактура
 DocType: Bank Reconciliation,From Date,От дата
 apps/erpnext/erpnext/hr/doctype/vehicle_log/vehicle_log.py,Current Odometer reading entered should be greater than initial Vehicle Odometer {0},Current показание на километража влязъл трябва да бъде по-голяма от първоначалната Vehicle километража {0}
+,Purchase Order Items To Be Received or Billed,"Покупка на артикули, които ще бъдат получени или фактурирани"
 DocType: Restaurant Reservation,No Show,Няма показване
 apps/erpnext/erpnext/regional/india/utils.py,You must be a registered supplier to generate e-Way Bill,"Трябва да сте регистриран доставчик, за да генерирате e-Way Bill"
 DocType: Shipping Rule Country,Shipping Rule Country,Доставка Правило Country
@@ -2932,6 +2943,7 @@
 apps/erpnext/erpnext/templates/generators/item/item_add_to_cart.html,View in Cart,Виж в кошницата
 DocType: Employee Checkin,Shift Actual Start,Действително начало на Shift
 DocType: Tally Migration,Is Day Book Data Imported,Импортират ли се данните за дневна книга
+,Purchase Order Items To Be Received or Billed1,"Покупка на артикули, които трябва да бъдат получени или фактурирани1"
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py,Marketing Expenses,Разходите за маркетинг
 apps/erpnext/erpnext/stock/doctype/pick_list/pick_list.py,{0} units of {1} is not available.,{0} единици от {1} не са налични.
 ,Item Shortage Report,Позиция Недостиг Доклад
@@ -3156,7 +3168,6 @@
 apps/erpnext/erpnext/public/js/call_popup/call_popup.js,View all issues from {0},Преглед на всички проблеми от {0}
 DocType: Quality Inspection,MAT-QA-.YYYY.-,МАТ-QA-.YYYY.-
 DocType: Quality Meeting Table,Quality Meeting Table,Качествена среща за срещи
-apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,"Моля, задайте Именуване на серия за {0} чрез Настройка&gt; Настройки&gt; Наименуване на серия"
 apps/erpnext/erpnext/templates/pages/help.html,Visit the forums,Посетете форумите
 DocType: Student,Student Mobile Number,Student мобилен номер
 DocType: Item,Has Variants,Има варианти
@@ -3298,6 +3309,7 @@
 DocType: Homepage Section,Section Cards,Карти за раздели
 ,Campaign Efficiency,Ефективност на кампаниите
 DocType: Discussion,Discussion,дискусия
+apps/erpnext/erpnext/setup/default_energy_point_rules.py,On Sales Order Submission,При подаване на поръчка за продажба
 DocType: Bank Transaction,Transaction ID,Номер на транзакцията
 DocType: Payroll Entry,Deduct Tax For Unsubmitted Tax Exemption Proof,Освобождаване от данък за неразрешено освобождаване от данъци
 DocType: Volunteer,Anytime,По всяко време
@@ -3305,7 +3317,6 @@
 DocType: Employee Tax Exemption Proof Submission,Employee Tax Exemption Proof Submission,Декларация за освобождаване от данък върху доходите на служителите
 DocType: Patient,Surgical History,Хирургическа история
 DocType: Bank Statement Settings Item,Mapped Header,Картографирано заглавие
-apps/erpnext/erpnext/hr/doctype/employee/employee.py,Please setup Employee Naming System in Human Resource &gt; HR Settings,"Моля, настройте системата за именуване на служители в Човешки ресурси&gt; Настройки за човешки ресурси"
 DocType: Employee,Resignation Letter Date,Дата на молбата за напускане
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Pricing Rules are further filtered based on quantity.,Правилата за ценообразуване са допълнително филтрирани въз основа на количеството.
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py,Please set the Date Of Joining for employee {0},"Моля, задайте датата на присъединяване за служител {0}"
@@ -3319,6 +3330,7 @@
 DocType: Bank Statement Settings,Mapped Items,Картирани елементи
 DocType: Amazon MWS Settings,IT,ТО
 DocType: Chapter,Chapter,глава
+,Fixed Asset Register,Регистър на фиксирани активи
 apps/erpnext/erpnext/utilities/user_progress.py,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,Select BOM and Qty for Production,Изберете BOM и Количество за производство
@@ -3454,7 +3466,6 @@
 apps/erpnext/erpnext/templates/emails/reorder_item.html,Following Material Requests have been raised automatically based on Item's re-order level,След Материал Исканията са повдигнати автоматично въз основа на нивото на повторна поръчка Точка на
 apps/erpnext/erpnext/controllers/accounts_controller.py,Account {0} is invalid. Account Currency must be {1},Сметка {0} е невалидна. Валутата на сметката трябва да е {1}
 apps/erpnext/erpnext/hr/doctype/salary_structure_assignment/salary_structure_assignment.py,From Date {0} cannot be after employee's relieving Date {1},От дата {0} не може да бъде след освобождаване на служител Дата {1}
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py,Debit Note {0} has been created automatically,Дебитна бележка {0} е създадена автоматично
 apps/erpnext/erpnext/accounts/doctype/payment_order/payment_order.js,Create Payment Entries,Създаване на записи за плащане
 DocType: Supplier,Is Internal Supplier,Е вътрешен доставчик
 DocType: Employee,Create User Permission,Създаване на потребителско разрешение
@@ -4013,7 +4024,6 @@
 DocType: Project User,Project Status,Статус на проекта
 DocType: UOM,Check this to disallow fractions. (for Nos),Маркирайте това да забраниш фракции. (За NOS)
 DocType: Student Admission Program,Naming Series (for Student Applicant),Поредни Номера (за Кандидат студент)
-apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.py,UOM Conversion factor ({0} -&gt; {1}) not found for item: {2},Коефициент на конверсия на UOM ({0} -&gt; {1}) не е намерен за елемент: {2}
 apps/erpnext/erpnext/hr/doctype/retention_bonus/retention_bonus.py,Bonus Payment Date cannot be a past date,Бонус Дата на плащане не може да бъде минала дата
 DocType: Travel Request,Copy of Invitation/Announcement,Копие от поканата / обявяването
 DocType: Practitioner Service Unit Schedule,Practitioner Service Unit Schedule,График на звеното за обслужване на практикуващите
@@ -4161,6 +4171,7 @@
 apps/erpnext/erpnext/utilities/user_progress.py,Setup Company,Настройка на компанията
 ,Lab Test Report,Лабораторен тестов доклад
 DocType: Employee Benefit Application,Employee Benefit Application,Приложение за обезщетения за служители
+apps/erpnext/erpnext/accounts/doctype/invoice_discounting/invoice_discounting.py,Row({0}): {1} is already discounted in {2},Ред ({0}): {1} вече се отстъпва от {2}
 apps/erpnext/erpnext/hr/doctype/additional_salary/additional_salary.py,Additional Salary Component Exists.,Допълнителен компонент на заплатата съществува.
 DocType: Purchase Invoice,Unregistered,нерегистриран
 DocType: Student Applicant,Application Date,Дата Application
@@ -4239,7 +4250,6 @@
 DocType: Journal Entry,Accounting Entries,Счетоводни записи
 DocType: Job Card Time Log,Job Card Time Log,Дневник на времената карта за работа
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,"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;."
-apps/erpnext/erpnext/education/doctype/instructor/instructor.py,Please setup Instructor Naming System in Education &gt; Education Settings,"Моля, настройте системата за именуване на инструктори в Образование&gt; Настройки за образование"
 DocType: Journal Entry,Paid Loan,Платен заем
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py,Duplicate Entry. Please check Authorization Rule {0},"Дублиране на вписване. Моля, проверете Оторизация Правило {0}"
 DocType: Journal Entry Account,Reference Due Date,Дата на референтната дата
@@ -4256,7 +4266,6 @@
 apps/erpnext/erpnext/templates/pages/projects.html,No time sheets,Няма време листове
 DocType: GoCardless Mandate,GoCardless Customer,GoCardless Клиент
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py,Leave Type {0} cannot be carry-forwarded,Оставете Type {0} не може да се извърши-препрати
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Item Code &gt; Item Group &gt; Brand,Код на артикула&gt; Група артикули&gt; Марка
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py,Maintenance Schedule is not generated for all the items. Please click on 'Generate Schedule',"График за поддръжка не се генерира за всички предмети. Моля, кликнете върху &quot;Генериране Schedule&quot;"
 ,To Produce,Да произведа
 DocType: Leave Encashment,Payroll,ведомост
@@ -4371,7 +4380,6 @@
 DocType: Stock Ledger Entry,Actual Qty After Transaction,Действително Количество След Трансакция
 ,Pending SO Items For Purchase Request,Чакащи позиции от поръчки за продажба по искане за покупка
 apps/erpnext/erpnext/education/doctype/student_admission/student_admission.py,Student Admissions,Учебен
-apps/erpnext/erpnext/accounts/party.py,{0} {1} is disabled,{0} {1} е деактивиран
 DocType: Supplier,Billing Currency,(Фактура) Валута
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py,Extra Large,Много Голям
 DocType: Loan,Loan Application,Искане за кредит
@@ -4448,7 +4456,6 @@
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py,Only Leave Applications with status 'Approved' and 'Rejected' can be submitted,Оставете само приложения със статут &quot;Одобрен&quot; и &quot;Отхвърлени&quot; може да бъде подадено
 apps/erpnext/erpnext/accounts/doctype/accounting_dimension/accounting_dimension.py,Creating Dimensions...,Създаване на размери ...
 apps/erpnext/erpnext/education/doctype/student_group_creation_tool/student_group_creation_tool.py,Student Group Name is mandatory in row {0},Student Име на групата е задължително в ред {0}
-DocType: Customer Credit Limit,Bypass credit limit_check,Байпас на кредит limit_check
 DocType: Homepage,Products to be shown on website homepage,"Продукти, които се показват на сайта на началната страница"
 DocType: HR Settings,Password Policy,Политика за пароли
 apps/erpnext/erpnext/setup/doctype/customer_group/customer_group.js,This is a root customer group and cannot be edited.,Това е корен група клиенти и не може да се редактира.
@@ -4740,6 +4747,7 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py,Row {0}: Advance against Customer must be credit,Row {0}: Advance срещу Клиентът трябва да бъде кредити
 DocType: Quality Meeting,Quality Meeting,Качествена среща
 apps/erpnext/erpnext/accounts/doctype/account/account.js,Non-Group to Group,Non-група на група
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,"Моля, задайте Именуване на серия за {0} чрез Настройка&gt; Настройки&gt; Наименуване на серия"
 DocType: Employee,ERPNext User,ERPПреводен потребител
 apps/erpnext/erpnext/education/doctype/student_group_creation_tool/student_group_creation_tool.py,Batch is mandatory in row {0},Партида е задължителна на ред {0}
 DocType: Company,Default Buying Terms,Условия за покупка по подразбиране
@@ -5034,6 +5042,7 @@
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py,No {0} found for Inter Company Transactions.,"Не {0}, намерени за сделки между фирмите."
 DocType: Travel Itinerary,Rented Car,Отдавна кола
 apps/erpnext/erpnext/public/js/hub/components/profile_dialog.js,About your Company,За вашата компания
+apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.js,Show Stock Ageing Data,Показване на данни за стареене на запасите
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py,Credit To account must be a Balance Sheet account,Кредит на сметката трябва да бъде балансова сметка
 DocType: Donor,Donor,дарител
 DocType: Global Defaults,Disable In Words,"Изключване ""С думи"""
@@ -5048,8 +5057,10 @@
 DocType: Practitioner Schedule,Schedule Name,Име на графиката
 apps/erpnext/erpnext/regional/doctype/gstr_3b_report/gstr_3b_report.py,Please enter GSTIN and state for the Company Address {0},"Моля, въведете GSTIN и посочете адреса на компанията {0}"
 DocType: Currency Exchange,For Buying,За покупка
+apps/erpnext/erpnext/setup/default_energy_point_rules.py,On Purchase Order Submission,При подаване на поръчка
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js,Add All Suppliers,Добавете всички доставчици
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py,Row #{0}: Allocated Amount cannot be greater than outstanding amount.,Ред # {0}: Разпределената сума не може да бъде по-голяма от остатъка.
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Customer &gt; Customer Group &gt; Territory,Клиент&gt; Клиентска група&gt; Територия
 DocType: Tally Migration,Parties,страни
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js,Browse BOM,Разгледай BOM
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py,Secured Loans,Обезпечени кредити
@@ -5081,6 +5092,7 @@
 apps/erpnext/erpnext/stock/doctype/item_alternative/item_alternative.py,Not allow to set alternative item for the item {0},Не позволявайте да зададете алтернативен елемент за елемента {0}
 apps/erpnext/erpnext/hr/doctype/leave_block_list/leave_block_list.py,Date is repeated,Датата се повтаря
 apps/erpnext/erpnext/accounts/print_format/payment_receipt_voucher/payment_receipt_voucher.html,Authorized Signatory,Оторизиран подпис
+apps/erpnext/erpnext/education/doctype/instructor/instructor.py,Please setup Instructor Naming System in Education &gt; Education Settings,"Моля, настройте системата за именуване на инструктори в Образование&gt; Настройки за образование"
 apps/erpnext/erpnext/regional/doctype/gstr_3b_report/gstr_3b_report.html,Net ITC Available(A) - (B),Наличен нетен ITC (A) - (B)
 apps/erpnext/erpnext/education/doctype/fee_schedule/fee_schedule.js,Create Fees,Създаване на такси
 DocType: Project,Total Purchase Cost (via Purchase Invoice),Общата покупна цена на придобиване (чрез покупка на фактура)
@@ -5101,6 +5113,7 @@
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.js,Message Sent,Съобщението е изпратено
 apps/erpnext/erpnext/accounts/doctype/account/account.py,Account with child nodes cannot be set as ledger,Сметка с деца възли не могат да бъдат определени като книга
 DocType: C-Form,II,II
+apps/erpnext/erpnext/assets/report/fixed_asset_register/fixed_asset_register.py,Vendor Name,Име на продавача
 DocType: Quiz Result,Wrong,погрешно
 DocType: Sales Invoice,Rate at which Price list currency is converted to customer's base currency,"Скоростта, с която Ценоразпис валута се превръща в основна валута на клиента"
 DocType: Purchase Invoice Item,Net Amount (Company Currency),Нетната сума (фирмена валута)
@@ -5344,6 +5357,7 @@
 DocType: Stock Settings,Auto Material Request,Auto Материал Искане
 DocType: Woocommerce Settings,API consumer secret,API потребителска тайна
 DocType: Delivery Note Item,Available Batch Qty at From Warehouse,Свободно Batch Количество в От Warehouse
+,Received Qty Amount,Получена Количество Сума
 DocType: Salary Slip,Gross Pay - Total Deduction - Loan Repayment,Gross Pay - Общо Приспадане - кредит за погасяване
 DocType: Bank Account,Last Integration Date,Последна дата за интеграция
 DocType: Expense Claim,Expense Taxes and Charges,Данъци и такси за разходи
@@ -5802,6 +5816,8 @@
 DocType: Drug Prescription,Hour,Час
 DocType: Restaurant Order Entry,Last Sales Invoice,Последна фактура за продажби
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py,Please select Qty against item {0},"Моля, изберете брой спрямо елемент {0}"
+apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py,Latest Age,Последна епоха
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js,Transfer Material to Supplier,Трансфер Материал на доставчик
 apps/erpnext/erpnext/hr/report/loan_repayment/loan_repayment.py,EMI,EMI
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py,New Serial No cannot have Warehouse. Warehouse must be set by Stock Entry or Purchase Receipt,New Serial Не може да има Warehouse. Warehouse трябва да бъде определен от Фондова Влизане или покупка Разписка
 DocType: Lead,Lead Type,Тип потенциален клиент
@@ -5825,7 +5841,6 @@
 apps/erpnext/erpnext/hr/doctype/employee_benefit_application/employee_benefit_application.py,"An amount of {0} already claimed for the component {1},\
 						 set the amount equal or greater than {2}","Сумата от {0}, която вече е претендирана за компонента {1}, \ определи сумата равна или по-голяма от {2}"
 DocType: Shipping Rule,Shipping Rule Conditions,Условия за доставка
-DocType: Purchase Invoice,Export Type,Тип експорт
 DocType: Salary Slip Loan,Salary Slip Loan,Кредит за заплащане
 DocType: BOM Update Tool,The new BOM after replacement,Новият BOM след подмяна
 ,Point of Sale,Точка на продажба
@@ -5945,7 +5960,6 @@
 DocType: Purchase Order Item,Blanket Order Rate,Обикновена поръчка
 ,Customer Ledger Summary,Обобщение на клиентската книга
 apps/erpnext/erpnext/hooks.py,Certification,сертифициране
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js,Are you sure you want to make debit note?,"Сигурни ли сте, че искате да направите дебитна бележка?"
 DocType: Bank Guarantee,Clauses and Conditions,Клаузи и условия
 DocType: Serial No,Creation Document Type,Създаване на тип документ
 DocType: Amazon MWS Settings,ES,ES
@@ -5983,8 +5997,6 @@
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py,Financial Services,Финансови Услуги
 DocType: Student Sibling,Student ID,Идент. № на студента
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.js,For Quantity must be greater than zero,Количеството трябва да е по-голямо от нула
-apps/erpnext/erpnext/hr/doctype/employee_transfer/employee_transfer.py,"Please delete the Employee <a href=""#Form/Employee/{0}"">{0}</a>\
-					to cancel this document","Моля, изтрийте Служителя <a href=""#Form/Employee/{0}"">{0}</a> \, за да отмените този документ"
 apps/erpnext/erpnext/config/projects.py,Types of activities for Time Logs,Видове дейности за времето за Logs
 DocType: Opening Invoice Creation Tool,Sales,Търговски
 DocType: Stock Entry Detail,Basic Amount,Основна сума
@@ -6063,6 +6075,7 @@
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py,Print and Stationery,Печат и консумативи
 DocType: Stock Settings,Show Barcode Field,Покажи поле за баркод
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js,Send Supplier Emails,Изпрати Доставчик имейли
+DocType: Asset Movement,ACC-ASM-.YYYY.-,ACC-ASM-.YYYY.-
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py,"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,Автоматично създадена
 apps/erpnext/erpnext/hr/doctype/employee_onboarding/employee_onboarding.py,Submit this to create the Employee record,"Изпратете това, за да създадете запис на служителите"
@@ -6140,7 +6153,6 @@
 DocType: Sales Team,Contact No.,Контакт - номер
 apps/erpnext/erpnext/templates/includes/cart/cart_address.html,Billing Address is same as Shipping Address,Адресът за фактуриране е същият като адрес за доставка
 DocType: Bank Reconciliation,Payment Entries,Записи на плащане
-apps/erpnext/erpnext/erpnext_integrations/doctype/shopify_settings/shopify_settings.py,Access token or Shopify URL missing,Липсва маркер за достъп или URL адрес на Shopify
 DocType: Location,Latitude,Географска ширина
 DocType: Work Order,Scrap Warehouse,скрап Warehouse
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py,"Warehouse required at Row No {0}, please set default warehouse for the item {1} for the company {2}","Необходимо е склад в ред № {0}, моля, задайте склад по подразбиране за елемента {1} за фирмата {2}"
@@ -6183,7 +6195,6 @@
 DocType: Job Offer Term,Value / Description,Стойност / Описание
 apps/erpnext/erpnext/controllers/accounts_controller.py,"Row #{0}: Asset {1} cannot be submitted, it is already {2}","Row {0}: Asset {1} не може да бъде представен, той вече е {2}"
 DocType: Tax Rule,Billing Country,(Фактура) Държава
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js,Are you sure you want to make credit note?,"Сигурни ли сте, че искате да направите кредитна бележка?"
 DocType: Purchase Order Item,Expected Delivery Date,Очаквана дата на доставка
 DocType: Restaurant Order Entry,Restaurant Order Entry,Реклама в ресторанта
 apps/erpnext/erpnext/accounts/general_ledger.py,Debit and Credit not equal for {0} #{1}. Difference is {2}.,Дебитни и кредитни не е равно на {0} # {1}. Разликата е {2}.
@@ -6308,6 +6319,7 @@
 DocType: Purchase Invoice,Taxes and Charges Added,Данъци и такси - Добавени
 apps/erpnext/erpnext/assets/doctype/asset/asset.py,Depreciation Row {0}: Next Depreciation Date cannot be before Available-for-use Date,"Амортизационен ред {0}: Следващата дата на амортизация не може да бъде преди датата, която е налице за използване"
 ,Sales Funnel,Фуния на продажбите
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Item Code &gt; Item Group &gt; Brand,Код на артикула&gt; Група артикули&gt; Марка
 apps/erpnext/erpnext/setup/doctype/company/company.py,Abbreviation is mandatory,Съкращението е задължително
 DocType: Project,Task Progress,Задача Прогрес
 apps/erpnext/erpnext/templates/includes/navbar/navbar_items.html,Cart,Количка
@@ -6551,6 +6563,7 @@
 DocType: Employee Grade,Employee Grade,Степен на заетост
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py,Piecework,Работа заплащана на парче
 DocType: GSTR 3B Report,June,юни
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Supplier &gt; Supplier Type,Доставчик&gt; Тип доставчик
 DocType: Share Balance,From No,От №
 DocType: Shift Type,Early Exit Grace Period,Период за ранно излизане от грация
 DocType: Task,Actual Time (in Hours),Действителното време (в часове)
@@ -6835,6 +6848,7 @@
 DocType: Warehouse,Warehouse Name,Склад - Име
 DocType: Naming Series,Select Transaction,Изберете транзакция
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py,Please enter Approving Role or Approving User,"Моля, въведете Приемане Role или одобряването на потребителя"
+apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.py,UOM Conversion factor ({0} -&gt; {1}) not found for item: {2},Коефициент на конверсия на UOM ({0} -&gt; {1}) не е намерен за елемент: {2}
 apps/erpnext/erpnext/support/doctype/service_level_agreement/service_level_agreement.py,Service Level Agreement with Entity Type {0} and Entity {1} already exists.,Споразумение за ниво на услуга с тип субект {0} и субект {1} вече съществува.
 DocType: Journal Entry,Write Off Entry,Въвеждане на отписване
 DocType: BOM,Rate Of Materials Based On,Курсове на материали на основата на
@@ -7025,6 +7039,7 @@
 DocType: Quality Inspection Reading,Quality Inspection Reading,Проверка на качеството Reading
 apps/erpnext/erpnext/stock/doctype/stock_settings/stock_settings.py,`Freeze Stocks Older Than` should be smaller than %d days.,`Замрази наличности по-стари от` трябва да бъде по-малък от %d дни.
 DocType: Tax Rule,Purchase Tax Template,Покупка Tax Template
+apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py,Earliest Age,Най-ранна епоха
 apps/erpnext/erpnext/utilities/user_progress.py,Set a sales goal you'd like to achieve for your company.,"Задайте цел на продажбите, която искате да постигнете за фирмата си."
 DocType: Quality Goal,Revision,ревизия
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js,Healthcare Services,Здравни услуги
@@ -7068,6 +7083,7 @@
 apps/erpnext/erpnext/healthcare/doctype/patient_encounter/patient_encounter.js,Schedule Discharge,График за освобождаване от отговорност
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py,Cheques and Deposits incorrectly cleared,Чекове Депозити и неправилно изчистени
 DocType: Homepage Section Card,Homepage Section Card,Карта за секция на началната страница
+,Amount To Be Billed,Сума за фактуриране
 apps/erpnext/erpnext/accounts/doctype/account/account.py,Account {0}: You can not assign itself as parent account,Сметка {0}: Не можете да назначите себе си за родителска сметка
 DocType: Purchase Invoice Item,Price List Rate,Ценоразпис Курсове
 apps/erpnext/erpnext/utilities/activation.py,Create customer quotes,Създаване на оферти на клиенти
@@ -7120,6 +7136,7 @@
 DocType: Supplier Scorecard Criteria,Supplier Scorecard Criteria,Критерии за таблицата с показателите за доставчиците
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py,Please select Start Date and End Date for Item {0},Моля изберете Начална дата и крайна дата за позиция {0}
 DocType: Maintenance Schedule,MAT-MSH-.YYYY.-,МАТ-MSH-.YYYY.-
+,Amount to Receive,Сума за получаване
 apps/erpnext/erpnext/education/doctype/student_group_creation_tool/student_group_creation_tool.py,Course is mandatory in row {0},Курс е задължителен на ред {0}
 apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py,From date can not be greater than than To date,От датата не може да бъде по-голямо от Досега
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py,To date cannot be before from date,Към днешна дата не може да бъде преди от дата
@@ -7367,7 +7384,6 @@
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js,BOM and Manufacturing Quantity are required,BOM и количество за производство  са задължителни
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js,Ageing Range 2,Застаряването на населението Range 2
 DocType: SG Creation Tool Course,Max Strength,Максимална здравина
-apps/erpnext/erpnext/accounts/doctype/account/account.py,"Account {0} already exists in child company {1}. The following fields have different values, they should be same:<ul><li>{2}</li></ul>","Акаунт {0} вече съществува в детска компания {1}. Следните полета имат различни стойности, те трябва да са еднакви: <ul><li> {2} </li></ul>"
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py,Installing presets,Инсталиране на предварителни настройки
 DocType: Fee Schedule,EDU-FSH-.YYYY.-,EDU-FSH-.YYYY.-
 apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js,No Delivery Note selected for Customer {},За клиента не е избрано известие за доставка {}
@@ -7575,6 +7591,7 @@
 DocType: Delivery Note,Print Without Amount,Печат без сума
 apps/erpnext/erpnext/accounts/report/asset_depreciation_ledger/asset_depreciation_ledger.py,Depreciation Date,Амортизация - Дата
 ,Work Orders in Progress,Работни поръчки в ход
+DocType: Customer Credit Limit,Bypass Credit Limit Check,Обходен чек за лимит на кредит
 DocType: Issue,Support Team,Екип по поддръжката
 apps/erpnext/erpnext/stock/report/batch_item_expiry_status/batch_item_expiry_status.py,Expiry (In Days),Изтичане (в дни)
 DocType: Appraisal,Total Score (Out of 5),Общ резултат (от 5)
@@ -7758,6 +7775,7 @@
 DocType: Sales Invoice,Customer GSTIN,Клиент GSTIN
 DocType: Crop Cycle,List of diseases detected on the field. When selected it'll automatically add a list of tasks to deal with the disease ,"Списък на заболяванията, открити на полето. Когато е избран, той автоматично ще добави списък със задачи, за да се справи с болестта"
 apps/erpnext/erpnext/manufacturing/page/bom_comparison_tool/bom_comparison_tool.js,BOM 1,BOM 1
+apps/erpnext/erpnext/assets/report/fixed_asset_register/fixed_asset_register.py,Asset Id,Id на актива
 apps/erpnext/erpnext/healthcare/doctype/healthcare_service_unit/healthcare_service_unit.js,This is a root healthcare service unit and cannot be edited.,Това е единица за здравни услуги и не може да бъде редактирана.
 DocType: Asset Repair,Repair Status,Ремонт Състояние
 apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.js,"Requested Qty: Quantity requested for purchase, but not ordered.","Изисквано количество: Количество, заявено за покупка, но не поръчано."
diff --git a/erpnext/translations/bn.csv b/erpnext/translations/bn.csv
index a5603c5..31be0b4 100644
--- a/erpnext/translations/bn.csv
+++ b/erpnext/translations/bn.csv
@@ -286,7 +286,6 @@
 DocType: Loan,Repay Over Number of Periods,শোধ ওভার পর্যায়কাল সংখ্যা
 apps/erpnext/erpnext/manufacturing/report/bom_stock_report/bom_stock_report.py,Quantity to Produce can not be less than Zero,প্রযোজনার পরিমাণ জিরোর চেয়ে কম হতে পারে না
 DocType: Stock Entry,Additional Costs,অতিরিক্ত খরচ
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Customer &gt; Customer Group &gt; Territory,গ্রাহক&gt; গ্রাহক গোষ্ঠী&gt; অঞ্চল
 apps/erpnext/erpnext/accounts/doctype/account/account.py,Account with existing transaction can not be converted to group.,বিদ্যমান লেনদেন সঙ্গে অ্যাকাউন্ট গ্রুপ রূপান্তরিত করা যাবে না.
 DocType: Lead,Product Enquiry,পণ্য অনুসন্ধান
 DocType: Education Settings,Validate Batch for Students in Student Group,শিক্ষার্থীর গ্রুপ ছাত্ররা জন্য ব্যাচ যাচাই
@@ -582,6 +581,7 @@
 DocType: Healthcare Settings,Create documents for sample collection,নমুনা সংগ্রহের জন্য দস্তাবেজ তৈরি করুন
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py,Payment against {0} {1} cannot be greater than Outstanding Amount {2},বিপরীতে পরিশোধ {0} {1} বকেয়া পরিমাণ তার চেয়ে অনেক বেশী হতে পারে না {2}
 apps/erpnext/erpnext/patches/v11_0/add_healthcare_service_unit_tree_root.py,All Healthcare Service Units,সমস্ত স্বাস্থ্যসেবা পরিষেবা ইউনিট
+apps/erpnext/erpnext/setup/default_energy_point_rules.py,On Converting Opportunity,সুযোগটি রূপান্তর করার উপর
 DocType: Bank Account,Address HTML,ঠিকানা এইচটিএমএল
 DocType: Lead,Mobile No.,মোবাইল নাম্বার.
 apps/erpnext/erpnext/selling/doctype/pos_closing_voucher/closing_voucher_details.html,Mode of Payments,পেমেন্ট পদ্ধতি
@@ -646,7 +646,6 @@
 DocType: Accounting Dimension,Dimension Name,মাত্রা নাম
 apps/erpnext/erpnext/healthcare/setup.py,Resistant,প্রতিরোধী
 apps/erpnext/erpnext/hotels/doctype/hotel_room_reservation/hotel_room_reservation.py,Please set Hotel Room Rate on {},{} এ হোটেল রুম রেট সেট করুন
-apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py,Please setup numbering series for Attendance via Setup &gt; Numbering Series,দয়া করে সেটআপ&gt; নম্বরিং সিরিজের মাধ্যমে উপস্থিতির জন্য সংখ্যায়ন সিরিজটি সেট করুন
 DocType: Journal Entry,Multi Currency,বিভিন্ন দেশের মুদ্রা
 DocType: Bank Statement Transaction Invoice Item,Invoice Type,চালান প্রকার
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py,Valid from date must be less than valid upto date,তারিখ থেকে বৈধ তারিখ অবধি বৈধের চেয়ে কম হওয়া আবশ্যক
@@ -757,6 +756,7 @@
 apps/erpnext/erpnext/accounts/page/pos/pos.js,Create a new Customer,একটি নতুন গ্রাহক তৈরি করুন
 apps/erpnext/erpnext/non_profit/report/expiring_memberships/expiring_memberships.py,Expiring On,শেষ হচ্ছে
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,"If multiple Pricing Rules continue to prevail, users are asked to set Priority manually to resolve conflict.",একাধিক দামে ব্যাপা চলতে থাকে তবে ব্যবহারকারীরা সংঘাতের সমাধান করতে নিজে অগ্রাধিকার সেট করতে বলা হয়.
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js,Purchase Return,ক্রয় প্রত্যাবর্তন
 apps/erpnext/erpnext/utilities/activation.py,Create Purchase Orders,ক্রয় আদেশ তৈরি করুন
 ,Purchase Register,ক্রয় নিবন্ধন
 apps/erpnext/erpnext/healthcare/doctype/patient/patient.py,Patient not found,রোগী খুঁজে পাওয়া যায় নি
@@ -771,7 +771,6 @@
 DocType: Location,Area UOM,এলাকা UOM
 apps/erpnext/erpnext/manufacturing/doctype/workstation/workstation.py,Workstation is closed on the following dates as per Holiday List: {0},ওয়ার্কস্টেশন ছুটির তালিকা অনুযায়ী নিম্নলিখিত তারিখগুলি উপর বন্ধ করা হয়: {0}
 apps/erpnext/erpnext/selling/page/sales_funnel/sales_funnel.py,Opportunities,সুযোগ
-apps/erpnext/erpnext/www/all-products/index.html,Clear filters,ফিল্টার সাফ করুন
 DocType: Lab Test Template,Single,একক
 DocType: Compensatory Leave Request,Work From Date,তারিখ থেকে কাজ
 DocType: Salary Slip,Total Loan Repayment,মোট ঋণ পরিশোধ
@@ -814,6 +813,7 @@
 DocType: Account,Old Parent,প্রাচীন মূল
 apps/erpnext/erpnext/education/doctype/program_enrollment_tool/program_enrollment_tool.py,Mandatory field - Academic Year,আবশ্যিক ক্ষেত্র - শিক্ষাবর্ষ
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py,{0} {1} is not associated with {2} {3},{0} {1} {2} {3} সাথে যুক্ত নয়
+DocType: Opportunity,Converted By,রূপান্তরিত দ্বারা
 apps/erpnext/erpnext/public/js/hub/components/ReviewArea.vue,You need to login as a Marketplace User before you can add any reviews.,আপনি কোনও পর্যালোচনা যুক্ত করার আগে আপনাকে মার্কেটপ্লেস ব্যবহারকারী হিসাবে লগইন করতে হবে।
 apps/erpnext/erpnext/manufacturing/doctype/job_card/job_card.py,Row {0} : Operation is required against the raw material item {1},সারি {0}: কাঁচামাল আইটেমের বিরুদ্ধে অপারেশন প্রয়োজন {1}
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py,Please set default payable account for the company {0},কোম্পানির জন্য ডিফল্ট প্রদেয় অ্যাকাউন্ট সেট দয়া করে {0}
@@ -839,6 +839,8 @@
 DocType: BOM,Work Order,কাজের আদেশ
 DocType: Sales Invoice,Total Qty,মোট Qty
 apps/erpnext/erpnext/education/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py,Guardian2 Email ID,Guardian2 ইমেইল আইডি
+apps/erpnext/erpnext/hr/doctype/employee_transfer/employee_transfer.py,"Please delete the Employee <a href=""#Form/Employee/{0}"">{0}</a>\
+					to cancel this document","এই নথিটি বাতিল করতে দয়া করে কর্মচারী <a href=""#Form/Employee/{0}"">{0}</a> delete মুছুন"
 DocType: Item,Show in Website (Variant),ওয়েবসাইট দেখান (বৈকল্পিক)
 DocType: Employee,Health Concerns,স্বাস্থ সচেতন
 DocType: Payroll Entry,Select Payroll Period,বেতনের সময়কাল নির্বাচন
@@ -896,7 +898,6 @@
 DocType: Codification Table,Codification Table,সংশোধনী সারণি
 DocType: Timesheet Detail,Hrs,ঘন্টা
 apps/erpnext/erpnext/manufacturing/page/bom_comparison_tool/bom_comparison_tool.js,Changes in {0},{0} এ পরিবর্তনসমূহ
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js,Please select Company,কোম্পানি নির্বাচন করুন
 DocType: Employee Skill,Employee Skill,কর্মচারী দক্ষতা
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.js,Difference Account,পার্থক্য অ্যাকাউন্ট
 DocType: Pricing Rule,Discount on Other Item,অন্যান্য আইটেম উপর ছাড়
@@ -963,6 +964,7 @@
 DocType: BOM,Operating Cost,পরিচালনা খরচ
 DocType: Crop,Produced Items,উত্পাদিত আইটেম
 DocType: Bank Statement Transaction Entry,Match Transaction to Invoices,ইনভয়েসস থেকে ম্যাচ লেনদেন
+apps/erpnext/erpnext/erpnext_integrations/exotel_integration.py,Error in Exotel incoming call,এক্সটেল ইনকামিং কলে ত্রুটি
 DocType: Sales Order Item,Gross Profit,পুরো লাভ
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js,Unblock Invoice,চালান আনলক করুন
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py,Increment cannot be 0,বর্ধিত 0 হতে পারবেন না
@@ -1171,6 +1173,7 @@
 DocType: Activity Cost,Activity Type,কার্যকলাপ টাইপ
 DocType: Request for Quotation,For individual supplier,পৃথক সরবরাহকারী জন্য
 DocType: BOM Operation,Base Hour Rate(Company Currency),বেজ কেয়ামত হার (কোম্পানির মুদ্রা)
+,Qty To Be Billed,কিটি টু বি বিল!
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py,Delivered Amount,বিতরিত পরিমাণ
 apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.js,Reserved Qty for Production: Raw materials quantity to make manufacturing items.,উত্পাদনের জন্য সংরক্ষিত পরিমাণ: উত্পাদন আইটেমগুলি তৈরির কাঁচামাল পরিমাণ।
 DocType: Loyalty Point Entry Redemption,Redemption Date,রিডমপশন তারিখ
@@ -1288,7 +1291,7 @@
 DocType: Sales Invoice,Commission Rate (%),কমিশন হার (%)
 apps/erpnext/erpnext/education/doctype/student_group/student_group.py,Please select Program,দয়া করে নির্বাচন করুন প্রোগ্রাম
 DocType: Project,Estimated Cost,আনুমানিক খরচ
-DocType: Request for Quotation,Link to material requests,উপাদান অনুরোধ লিংক
+DocType: Supplier Quotation,Link to material requests,উপাদান অনুরোধ লিংক
 apps/erpnext/erpnext/public/js/hub/pages/Publish.vue,Publish,প্রকাশ করা
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py,Aerospace,বিমান উড্ডয়ন এলাকা
 ,Fichier des Ecritures Comptables [FEC],ফিসার ডেস ইকরিটেস কমপ্যাটবলস [এফকে]
@@ -1301,6 +1304,7 @@
 apps/erpnext/erpnext/utilities/transaction_base.py,Invalid Posting Time,অবৈধ পোস্টিং সময়
 DocType: Salary Component,Condition and Formula,শর্ত এবং সূত্র
 DocType: Lead,Campaign Name,প্রচারাভিযান নাম
+apps/erpnext/erpnext/setup/default_energy_point_rules.py,On Task Completion,টাস্ক সমাপ্তিতে
 apps/erpnext/erpnext/hr/doctype/compensatory_leave_request/compensatory_leave_request.py,There is no leave period in between {0} and {1},{0} এবং {1} এর মধ্যে কোনও ছুটির সময় নেই
 DocType: Fee Validity,Healthcare Practitioner,স্বাস্থ্যসেবা চিকিত্সক
 DocType: Hotel Room,Capacity,ধারণক্ষমতা
@@ -1644,7 +1648,6 @@
 DocType: Quality Feedback Template,Quality Feedback Template,গুণমান প্রতিক্রিয়া টেম্পলেট
 apps/erpnext/erpnext/config/education.py,LMS Activity,এলএমএস ক্রিয়াকলাপ
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py,Internet Publishing,ইন্টারনেট প্রকাশনা
-DocType: Prescription Duration,Number,সংখ্যা
 apps/erpnext/erpnext/accounts/doctype/opening_invoice_creation_tool/opening_invoice_creation_tool.js,Creating {0} Invoice,{0} ইনভয়েস তৈরি করা
 DocType: Medical Code,Medical Code Standard,মেডিকেল কোড স্ট্যান্ডার্ড
 DocType: Soil Texture,Clay Composition (%),ক্লে গঠন (%)
@@ -1719,6 +1722,7 @@
 DocType: Support Settings,Get Started Sections,বিভাগগুলি শুরু করুন
 DocType: Lead,CRM-LEAD-.YYYY.-,সিআরএম-লিড .YYYY.-
 DocType: Invoice Discounting,Sanctioned,অনুমোদিত
+,Base Amount,বেস পরিমাণ
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.js,Total Contribution Amount: {0},মোট অবদান পরিমাণ: {0}
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py,Row #{0}: Please specify Serial No for Item {1},সারি # {0}: আইটেম জন্য কোন সিরিয়াল উল্লেখ করুন {1}
 DocType: Payroll Entry,Salary Slips Submitted,বেতন স্লিপ জমা
@@ -1936,6 +1940,7 @@
 apps/erpnext/erpnext/utilities/user_progress.py,List a few of your suppliers. They could be organizations or individuals.,আপনার সরবরাহকারীদের একটি কয়েক তালিকা. তারা সংগঠন বা ব্যক্তি হতে পারে.
 DocType: Accounting Dimension,Dimension Defaults,মাত্রা ডিফল্ট
 apps/erpnext/erpnext/crm/report/prospects_engaged_but_not_converted/prospects_engaged_but_not_converted.js,Minimum Lead Age (Days),নূন্যতম লিড বয়স (দিন)
+apps/erpnext/erpnext/assets/report/fixed_asset_register/fixed_asset_register.py,Available For Use Date,ব্যবহারের তারিখের জন্য উপলব্ধ
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py,All BOMs,সকল BOMs
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js,Create Inter Company Journal Entry,আন্তঃ সংস্থা জার্নাল এন্ট্রি তৈরি করুন
 DocType: Company,Parent Company,মূল কোম্পানি
@@ -2000,6 +2005,7 @@
 ,IRS 1099,আইআরএস 1099
 DocType: Salary Slip,Leave Without Pay,পারিশ্রমিক বিহীন ছুটি
 DocType: Payment Request,Outward,বাহ্যিক
+apps/erpnext/erpnext/setup/default_energy_point_rules.py,On {0} Creation,{0} তৈরিতে
 apps/erpnext/erpnext/regional/doctype/gstr_3b_report/gstr_3b_report.html,State/UT Tax,রাজ্য / ইউটি কর কর Tax
 ,Trial Balance for Party,পার্টি জন্য ট্রায়াল ব্যালেন্স
 ,Gross and Net Profit Report,গ্রস এবং নেট লাভের রিপোর্ট
@@ -2113,6 +2119,7 @@
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js,Make Stock Entry,স্টক এন্ট্রি করুন
 DocType: Hotel Room Reservation,Hotel Reservation User,হোটেল রিজার্ভেশন ইউজার
 apps/erpnext/erpnext/projects/doctype/project/project.js,Set Status,স্থিতি সেট করুন
+apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py,Please setup numbering series for Attendance via Setup &gt; Numbering Series,দয়া করে সেটআপ&gt; নম্বরিং সিরিজের মাধ্যমে উপস্থিতির জন্য সংখ্যায়ন সিরিজটি সেট করুন
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py,Please select prefix first,প্রথম উপসর্গ নির্বাচন করুন
 DocType: Contract,Fulfilment Deadline,পূরণের সময়সীমা
 apps/erpnext/erpnext/public/js/hub/pages/Home.vue,Near you,আপনার কাছাকাছি
@@ -2128,6 +2135,7 @@
 DocType: Announcement,All Students,সকল শিক্ষার্থীরা
 apps/erpnext/erpnext/assets/doctype/asset/asset.py,Item {0} must be a non-stock item,আইটেম {0} একটি অ স্টক আইটেমটি হতে হবে
 apps/erpnext/erpnext/stock/doctype/batch/batch.js,View Ledger,দেখুন লেজার
+DocType: Cost Center,Lft,এলএফটি
 DocType: Grading Scale,Intervals,অন্তর
 DocType: Bank Statement Transaction Entry,Reconciled Transactions,পুনর্বিবেচনার লেনদেন
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py,Earliest,পুরনো
@@ -2242,6 +2250,7 @@
 apps/erpnext/erpnext/hr/doctype/employee_benefit_application/employee_benefit_application.py,As per your assigned Salary Structure you cannot apply for benefits,আপনার নিয়োগপ্রাপ্ত বেতন গঠন অনুযায়ী আপনি বেনিফিটের জন্য আবেদন করতে পারবেন না
 apps/erpnext/erpnext/stock/doctype/item/item.py,Website Image should be a public file or website URL,ওয়েবসাইট চিত্র একটি পাবলিক ফাইল বা ওয়েবসাইট URL হওয়া উচিত
 DocType: Purchase Invoice Item,BOM,BOM
+apps/erpnext/erpnext/stock/doctype/item/item.py,Duplicate entry in Manufacturers table,উত্পাদনকারীদের টেবিলে সদৃশ এন্ট্রি
 apps/erpnext/erpnext/setup/doctype/item_group/item_group.js,This is a root item group and cannot be edited.,এটি একটি root আইটেমটি গ্রুপ এবং সম্পাদনা করা যাবে না.
 apps/erpnext/erpnext/accounts/doctype/account/account.js,Merge,মার্জ
 DocType: Journal Entry Account,Purchase Order,ক্রয় আদেশ
@@ -2383,7 +2392,6 @@
 DocType: Asset,Depreciation Schedules,অবচয় সূচী
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.js,Create Sales Invoice,বিক্রয় চালান তৈরি করুন
 apps/erpnext/erpnext/regional/doctype/gstr_3b_report/gstr_3b_report.html,Ineligible ITC,অযোগ্য আইটিসি
-apps/erpnext/erpnext/erpnext_integrations/doctype/shopify_settings/shopify_settings.py,"Support for public app is deprecated. Please setup private app, for more details refer user manual","পাবলিক অ্যাপ্লিকেশনের জন্য সমর্থন অবচিত হয়। আরো তথ্যের জন্য ব্যবহারকারী ম্যানুয়ালটি দেখুন, প্রাইভেট অ্যাপ সেট আপ করুন"
 DocType: Task,Dependent Tasks,নির্ভরশীল কাজ
 apps/erpnext/erpnext/regional/report/gstr_1/gstr_1.py,Following accounts might be selected in GST Settings:,জিএসটি সেটিংসে নিম্নলিখিত অ্যাকাউন্টগুলি নির্বাচন করা যেতে পারে:
 apps/erpnext/erpnext/manufacturing/report/bom_stock_report/bom_stock_report.js,Quantity to Produce,উত্পাদনের পরিমাণ
@@ -2631,6 +2639,7 @@
 DocType: Water Analysis,Container,আধার
 apps/erpnext/erpnext/regional/report/gstr_1/gstr_1.py,Please set valid GSTIN No. in Company Address,দয়া করে কোম্পানির ঠিকানায় বৈধ জিএসটিআইএন নং সেট করুন
 apps/erpnext/erpnext/education/utils.py,Student {0} - {1} appears Multiple times in row {2} & {3},ছাত্র {0} - {1} সারিতে একাধিক বার প্রদর্শিত {2} এবং {3}
+apps/erpnext/erpnext/selling/doctype/customer/customer.py,Following fields are mandatory to create address:,নিম্নলিখিত ক্ষেত্রগুলি ঠিকানা তৈরি করার জন্য বাধ্যতামূলক:
 DocType: Item Alternative,Two-way,দ্বিপথ
 DocType: Item,Manufacturers,নির্মাতারা
 ,Employee Billing Summary,কর্মচারী বিলিংয়ের সংক্ষিপ্তসার
@@ -2704,9 +2713,9 @@
 DocType: Employee,HR-EMP-,এইচআর-EMP-
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py,User {0} doesn't have any default POS Profile. Check Default at Row {1} for this User.,ব্যবহারকারী {0} এর কোনো ডিফল্ট POS প্রোফাইল নেই। এই ব্যবহারকারীর জন্য সারি {1} ডিফল্ট চেক করুন
 DocType: Quality Meeting Minutes,Quality Meeting Minutes,কোয়ালিটি মিটিং মিনিট
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Supplier &gt; Supplier Type,সরবরাহকারী&gt; সরবরাহকারী প্রকার
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py,Employee Referral,কর্মচারী রেফারেল
 DocType: Student Group,Set 0 for no limit,কোন সীমা 0 সেট
+DocType: Cost Center,rgt,rgt
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py,The day(s) on which you are applying for leave are holidays. You need not apply for leave.,"আপনি ছুটি জন্য আবেদন করেন, যা প্রথম দিন (গুলি) ছুটির হয়. আপনি চলে জন্য আবেদন করার প্রয়োজন নেই."
 DocType: Customer,Primary Address and Contact Detail,প্রাথমিক ঠিকানা এবং যোগাযোগ বিস্তারিত
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.js,Resend Payment Email,পেমেন্ট ইমেইল পুনরায় পাঠান
@@ -2812,7 +2821,6 @@
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py,Against Supplier Invoice {0} dated {1},সরবরাহকারী বিরুদ্ধে চালান {0} তারিখের {1}
 DocType: Customer,Default Price List,ডিফল্ট মূল্য তালিকা
 apps/erpnext/erpnext/assets/doctype/asset/asset.py,Asset Movement record {0} created,অ্যাসেট আন্দোলন রেকর্ড {0} সৃষ্টি
-apps/erpnext/erpnext/utilities/page/leaderboard/leaderboard.js,No items found.,কোন আইটেম পাওয়া যায় নি
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py,You cannot delete Fiscal Year {0}. Fiscal Year {0} is set as default in Global Settings,আপনি মুছে ফেলতে পারবেন না অর্থবছরের {0}. অর্থবছরের {0} গ্লোবাল সেটিংস এ ডিফল্ট হিসাবে সেট করা হয়
 DocType: Share Transfer,Equity/Liability Account,ইক্যুইটি / দায় অ্যাকাউন্ট
 apps/erpnext/erpnext/setup/doctype/customer_group/customer_group.py,A customer with the same name already exists,একই নামের একটি গ্রাহক ইতিমধ্যে বিদ্যমান
@@ -2828,6 +2836,7 @@
 apps/erpnext/erpnext/selling/doctype/customer/customer.py,Credit limit has been crossed for customer {0} ({1}/{2}),গ্রাহকের জন্য ক্রেডিট সীমা অতিক্রম করা হয়েছে {0} ({1} / {2})
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py,Customer required for 'Customerwise Discount',&#39;Customerwise ছাড়&#39; জন্য প্রয়োজনীয় গ্রাহক
 apps/erpnext/erpnext/config/accounting.py,Update bank payment dates with journals.,পত্রিকার সঙ্গে ব্যাংক পেমেন্ট তারিখ আপডেট করুন.
+,Billed Qty,বিল কেটি
 apps/erpnext/erpnext/stock/doctype/item/item_dashboard.py,Pricing,প্রাইসিং
 DocType: Employee,Attendance Device ID (Biometric/RF tag ID),উপস্থিতি ডিভাইস আইডি (বায়োমেট্রিক / আরএফ ট্যাগ আইডি)
 DocType: Quotation,Term Details,টার্ম বিস্তারিত
@@ -2849,6 +2858,7 @@
 DocType: Share Transfer,Asset Account,সম্পদ অ্যাকাউন্ট
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js,New release date should be in the future,নতুন প্রকাশের তারিখটি ভবিষ্যতে হওয়া উচিত
 DocType: Purchase Invoice,End date of current invoice's period,বর্তমান চালান এর সময়ের শেষ তারিখ
+apps/erpnext/erpnext/hr/doctype/employee/employee.py,Please setup Employee Naming System in Human Resource &gt; HR Settings,মানব সম্পদ&gt; এইচআর সেটিংসে কর্মচারী নামকরণ সিস্টেম সেটআপ করুন
 DocType: Lab Test,Technician Name,প্রযুক্তিবিদ নাম
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py,"Cannot ensure delivery by Serial No as \
 					Item {0} is added with and without Ensure Delivery by \
@@ -2856,6 +2866,7 @@
 DocType: Accounts Settings,Unlink Payment on Cancellation of Invoice,চালান বাতিলের পেমেন্ট লিঙ্কমুক্ত
 DocType: Bank Reconciliation,From Date,তারিখ থেকে
 apps/erpnext/erpnext/hr/doctype/vehicle_log/vehicle_log.py,Current Odometer reading entered should be greater than initial Vehicle Odometer {0},বর্তমান দূরত্বমাপণী পড়া প্রবেশ প্রাথমিক যানবাহন ওডোমিটার চেয়ে বড় হতে হবে {0}
+,Purchase Order Items To Be Received or Billed,ক্রয় অর্ডার আইটেম গ্রহণ বা বিল করতে হবে
 DocType: Restaurant Reservation,No Show,না দেখান
 apps/erpnext/erpnext/regional/india/utils.py,You must be a registered supplier to generate e-Way Bill,ই-ওয়ে বিল তৈরির জন্য আপনাকে অবশ্যই নিবন্ধিত সরবরাহকারী হতে হবে
 DocType: Shipping Rule Country,Shipping Rule Country,শিপিং রুল দেশ
@@ -2897,6 +2908,7 @@
 apps/erpnext/erpnext/templates/generators/item/item_add_to_cart.html,View in Cart,কার্ট দেখুন
 DocType: Employee Checkin,Shift Actual Start,শিফট আসল শুরু
 DocType: Tally Migration,Is Day Book Data Imported,ইজ ডে বুক ডেটা আমদানি করা
+,Purchase Order Items To Be Received or Billed1,ক্রয় অর্ডার আইটেম গ্রহণ বা বিল 1
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py,Marketing Expenses,বিপণন খরচ
 apps/erpnext/erpnext/stock/doctype/pick_list/pick_list.py,{0} units of {1} is not available.,{1} এর {0} ইউনিট উপলব্ধ নয়।
 ,Item Shortage Report,আইটেম পত্র
@@ -3260,6 +3272,7 @@
 DocType: Homepage Section,Section Cards,বিভাগ কার্ড
 ,Campaign Efficiency,ক্যাম্পেইন দক্ষতা
 DocType: Discussion,Discussion,আলোচনা
+apps/erpnext/erpnext/setup/default_energy_point_rules.py,On Sales Order Submission,বিক্রয় আদেশ জমা দিন
 DocType: Bank Transaction,Transaction ID,লেনদেন নাম্বার
 DocType: Payroll Entry,Deduct Tax For Unsubmitted Tax Exemption Proof,Unsubmitted কর ছাড় ছাড়ের জন্য ট্যাক্স আদায়
 DocType: Volunteer,Anytime,যে কোনো সময়
@@ -3267,7 +3280,6 @@
 DocType: Employee Tax Exemption Proof Submission,Employee Tax Exemption Proof Submission,কর্মচারী ট্যাক্স ছাড় প্রুফ জমা
 DocType: Patient,Surgical History,অস্ত্রোপচারের ইতিহাস
 DocType: Bank Statement Settings Item,Mapped Header,ম্যাপ করা শিরোলেখ
-apps/erpnext/erpnext/hr/doctype/employee/employee.py,Please setup Employee Naming System in Human Resource &gt; HR Settings,মানব সম্পদ&gt; এইচআর সেটিংসে কর্মচারী নামকরণ সিস্টেম সেটআপ করুন
 DocType: Employee,Resignation Letter Date,পদত্যাগ পত্র তারিখ
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Pricing Rules are further filtered based on quantity.,দামে আরও পরিমাণের উপর ভিত্তি করে ফিল্টার করা হয়.
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py,Please set the Date Of Joining for employee {0},কর্মচারী জন্য যোগদানের তারিখ সেট করুন {0}
@@ -3281,6 +3293,7 @@
 DocType: Bank Statement Settings,Mapped Items,ম্যাপ আইটেম
 DocType: Amazon MWS Settings,IT,আইটি
 DocType: Chapter,Chapter,অধ্যায়
+,Fixed Asset Register,স্থির সম্পদ রেজিস্টার
 apps/erpnext/erpnext/utilities/user_progress.py,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,Select BOM and Qty for Production,উত্পাদনের জন্য BOM এবং Qty নির্বাচন
@@ -3966,7 +3979,6 @@
 DocType: Project User,Project Status,প্রোজেক্ট অবস্থা
 DocType: UOM,Check this to disallow fractions. (for Nos),ভগ্নাংশ অননুমোদন এই পরীক্ষা. (আমরা জন্য)
 DocType: Student Admission Program,Naming Series (for Student Applicant),সিরিজ নেমিং (স্টুডেন্ট আবেদনকারীর জন্য)
-apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.py,UOM Conversion factor ({0} -&gt; {1}) not found for item: {2},ইউওএম রূপান্তর ফ্যাক্টর ({0} -&gt; {1}) আইটেমটির জন্য পাওয়া যায় নি: {2}
 apps/erpnext/erpnext/hr/doctype/retention_bonus/retention_bonus.py,Bonus Payment Date cannot be a past date,বোনাস প্রদানের তারিখ একটি অতীতের তারিখ হতে পারে না
 DocType: Travel Request,Copy of Invitation/Announcement,আমন্ত্রণ / ঘোষণা এর অনুলিপি
 DocType: Practitioner Service Unit Schedule,Practitioner Service Unit Schedule,অনুশীলনকারী পরিষেবা ইউনিট শিলা
@@ -4188,7 +4200,6 @@
 DocType: Journal Entry,Accounting Entries,হিসাব থেকে
 DocType: Job Card Time Log,Job Card Time Log,কাজের কার্ড সময় লগ
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,"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; ক্ষেত্রের মধ্যে আনা হবে।"
-apps/erpnext/erpnext/education/doctype/instructor/instructor.py,Please setup Instructor Naming System in Education &gt; Education Settings,দয়া করে শিক্ষা&gt; শিক্ষা সেটিংসে প্রশিক্ষক নামকরণ সিস্টেম সেটআপ করুন
 DocType: Journal Entry,Paid Loan,প্রদেয় ঋণ
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py,Duplicate Entry. Please check Authorization Rule {0},ডুপ্লিকেট এন্ট্রি. দয়া করে চেক করুন অনুমোদন রুল {0}
 DocType: Journal Entry Account,Reference Due Date,রেফারেন্স দরুন তারিখ
@@ -4205,7 +4216,6 @@
 apps/erpnext/erpnext/templates/pages/projects.html,No time sheets,কোন সময় শীট
 DocType: GoCardless Mandate,GoCardless Customer,GoCardless গ্রাহক
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py,Leave Type {0} cannot be carry-forwarded,{0} বহন-ফরওয়ার্ড করা যাবে না প্রকার ত্যাগ
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Item Code &gt; Item Group &gt; Brand,আইটেম কোড&gt; আইটেম গ্রুপ&gt; ব্র্যান্ড
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py,Maintenance Schedule is not generated for all the items. Please click on 'Generate Schedule',রক্ষণাবেক্ষণ সূচি সব আইটেম জন্য উত্পন্ন করা হয় না. &#39;নির্মাণ সূচি&#39; তে ক্লিক করুন
 ,To Produce,উৎপাদন করা
 DocType: Leave Encashment,Payroll,বেতনের
@@ -4320,7 +4330,6 @@
 DocType: Stock Ledger Entry,Actual Qty After Transaction,লেনদেন পরে আসল Qty
 ,Pending SO Items For Purchase Request,ক্রয় অনুরোধ জন্য তাই চলছে অপেক্ষারত
 apps/erpnext/erpnext/education/doctype/student_admission/student_admission.py,Student Admissions,স্টুডেন্ট অ্যাডমিশন
-apps/erpnext/erpnext/accounts/party.py,{0} {1} is disabled,{0} {1} নিষ্ক্রিয় করা
 DocType: Supplier,Billing Currency,বিলিং মুদ্রা
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py,Extra Large,অতি বৃহদাকার
 DocType: Loan,Loan Application,ঋণ আবেদন
@@ -4397,7 +4406,6 @@
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py,Only Leave Applications with status 'Approved' and 'Rejected' can be submitted,শুধু ত্যাগ অবস্থা অ্যাপ্লিকেশন অনুমোদিত &#39;&#39; এবং &#39;প্রত্যাখ্যাত&#39; জমা করা যেতে পারে
 apps/erpnext/erpnext/accounts/doctype/accounting_dimension/accounting_dimension.py,Creating Dimensions...,মাত্রা তৈরি করা হচ্ছে ...
 apps/erpnext/erpnext/education/doctype/student_group_creation_tool/student_group_creation_tool.py,Student Group Name is mandatory in row {0},স্টুডেন্ট গ্রুপের নাম সারিতে বাধ্যতামূলক {0}
-DocType: Customer Credit Limit,Bypass credit limit_check,বাইপাস ক্রেডিট সীমা_চেক করুন
 DocType: Homepage,Products to be shown on website homepage,পণ্য ওয়েবসাইট হোমপেজে দেখানো হবে
 DocType: HR Settings,Password Policy,পাসওয়ার্ড নীতি
 apps/erpnext/erpnext/setup/doctype/customer_group/customer_group.js,This is a root customer group and cannot be edited.,এটি একটি root গ্রাহক গ্রুপ এবং সম্পাদনা করা যাবে না.
@@ -4978,6 +4986,7 @@
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py,No {0} found for Inter Company Transactions.,ইন্টার কোম্পানি লেনদেনের জন্য কোন {0} পাওয়া যায়নি।
 DocType: Travel Itinerary,Rented Car,ভাড়া গাড়ি
 apps/erpnext/erpnext/public/js/hub/components/profile_dialog.js,About your Company,আপনার কোম্পানি সম্পর্কে
+apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.js,Show Stock Ageing Data,স্টক এজিং ডেটা দেখান
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py,Credit To account must be a Balance Sheet account,একাউন্টে ক্রেডিট একটি ব্যালান্স শিটের অ্যাকাউন্ট থাকতে হবে
 DocType: Donor,Donor,দাতা
 DocType: Global Defaults,Disable In Words,শব্দ অক্ষম
@@ -4991,8 +5000,10 @@
 DocType: Patient,Patient ID,রোগীর আইডি
 DocType: Practitioner Schedule,Schedule Name,সূচি নাম
 DocType: Currency Exchange,For Buying,কেনার জন্য
+apps/erpnext/erpnext/setup/default_energy_point_rules.py,On Purchase Order Submission,ক্রয় আদেশ জমা দেওয়ার সময়
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js,Add All Suppliers,সমস্ত সরবরাহকারী যোগ করুন
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py,Row #{0}: Allocated Amount cannot be greater than outstanding amount.,সারি # {0}: বরাদ্দ বকেয়া পরিমাণ পরিমাণ তার চেয়ে অনেক বেশী হতে পারে না।
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Customer &gt; Customer Group &gt; Territory,গ্রাহক&gt; গ্রাহক গোষ্ঠী&gt; অঞ্চল
 DocType: Tally Migration,Parties,দল
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js,Browse BOM,ব্রাউজ BOM
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py,Secured Loans,নিরাপদ ঋণ
@@ -5013,6 +5024,7 @@
 DocType: Appraisal,Appraisal,গুণগ্রাহিতা
 DocType: Loan,Loan Account,ঋণ অ্যাকাউন্ট
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py,Valid from and valid upto fields are mandatory for the cumulative,সংখ্যার জন্য বৈধ এবং ক্ষেত্র অবধি ক্ষেত্রগুলি বাধ্যতামূলক
+apps/erpnext/erpnext/stock/doctype/pick_list/pick_list.py,"For item {0} at row {1}, count of serial numbers does not match with the picked quantity","আইটেম {0} সারিতে {1}, ক্রমিক সংখ্যার গণনা বাছাই করা পরিমাণের সাথে মেলে না"
 DocType: Purchase Invoice,GST Details,জিএসটি বিশ্লেষণ
 apps/erpnext/erpnext/healthcare/doctype/healthcare_practitioner/healthcare_practitioner_dashboard.py,This is based on transactions against this Healthcare Practitioner.,এটি এই হেলথ কেয়ার প্র্যাকটিসনারের বিরুদ্ধে লেনদেনের উপর ভিত্তি করে।
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py,Email sent to supplier {0},সরবরাহকারী পাঠানো ইমেল {0}
@@ -5023,6 +5035,7 @@
 apps/erpnext/erpnext/stock/doctype/item_alternative/item_alternative.py,Not allow to set alternative item for the item {0},আইটেম জন্য বিকল্প আইটেম সেট করতে অনুমতি দেয় না {0}
 apps/erpnext/erpnext/hr/doctype/leave_block_list/leave_block_list.py,Date is repeated,তারিখ পুনরাবৃত্তি করা হয়
 apps/erpnext/erpnext/accounts/print_format/payment_receipt_voucher/payment_receipt_voucher.html,Authorized Signatory,অনুমোদিত স্বাক্ষরকারী
+apps/erpnext/erpnext/education/doctype/instructor/instructor.py,Please setup Instructor Naming System in Education &gt; Education Settings,দয়া করে শিক্ষা&gt; শিক্ষা সেটিংসে প্রশিক্ষক নামকরণ সিস্টেম সেটআপ করুন
 apps/erpnext/erpnext/regional/doctype/gstr_3b_report/gstr_3b_report.html,Net ITC Available(A) - (B),নেট আইটিসি উপলব্ধ (এ) - (খ)
 apps/erpnext/erpnext/education/doctype/fee_schedule/fee_schedule.js,Create Fees,ফি তৈরি করুন
 DocType: Project,Total Purchase Cost (via Purchase Invoice),মোট ক্রয় খরচ (ক্রয় চালান মাধ্যমে)
@@ -5043,6 +5056,7 @@
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.js,Message Sent,বার্তা পাঠানো
 apps/erpnext/erpnext/accounts/doctype/account/account.py,Account with child nodes cannot be set as ledger,সন্তানের নোড সঙ্গে অ্যাকাউন্ট খতিয়ান হিসাবে সেট করা যাবে না
 DocType: C-Form,II,২
+apps/erpnext/erpnext/assets/report/fixed_asset_register/fixed_asset_register.py,Vendor Name,বিক্রেতার নাম
 DocType: Quiz Result,Wrong,ভুল
 DocType: Sales Invoice,Rate at which Price list currency is converted to customer's base currency,হারে যা মূল্যতালিকা মুদ্রার এ গ্রাহকের বেস কারেন্সি রূপান্তরিত হয়
 DocType: Purchase Invoice Item,Net Amount (Company Currency),থোক (কোম্পানি একক)
@@ -5281,6 +5295,7 @@
 DocType: Stock Settings,Auto Material Request,অটো উপাদানের জন্য অনুরোধ
 DocType: Woocommerce Settings,API consumer secret,API কনজিউমার গোপনীয়তা
 DocType: Delivery Note Item,Available Batch Qty at From Warehouse,গুদাম থেকে এ উপলব্ধ ব্যাচ Qty
+,Received Qty Amount,প্রাপ্ত পরিমাণের পরিমাণ
 DocType: Salary Slip,Gross Pay - Total Deduction - Loan Repayment,গ্রস পে - মোট সিদ্ধান্তগ্রহণ - ঋণ পরিশোধ
 DocType: Bank Account,Last Integration Date,শেষ সংহতকরণের তারিখ
 DocType: Expense Claim,Expense Taxes and Charges,ব্যয় কর এবং চার্জ
@@ -5735,6 +5750,8 @@
 DocType: Drug Prescription,Hour,ঘন্টা
 DocType: Restaurant Order Entry,Last Sales Invoice,শেষ সেলস ইনভয়েস
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py,Please select Qty against item {0},আইটেম {0} বিরুদ্ধে Qty নির্বাচন করুন
+apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py,Latest Age,দেরী পর্যায়ে
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js,Transfer Material to Supplier,সরবরাহকারী উপাদান স্থানান্তর
 apps/erpnext/erpnext/hr/report/loan_repayment/loan_repayment.py,EMI,এক্সটার্নাল মেশিন
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py,New Serial No cannot have Warehouse. Warehouse must be set by Stock Entry or Purchase Receipt,নতুন সিরিয়াল কোন গুদাম থাকতে পারে না. গুদাম স্টক এন্ট্রি বা কেনার রসিদ দ্বারা নির্ধারণ করা হবে
 DocType: Lead,Lead Type,লিড ধরন
@@ -5756,7 +5773,6 @@
 apps/erpnext/erpnext/hr/doctype/employee_benefit_application/employee_benefit_application.py,"An amount of {0} already claimed for the component {1},\
 						 set the amount equal or greater than {2}","{0} এর পরিমাণ পূর্বে {1} উপাদানটির জন্য দাবি করা হয়েছে, {2} এর সমান বা বড় পরিমাণ সেট করুন"
 DocType: Shipping Rule,Shipping Rule Conditions,শিপিং রুল শর্তাবলী
-DocType: Purchase Invoice,Export Type,রপ্তানি প্রকার
 DocType: Salary Slip Loan,Salary Slip Loan,বেতন স্লিপ ঋণ
 DocType: BOM Update Tool,The new BOM after replacement,প্রতিস্থাপন পরে নতুন BOM
 ,Point of Sale,বিক্রয় বিন্দু
@@ -5874,7 +5890,6 @@
 DocType: Purchase Order Item,Blanket Order Rate,কংক্রিট অর্ডার রেট
 ,Customer Ledger Summary,গ্রাহক লেজারের সংক্ষিপ্তসার
 apps/erpnext/erpnext/hooks.py,Certification,সাক্ষ্যদান
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js,Are you sure you want to make debit note?,আপনি কি ডেবিট নোট তৈরি করতে চান?
 DocType: Bank Guarantee,Clauses and Conditions,ক্লাউজ এবং শর্তাবলী
 DocType: Serial No,Creation Document Type,ক্রিয়েশন ডকুমেন্ট টাইপ
 DocType: Amazon MWS Settings,ES,ইএস
@@ -5912,8 +5927,6 @@
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py,Financial Services,অর্থনৈতিক সেবা
 DocType: Student Sibling,Student ID,শিক্ষার্থী আইডি
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.js,For Quantity must be greater than zero,পরিমাণ জন্য শূন্য চেয়ে বড় হতে হবে
-apps/erpnext/erpnext/hr/doctype/employee_transfer/employee_transfer.py,"Please delete the Employee <a href=""#Form/Employee/{0}"">{0}</a>\
-					to cancel this document","এই নথিটি বাতিল করতে দয়া করে কর্মচারী <a href=""#Form/Employee/{0}"">{0}</a> delete মুছুন"
 apps/erpnext/erpnext/config/projects.py,Types of activities for Time Logs,টাইম লগ জন্য ক্রিয়াকলাপ প্রকারভেদ
 DocType: Opening Invoice Creation Tool,Sales,সেলস
 DocType: Stock Entry Detail,Basic Amount,বেসিক পরিমাণ
@@ -5992,6 +6005,7 @@
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py,Print and Stationery,মুদ্রণ করুন এবং স্টেশনারি
 DocType: Stock Settings,Show Barcode Field,দেখান বারকোড ফিল্ড
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js,Send Supplier Emails,সরবরাহকারী ইমেইল পাঠান
+DocType: Asset Movement,ACC-ASM-.YYYY.-,দুদক-এ এস এম-.YYYY.-
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py,"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,অটো প্রস্তুত
 apps/erpnext/erpnext/hr/doctype/employee_onboarding/employee_onboarding.py,Submit this to create the Employee record,কর্মচারীর রেকর্ড তৈরির জন্য এটি জমা দিন
@@ -6067,7 +6081,6 @@
 DocType: Sales Team,Contact No.,যোগাযোগের নম্বর.
 apps/erpnext/erpnext/templates/includes/cart/cart_address.html,Billing Address is same as Shipping Address,বিলিং ঠিকানা শিপিং ঠিকানার মতো
 DocType: Bank Reconciliation,Payment Entries,পেমেন্ট দাখিলা
-apps/erpnext/erpnext/erpnext_integrations/doctype/shopify_settings/shopify_settings.py,Access token or Shopify URL missing,অ্যাক্সেস টোকেন বা Shopify URL অনুপস্থিত
 DocType: Location,Latitude,অক্ষাংশ
 DocType: Work Order,Scrap Warehouse,স্ক্র্যাপ ওয়্যারহাউস
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py,"Warehouse required at Row No {0}, please set default warehouse for the item {1} for the company {2}","সারি নং {0} তে গুদাম প্রয়োজন, দয়া করে কোম্পানির {1} আইটেমের জন্য ডিফল্ট গুদাম সেট করুন {2}"
@@ -6109,7 +6122,6 @@
 DocType: Job Offer Term,Value / Description,মূল্য / বিবরণ:
 apps/erpnext/erpnext/controllers/accounts_controller.py,"Row #{0}: Asset {1} cannot be submitted, it is already {2}","সারি # {0}: অ্যাসেট {1} জমা দেওয়া যাবে না, এটা আগে থেকেই {2}"
 DocType: Tax Rule,Billing Country,বিলিং দেশ
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js,Are you sure you want to make credit note?,আপনি কি নিশ্চিত যে আপনি ক্রেডিট নোট তৈরি করতে চান?
 DocType: Purchase Order Item,Expected Delivery Date,প্রত্যাশিত প্রসবের তারিখ
 DocType: Restaurant Order Entry,Restaurant Order Entry,রেস্টুরেন্ট অর্ডার এন্ট্রি
 apps/erpnext/erpnext/accounts/general_ledger.py,Debit and Credit not equal for {0} #{1}. Difference is {2}.,ডেবিট ও ক্রেডিট {0} # জন্য সমান নয় {1}. পার্থক্য হল {2}.
@@ -6232,6 +6244,7 @@
 DocType: Purchase Invoice,Taxes and Charges Added,কর ও চার্জ যোগ
 apps/erpnext/erpnext/assets/doctype/asset/asset.py,Depreciation Row {0}: Next Depreciation Date cannot be before Available-for-use Date,হ্রাস সারি {0}: পরবর্তী অবচয় তারিখটি আগে উপলব্ধ নাও হতে পারে ব্যবহারের জন্য তারিখ
 ,Sales Funnel,বিক্রয় ফানেল
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Item Code &gt; Item Group &gt; Brand,আইটেম কোড&gt; আইটেম গ্রুপ&gt; ব্র্যান্ড
 apps/erpnext/erpnext/setup/doctype/company/company.py,Abbreviation is mandatory,সমাহার বাধ্যতামূলক
 DocType: Project,Task Progress,টাস্ক অগ্রগতি
 apps/erpnext/erpnext/templates/includes/navbar/navbar_items.html,Cart,কার্ট
@@ -6472,6 +6485,7 @@
 DocType: Employee Grade,Employee Grade,কর্মচারী গ্রেড
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py,Piecework,ফুরণ
 DocType: GSTR 3B Report,June,জুন
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Supplier &gt; Supplier Type,সরবরাহকারী&gt; সরবরাহকারী প্রকার
 DocType: Share Balance,From No,না থেকে
 DocType: Shift Type,Early Exit Grace Period,প্রারম্ভিক প্রস্থান গ্রেস পিরিয়ড
 DocType: Task,Actual Time (in Hours),(ঘন্টায়) প্রকৃত সময়
@@ -6754,6 +6768,7 @@
 DocType: Warehouse,Warehouse Name,ওয়ারহাউস নাম
 DocType: Naming Series,Select Transaction,নির্বাচন লেনদেন
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py,Please enter Approving Role or Approving User,ভূমিকা অনুমোদন বা ব্যবহারকারী অনুমদন লিখুন দয়া করে
+apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.py,UOM Conversion factor ({0} -&gt; {1}) not found for item: {2},ইউওএম রূপান্তর ফ্যাক্টর ({0} -&gt; {1}) আইটেমটির জন্য পাওয়া যায় নি: {2}
 DocType: Journal Entry,Write Off Entry,এন্ট্রি বন্ধ লিখুন
 DocType: BOM,Rate Of Materials Based On,হার উপকরণ ভিত্তি করে
 DocType: Education Settings,"If enabled, field Academic Term will be Mandatory in Program Enrollment Tool.","যদি সক্রিয় থাকে, তাহলে প্রোগ্রাম এনরোলমেন্ট টুল এ ক্ষেত্রটি একাডেমিক টার্ম বাধ্যতামূলক হবে।"
@@ -6942,6 +6957,7 @@
 DocType: Quality Inspection Reading,Quality Inspection Reading,গুণ পরিদর্শন ফাইন্যান্স
 apps/erpnext/erpnext/stock/doctype/stock_settings/stock_settings.py,`Freeze Stocks Older Than` should be smaller than %d days.,`ফ্রিজ স্টক পুরাতন Than`% D দিন চেয়ে কম হওয়া দরকার.
 DocType: Tax Rule,Purchase Tax Template,ট্যাক্স টেমপ্লেট ক্রয়
+apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py,Earliest Age,প্রথম দিকের বয়স
 apps/erpnext/erpnext/utilities/user_progress.py,Set a sales goal you'd like to achieve for your company.,আপনি আপনার কোম্পানির জন্য অর্জন করতে চান একটি বিক্রয় লক্ষ্য সেট করুন।
 DocType: Quality Goal,Revision,সংস্করণ
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js,Healthcare Services,স্বাস্থ্য সেবা পরিষদ
@@ -6985,6 +7001,7 @@
 apps/erpnext/erpnext/healthcare/doctype/patient_encounter/patient_encounter.js,Schedule Discharge,সময়সূচী স্রাব
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py,Cheques and Deposits incorrectly cleared,চেক এবং আমানত ভুল সাফ
 DocType: Homepage Section Card,Homepage Section Card,হোমপেজ বিভাগ কার্ড
+,Amount To Be Billed,বিল দেওয়ার পরিমাণ
 apps/erpnext/erpnext/accounts/doctype/account/account.py,Account {0}: You can not assign itself as parent account,অ্যাকাউন্ট {0}: আপনি অভিভাবক অ্যাকাউন্ট হিসাবে নিজেকে ধার্য করতে পারবেন না
 DocType: Purchase Invoice Item,Price List Rate,মূল্যতালিকা হার
 apps/erpnext/erpnext/utilities/activation.py,Create customer quotes,গ্রাহকের কোট তৈরি করুন
@@ -7037,6 +7054,7 @@
 DocType: Supplier Scorecard Criteria,Supplier Scorecard Criteria,সরবরাহকারী স্কোরকার্ড সার্টিফিকেট
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py,Please select Start Date and End Date for Item {0},আইটেম জন্য আরম্ভের তারিখ ও শেষ তারিখ নির্বাচন করুন {0}
 DocType: Maintenance Schedule,MAT-MSH-.YYYY.-,Mat-msh-.YYYY.-
+,Amount to Receive,প্রাপ্তির পরিমাণ
 apps/erpnext/erpnext/education/doctype/student_group_creation_tool/student_group_creation_tool.py,Course is mandatory in row {0},কোর্সের সারিতে বাধ্যতামূলক {0}
 apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py,From date can not be greater than than To date,তারিখ থেকে তারিখের চেয়ে বড় হতে পারে না
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py,To date cannot be before from date,তারিখ থেকে তারিখের আগে হতে পারে না
@@ -7486,6 +7504,7 @@
 DocType: Delivery Note,Print Without Amount,পরিমাণ ব্যতীত প্রিন্ট
 apps/erpnext/erpnext/accounts/report/asset_depreciation_ledger/asset_depreciation_ledger.py,Depreciation Date,অবচয় তারিখ
 ,Work Orders in Progress,অগ্রগতির কাজ আদেশ
+DocType: Customer Credit Limit,Bypass Credit Limit Check,বাইপাস ক্রেডিট সীমা পরীক্ষা করুন
 DocType: Issue,Support Team,দলকে সমর্থন
 apps/erpnext/erpnext/stock/report/batch_item_expiry_status/batch_item_expiry_status.py,Expiry (In Days),মেয়াদ শেষ হওয়ার (দিনে)
 DocType: Appraisal,Total Score (Out of 5),(5 এর মধ্যে) মোট স্কোর
@@ -7668,6 +7687,7 @@
 DocType: Sales Invoice,Customer GSTIN,গ্রাহক GSTIN
 DocType: Crop Cycle,List of diseases detected on the field. When selected it'll automatically add a list of tasks to deal with the disease ,ক্ষেত্র সনাক্ত রোগের তালিকা। নির্বাচিত হলে এটি স্বয়ংক্রিয়ভাবে রোগের মোকাবেলা করার জন্য কর্মের তালিকা যোগ করবে
 apps/erpnext/erpnext/manufacturing/page/bom_comparison_tool/bom_comparison_tool.js,BOM 1,বিওএম ঘ
+apps/erpnext/erpnext/assets/report/fixed_asset_register/fixed_asset_register.py,Asset Id,সম্পদ আইডি
 apps/erpnext/erpnext/healthcare/doctype/healthcare_service_unit/healthcare_service_unit.js,This is a root healthcare service unit and cannot be edited.,এটি একটি রুট হেলথ কেয়ার সার্ভিস ইউনিট এবং সম্পাদনা করা যাবে না।
 DocType: Asset Repair,Repair Status,স্থায়ী অবস্থা মেরামত
 apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.js,"Requested Qty: Quantity requested for purchase, but not ordered.","অনুরোধকৃত পরিমাণ: পরিমাণ ক্রয়ের জন্য অনুরোধ করা হয়েছে, তবে আদেশ দেওয়া হয়নি।"
diff --git a/erpnext/translations/bs.csv b/erpnext/translations/bs.csv
index c9d7d02..4f2eb73 100644
--- a/erpnext/translations/bs.csv
+++ b/erpnext/translations/bs.csv
@@ -289,7 +289,6 @@
 DocType: Loan,Repay Over Number of Periods,Otplatiti Preko broj perioda
 apps/erpnext/erpnext/manufacturing/report/bom_stock_report/bom_stock_report.py,Quantity to Produce can not be less than Zero,Količina za proizvodnju ne može biti manja od nule
 DocType: Stock Entry,Additional Costs,Dodatni troškovi
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Customer &gt; Customer Group &gt; Territory,Kupac&gt; grupa kupaca&gt; teritorija
 apps/erpnext/erpnext/accounts/doctype/account/account.py,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
@@ -586,6 +585,7 @@
 DocType: Healthcare Settings,Create documents for sample collection,Kreirajte dokumente za prikupljanje uzoraka
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py,Payment against {0} {1} cannot be greater than Outstanding Amount {2},Plaćanje protiv {0} {1} ne može biti veći od preostalog iznosa {2}
 apps/erpnext/erpnext/patches/v11_0/add_healthcare_service_unit_tree_root.py,All Healthcare Service Units,Sve jedinice zdravstvene službe
+apps/erpnext/erpnext/setup/default_energy_point_rules.py,On Converting Opportunity,O pretvaranju mogućnosti
 DocType: Bank Account,Address HTML,Adressa u HTML-u
 DocType: Lead,Mobile No.,Mobitel broj
 apps/erpnext/erpnext/selling/doctype/pos_closing_voucher/closing_voucher_details.html,Mode of Payments,Način plaćanja
@@ -650,7 +650,6 @@
 DocType: Accounting Dimension,Dimension Name,Ime dimenzije
 apps/erpnext/erpnext/healthcare/setup.py,Resistant,Otporno
 apps/erpnext/erpnext/hotels/doctype/hotel_room_reservation/hotel_room_reservation.py,Please set Hotel Room Rate on {},Molimo podesite Hotel Room Rate na {}
-apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py,Please setup numbering series for Attendance via Setup &gt; Numbering Series,Molimo podesite seriju brojeva za Attendance putem Podešavanje&gt; Serija numeriranja
 DocType: Journal Entry,Multi Currency,Multi valuta
 DocType: Bank Statement Transaction Invoice Item,Invoice Type,Tip fakture
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py,Valid from date must be less than valid upto date,Vrijedi od datuma mora biti manje od važećeg do datuma
@@ -765,6 +764,7 @@
 apps/erpnext/erpnext/accounts/page/pos/pos.js,Create a new Customer,Kreiranje novog potrošača
 apps/erpnext/erpnext/non_profit/report/expiring_memberships/expiring_memberships.py,Expiring On,Ističe se
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,"If multiple Pricing Rules continue to prevail, users are asked to set Priority manually to resolve conflict.","Ako više Cijene pravila i dalje prevladavaju, korisnici su zamoljeni da postavite prioritet ručno riješiti sukob."
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js,Purchase Return,Kupnja Povratak
 apps/erpnext/erpnext/utilities/activation.py,Create Purchase Orders,Napravi Narudžbenice
 ,Purchase Register,Kupnja Registracija
 apps/erpnext/erpnext/healthcare/doctype/patient/patient.py,Patient not found,Pacijent nije pronađen
@@ -780,7 +780,6 @@
 DocType: Location,Area UOM,Područje UOM
 apps/erpnext/erpnext/manufacturing/doctype/workstation/workstation.py,Workstation is closed on the following dates as per Holiday List: {0},Workstation je zatvoren sljedećih datuma po Holiday List: {0}
 apps/erpnext/erpnext/selling/page/sales_funnel/sales_funnel.py,Opportunities,Prilike
-apps/erpnext/erpnext/www/all-products/index.html,Clear filters,Očistite filtere
 DocType: Lab Test Template,Single,Singl
 DocType: Compensatory Leave Request,Work From Date,Rad sa datuma
 DocType: Salary Slip,Total Loan Repayment,Ukupno otplate kredita
@@ -823,6 +822,7 @@
 DocType: Account,Old Parent,Stari Roditelj
 apps/erpnext/erpnext/education/doctype/program_enrollment_tool/program_enrollment_tool.py,Mandatory field - Academic Year,Obavezna polja - akademska godina
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py,{0} {1} is not associated with {2} {3},{0} {1} nije povezan sa {2} {3}
+DocType: Opportunity,Converted By,Pretvorio
 apps/erpnext/erpnext/public/js/hub/components/ReviewArea.vue,You need to login as a Marketplace User before you can add any reviews.,"Prije nego što dodate bilo koju recenziju, morate se prijaviti kao korisnik Marketplacea."
 apps/erpnext/erpnext/manufacturing/doctype/job_card/job_card.py,Row {0} : Operation is required against the raw material item {1},Red {0}: Operacija je neophodna prema elementu sirovine {1}
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py,Please set default payable account for the company {0},Molimo postavite zadani plaća račun za kompaniju {0}
@@ -848,6 +848,8 @@
 DocType: BOM,Work Order,Radni nalog
 DocType: Sales Invoice,Total Qty,Ukupno Qty
 apps/erpnext/erpnext/education/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py,Guardian2 Email ID,Guardian2 Email ID
+apps/erpnext/erpnext/hr/doctype/employee_transfer/employee_transfer.py,"Please delete the Employee <a href=""#Form/Employee/{0}"">{0}</a>\
+					to cancel this document","Izbrišite zaposlenika <a href=""#Form/Employee/{0}"">{0}</a> \ da biste otkazali ovaj dokument"
 DocType: Item,Show in Website (Variant),Pokaži u Web (Variant)
 DocType: Employee,Health Concerns,Zdravlje Zabrinutost
 DocType: Payroll Entry,Select Payroll Period,Odaberite perioda isplate
@@ -907,7 +909,6 @@
 DocType: Codification Table,Codification Table,Tabela kodifikacije
 DocType: Timesheet Detail,Hrs,Hrs
 apps/erpnext/erpnext/manufacturing/page/bom_comparison_tool/bom_comparison_tool.js,Changes in {0},Promjene u {0}
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js,Please select Company,Molimo odaberite Company
 DocType: Employee Skill,Employee Skill,Veština zaposlenih
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.js,Difference Account,Konto razlike
 DocType: Pricing Rule,Discount on Other Item,Popust na drugi artikl
@@ -975,6 +976,7 @@
 DocType: BOM,Operating Cost,Operativni troškovi
 DocType: Crop,Produced Items,Proizvedene stavke
 DocType: Bank Statement Transaction Entry,Match Transaction to Invoices,Transakcija na fakture
+apps/erpnext/erpnext/erpnext_integrations/exotel_integration.py,Error in Exotel incoming call,Pogreška u dolaznom pozivu Exotela
 DocType: Sales Order Item,Gross Profit,Bruto dobit
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js,Unblock Invoice,Unblock Faktura
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py,Increment cannot be 0,Prirast ne može biti 0
@@ -1188,6 +1190,7 @@
 DocType: Activity Cost,Activity Type,Tip aktivnosti
 DocType: Request for Quotation,For individual supplier,Za pojedinačne dobavljač
 DocType: BOM Operation,Base Hour Rate(Company Currency),Base Hour Rate (Company Valuta)
+,Qty To Be Billed,Količina za naplatu
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py,Delivered Amount,Isporučena Iznos
 apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.js,Reserved Qty for Production: Raw materials quantity to make manufacturing items.,Količina rezervirane za proizvodnju: Količina sirovina za izradu proizvodnih predmeta.
 DocType: Loyalty Point Entry Redemption,Redemption Date,Datum otkupljenja
@@ -1306,7 +1309,7 @@
 DocType: Sales Invoice,Commission Rate (%),Komisija stopa (%)
 apps/erpnext/erpnext/education/doctype/student_group/student_group.py,Please select Program,Molimo odaberite program
 DocType: Project,Estimated Cost,Procijenjeni troškovi
-DocType: Request for Quotation,Link to material requests,Link za materijal zahtjeva
+DocType: Supplier Quotation,Link to material requests,Link za materijal zahtjeva
 apps/erpnext/erpnext/public/js/hub/pages/Publish.vue,Publish,Objavite
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py,Aerospace,Zračno-kosmički prostor
 ,Fichier des Ecritures Comptables [FEC],Fichier des Ecritures Comptables [FEC]
@@ -1319,6 +1322,7 @@
 apps/erpnext/erpnext/utilities/transaction_base.py,Invalid Posting Time,Neispravno vreme slanja poruka
 DocType: Salary Component,Condition and Formula,Stanje i formula
 DocType: Lead,Campaign Name,Naziv kampanje
+apps/erpnext/erpnext/setup/default_energy_point_rules.py,On Task Completion,Po završetku zadatka
 apps/erpnext/erpnext/hr/doctype/compensatory_leave_request/compensatory_leave_request.py,There is no leave period in between {0} and {1},Nema perioda odlaska između {0} i {1}
 DocType: Fee Validity,Healthcare Practitioner,Zdravstveni lekar
 DocType: Hotel Room,Capacity,Kapacitet
@@ -1682,7 +1686,6 @@
 DocType: Quality Feedback Template,Quality Feedback Template,Predložak kvalitetne povratne informacije
 apps/erpnext/erpnext/config/education.py,LMS Activity,LMS aktivnost
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py,Internet Publishing,Internet izdavaštvo
-DocType: Prescription Duration,Number,Broj
 apps/erpnext/erpnext/accounts/doctype/opening_invoice_creation_tool/opening_invoice_creation_tool.js,Creating {0} Invoice,Kreiranje {0} fakture
 DocType: Medical Code,Medical Code Standard,Medical Code Standard
 DocType: Soil Texture,Clay Composition (%),Glina sastav (%)
@@ -1757,6 +1760,7 @@
 DocType: Support Settings,Get Started Sections,Započnite sekcije
 DocType: Lead,CRM-LEAD-.YYYY.-,CRM-LEAD-.YYYY.-
 DocType: Invoice Discounting,Sanctioned,sankcionisani
+,Base Amount,Osnovni iznos
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.js,Total Contribution Amount: {0},Ukupan iznos doprinosa: {0}
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py,Row #{0}: Please specify Serial No for Item {1},Row # {0}: Navedite rednim brojem predmeta za {1}
 DocType: Payroll Entry,Salary Slips Submitted,Iznosi plate poslati
@@ -1974,6 +1978,7 @@
 apps/erpnext/erpnext/utilities/user_progress.py,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.
 DocType: Accounting Dimension,Dimension Defaults,Zadane dimenzije
 apps/erpnext/erpnext/crm/report/prospects_engaged_but_not_converted/prospects_engaged_but_not_converted.js,Minimum Lead Age (Days),Minimalna Olovo Starost (Dana)
+apps/erpnext/erpnext/assets/report/fixed_asset_register/fixed_asset_register.py,Available For Use Date,Datum upotrebe
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py,All BOMs,Svi sastavnica
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js,Create Inter Company Journal Entry,Kreirajte unos časopisa Inter Company
 DocType: Company,Parent Company,Matična kompanija
@@ -2038,6 +2043,7 @@
 ,IRS 1099,IRS 1099
 DocType: Salary Slip,Leave Without Pay,Ostavite bez plaće
 DocType: Payment Request,Outward,Napolju
+apps/erpnext/erpnext/setup/default_energy_point_rules.py,On {0} Creation,Na {0} Stvaranje
 apps/erpnext/erpnext/regional/doctype/gstr_3b_report/gstr_3b_report.html,State/UT Tax,Porez na države i UT
 ,Trial Balance for Party,Suđenje Balance za stranke
 ,Gross and Net Profit Report,Izvještaj o bruto i neto dobiti
@@ -2153,6 +2159,7 @@
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js,Make Stock Entry,Unesite zalihe
 DocType: Hotel Room Reservation,Hotel Reservation User,Rezervacija korisnika hotela
 apps/erpnext/erpnext/projects/doctype/project/project.js,Set Status,Postavite status
+apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py,Please setup numbering series for Attendance via Setup &gt; Numbering Series,Molimo podesite seriju brojeva za Attendance putem Podešavanje&gt; Serija numeriranja
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py,Please select prefix first,Odaberite prefiks prvi
 DocType: Contract,Fulfilment Deadline,Rok ispunjenja
 apps/erpnext/erpnext/public/js/hub/pages/Home.vue,Near you,U vašoj blizini
@@ -2168,6 +2175,7 @@
 DocType: Announcement,All Students,Svi studenti
 apps/erpnext/erpnext/assets/doctype/asset/asset.py,Item {0} must be a non-stock item,Stavka {0} mora biti ne-stock stavka
 apps/erpnext/erpnext/stock/doctype/batch/batch.js,View Ledger,Pogledaj Ledger
+DocType: Cost Center,Lft,LFT
 DocType: Grading Scale,Intervals,intervali
 DocType: Bank Statement Transaction Entry,Reconciled Transactions,Usklađene transakcije
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py,Earliest,Najstarije
@@ -2283,6 +2291,7 @@
 apps/erpnext/erpnext/hr/doctype/employee_benefit_application/employee_benefit_application.py,As per your assigned Salary Structure you cannot apply for benefits,Prema vašoj dodeljenoj strukturi zarada ne možete se prijaviti za naknade
 apps/erpnext/erpnext/stock/doctype/item/item.py,Website Image should be a public file or website URL,Sajt slika treba da bude javni datoteke ili web stranice URL
 DocType: Purchase Invoice Item,BOM,BOM
+apps/erpnext/erpnext/stock/doctype/item/item.py,Duplicate entry in Manufacturers table,Duplikat unosa u tabeli proizvođača
 apps/erpnext/erpnext/setup/doctype/item_group/item_group.js,This is a root item group and cannot be edited.,To jekorijen stavka grupa i ne može se mijenjati .
 apps/erpnext/erpnext/accounts/doctype/account/account.js,Merge,Spoji se
 DocType: Journal Entry Account,Purchase Order,Narudžbenica
@@ -2427,7 +2436,6 @@
 DocType: Asset,Depreciation Schedules,Amortizacija rasporedi
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.js,Create Sales Invoice,Kreirajte račun za prodaju
 apps/erpnext/erpnext/regional/doctype/gstr_3b_report/gstr_3b_report.html,Ineligible ITC,Neprihvatljiv ITC
-apps/erpnext/erpnext/erpnext_integrations/doctype/shopify_settings/shopify_settings.py,"Support for public app is deprecated. Please setup private app, for more details refer user manual","Podrška za javnu aplikaciju je zastarjela. Molimo, podesite privatnu aplikaciju, za više detalja pogledajte korisničko uputstvo"
 DocType: Task,Dependent Tasks,Zavisni zadaci
 apps/erpnext/erpnext/regional/report/gstr_1/gstr_1.py,Following accounts might be selected in GST Settings:,Sledeći nalogi mogu biti izabrani u GST Podešavanja:
 apps/erpnext/erpnext/manufacturing/report/bom_stock_report/bom_stock_report.js,Quantity to Produce,Količina za proizvodnju
@@ -2680,6 +2688,7 @@
 DocType: Water Analysis,Container,Kontejner
 apps/erpnext/erpnext/regional/report/gstr_1/gstr_1.py,Please set valid GSTIN No. in Company Address,Molimo postavite važeći GSTIN broj na adresi kompanije
 apps/erpnext/erpnext/education/utils.py,Student {0} - {1} appears Multiple times in row {2} & {3},Student {0} - {1} pojavljuje više puta u nizu {2} i {3}
+apps/erpnext/erpnext/selling/doctype/customer/customer.py,Following fields are mandatory to create address:,Sledeća polja su obavezna za kreiranje adrese:
 DocType: Item Alternative,Two-way,Dvosmerno
 DocType: Item,Manufacturers,Proizvođači
 apps/erpnext/erpnext/accounts/deferred_revenue.py,Error while processing deferred accounting for {0},Pogreška prilikom obrade odgođenog računovodstva za {0}
@@ -2754,9 +2763,9 @@
 DocType: Employee,HR-EMP-,HR-EMP-
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py,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: Quality Meeting Minutes,Quality Meeting Minutes,Zapisnici sa kvalitetom sastanka
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Supplier &gt; Supplier Type,Dobavljač&gt; vrsta dobavljača
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py,Employee Referral,Upućivanje zaposlenih
 DocType: Student Group,Set 0 for no limit,Set 0 za no limit
+DocType: Cost Center,rgt,RGT
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py,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.
 DocType: Customer,Primary Address and Contact Detail,Primarna adresa i kontakt detalji
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.js,Resend Payment Email,Ponovo pošaljite mail plaćanja
@@ -2866,7 +2875,6 @@
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py,Against Supplier Invoice {0} dated {1},Protiv Dobavljač fakture {0} od {1}
 DocType: Customer,Default Price List,Zadani cjenik
 apps/erpnext/erpnext/assets/doctype/asset/asset.py,Asset Movement record {0} created,rekord Asset pokret {0} stvorio
-apps/erpnext/erpnext/utilities/page/leaderboard/leaderboard.js,No items found.,Ništa nije pronađeno.
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py,You cannot delete Fiscal Year {0}. Fiscal Year {0} is set as default in Global Settings,Ne možete izbrisati fiskalnu godinu {0}. Fiskalna godina {0} je postavljen kao zadani u Globalne postavke
 DocType: Share Transfer,Equity/Liability Account,Račun kapitala / obaveza
 apps/erpnext/erpnext/setup/doctype/customer_group/customer_group.py,A customer with the same name already exists,Kupac sa istim imenom već postoji
@@ -2882,6 +2890,7 @@
 apps/erpnext/erpnext/selling/doctype/customer/customer.py,Credit limit has been crossed for customer {0} ({1}/{2}),Kreditni limit je prešao za kupca {0} ({1} / {2})
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py,Customer required for 'Customerwise Discount',Kupac je potrebno za ' Customerwise Popust '
 apps/erpnext/erpnext/config/accounting.py,Update bank payment dates with journals.,Update banka datum plaćanja s časopisima.
+,Billed Qty,Količina računa
 apps/erpnext/erpnext/stock/doctype/item/item_dashboard.py,Pricing,cijene
 DocType: Employee,Attendance Device ID (Biometric/RF tag ID),ID uređaja prisutnosti (ID biometrijske / RF oznake)
 DocType: Quotation,Term Details,Oročeni Detalji
@@ -2903,6 +2912,7 @@
 DocType: Share Transfer,Asset Account,Račun imovine
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js,New release date should be in the future,Novi datum izlaska trebao bi biti u budućnosti
 DocType: Purchase Invoice,End date of current invoice's period,Kraj datum tekućeg razdoblja dostavnice
+apps/erpnext/erpnext/hr/doctype/employee/employee.py,Please setup Employee Naming System in Human Resource &gt; HR Settings,Postavite sistem imenovanja zaposlenika u ljudskim resursima&gt; HR postavke
 DocType: Lab Test,Technician Name,Ime tehničara
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py,"Cannot ensure delivery by Serial No as \
 					Item {0} is added with and without Ensure Delivery by \
@@ -2910,6 +2920,7 @@
 DocType: Accounts Settings,Unlink Payment on Cancellation of Invoice,Odvajanje Plaćanje o otkazivanju fakture
 DocType: Bank Reconciliation,From Date,Od datuma
 apps/erpnext/erpnext/hr/doctype/vehicle_log/vehicle_log.py,Current Odometer reading entered should be greater than initial Vehicle Odometer {0},Trenutno čitanje Odometar ušli bi trebao biti veći od početnog kilometraže vozila {0}
+,Purchase Order Items To Be Received or Billed,Kupovinske stavke koje treba primiti ili naplatiti
 DocType: Restaurant Reservation,No Show,Ne Show
 apps/erpnext/erpnext/regional/india/utils.py,You must be a registered supplier to generate e-Way Bill,Morate biti registrirani dobavljač za generiranje e-puta računa
 DocType: Shipping Rule Country,Shipping Rule Country,Dostava Pravilo Country
@@ -2952,6 +2963,7 @@
 apps/erpnext/erpnext/templates/generators/item/item_add_to_cart.html,View in Cart,Pogledaj u košaricu
 DocType: Employee Checkin,Shift Actual Start,Stvarni početak promjene
 DocType: Tally Migration,Is Day Book Data Imported,Uvoze li se podaci dnevnih knjiga
+,Purchase Order Items To Be Received or Billed1,Kupnja predmeta koji treba primiti ili naplatiti1
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py,Marketing Expenses,Troškovi marketinga
 apps/erpnext/erpnext/stock/doctype/pick_list/pick_list.py,{0} units of {1} is not available.,{0} jedinice od {1} nisu dostupne.
 ,Item Shortage Report,Nedostatak izvješća za artikal
@@ -3175,7 +3187,6 @@
 apps/erpnext/erpnext/public/js/call_popup/call_popup.js,View all issues from {0},Pogledajte sva izdanja od {0}
 DocType: Quality Inspection,MAT-QA-.YYYY.-,MAT-QA-YYYY.-
 DocType: Quality Meeting Table,Quality Meeting Table,Stol za sastanke o kvalitetu
-apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,Molimo postavite Naming Series za {0} putem Podešavanje&gt; Podešavanja&gt; Imenovanje serije
 apps/erpnext/erpnext/templates/pages/help.html,Visit the forums,Posjetite forum
 DocType: Student,Student Mobile Number,Student Broj mobilnog
 DocType: Item,Has Variants,Ima Varijante
@@ -3318,6 +3329,7 @@
 DocType: Homepage Section,Section Cards,Karte odsjeka
 ,Campaign Efficiency,kampanja efikasnost
 DocType: Discussion,Discussion,rasprava
+apps/erpnext/erpnext/setup/default_energy_point_rules.py,On Sales Order Submission,O podnošenju prodajnih naloga
 DocType: Bank Transaction,Transaction ID,transakcija ID
 DocType: Payroll Entry,Deduct Tax For Unsubmitted Tax Exemption Proof,Odbitak poreza za neosnovan dokaz o oslobađanju od poreza
 DocType: Volunteer,Anytime,Uvek
@@ -3325,7 +3337,6 @@
 DocType: Employee Tax Exemption Proof Submission,Employee Tax Exemption Proof Submission,Podnošenje dokaza o izuzeću poreza na radnike
 DocType: Patient,Surgical History,Hirurška istorija
 DocType: Bank Statement Settings Item,Mapped Header,Mapped Header
-apps/erpnext/erpnext/hr/doctype/employee/employee.py,Please setup Employee Naming System in Human Resource &gt; HR Settings,Postavite sistem imenovanja zaposlenika u ljudskim resursima&gt; HR postavke
 DocType: Employee,Resignation Letter Date,Ostavka Pismo Datum
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Pricing Rules are further filtered based on quantity.,Pravilnik o određivanju cijena dodatno se filtrira na temelju količine.
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py,Please set the Date Of Joining for employee {0},Molimo vas da postavite datum ulaska za zaposlenog {0}
@@ -3339,6 +3350,7 @@
 DocType: Bank Statement Settings,Mapped Items,Mapped Items
 DocType: Amazon MWS Settings,IT,IT
 DocType: Chapter,Chapter,Poglavlje
+,Fixed Asset Register,Registar fiksne imovine
 apps/erpnext/erpnext/utilities/user_progress.py,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,Select BOM and Qty for Production,Odaberite BOM i količina za proizvodnju
@@ -3474,7 +3486,6 @@
 apps/erpnext/erpnext/templates/emails/reorder_item.html,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
 apps/erpnext/erpnext/controllers/accounts_controller.py,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/hr/doctype/salary_structure_assignment/salary_structure_assignment.py,From Date {0} cannot be after employee's relieving Date {1},Od datuma {0} ne može biti poslije otpuštanja zaposlenog Datum {1}
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py,Debit Note {0} has been created automatically,Napomena o zaduženju {0} kreirana je automatski
 apps/erpnext/erpnext/accounts/doctype/payment_order/payment_order.js,Create Payment Entries,Kreirajte uplate za plaćanje
 DocType: Supplier,Is Internal Supplier,Je interni snabdevač
 DocType: Employee,Create User Permission,Kreirajte dozvolu korisnika
@@ -4032,7 +4043,6 @@
 DocType: Project User,Project Status,Status projekta
 DocType: UOM,Check this to disallow fractions. (for Nos),Provjerite to da ne dopušta frakcija. (Za br)
 DocType: Student Admission Program,Naming Series (for Student Applicant),Imenovanje serija (za studentske Podnositelj zahtjeva)
-apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.py,UOM Conversion factor ({0} -&gt; {1}) not found for item: {2},Faktor konverzije UOM ({0} -&gt; {1}) nije pronađen za stavku: {2}
 apps/erpnext/erpnext/hr/doctype/retention_bonus/retention_bonus.py,Bonus Payment Date cannot be a past date,Datum plaćanja bonusa ne može biti prošnji datum
 DocType: Travel Request,Copy of Invitation/Announcement,Kopija poziva / obaveštenja
 DocType: Practitioner Service Unit Schedule,Practitioner Service Unit Schedule,Raspored jedinica službe lekara
@@ -4200,6 +4210,7 @@
 apps/erpnext/erpnext/utilities/user_progress.py,Setup Company,Setup Company
 ,Lab Test Report,Izvještaj o laboratorijskom testu
 DocType: Employee Benefit Application,Employee Benefit Application,Aplikacija za zaposlene
+apps/erpnext/erpnext/accounts/doctype/invoice_discounting/invoice_discounting.py,Row({0}): {1} is already discounted in {2},Red ({0}): {1} već je diskontiran u {2}
 apps/erpnext/erpnext/hr/doctype/additional_salary/additional_salary.py,Additional Salary Component Exists.,Postoje dodatne komponente plaće.
 DocType: Purchase Invoice,Unregistered,Neregistrovano
 DocType: Student Applicant,Application Date,patenta
@@ -4278,7 +4289,6 @@
 DocType: Journal Entry,Accounting Entries,Računovodstvo unosi
 DocType: Job Card Time Log,Job Card Time Log,Vremenski dnevnik radne kartice
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,"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;."
-apps/erpnext/erpnext/education/doctype/instructor/instructor.py,Please setup Instructor Naming System in Education &gt; Education Settings,Postavite sistem imenovanja instruktora u Obrazovanje&gt; Postavke obrazovanja
 DocType: Journal Entry,Paid Loan,Paid Loan
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py,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
@@ -4295,7 +4305,6 @@
 apps/erpnext/erpnext/templates/pages/projects.html,No time sheets,Nema vremena listova
 DocType: GoCardless Mandate,GoCardless Customer,GoCardless kupac
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py,Leave Type {0} cannot be carry-forwarded,Ostavite Tip {0} se ne može nositi-proslijeđen
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Item Code &gt; Item Group &gt; Brand,Kod artikla&gt; Grupa artikala&gt; Marka
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py,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
 DocType: Leave Encashment,Payroll,platni spisak
@@ -4410,7 +4419,6 @@
 DocType: Stock Ledger Entry,Actual Qty After Transaction,Stvarna količina nakon transakcije
 ,Pending SO Items For Purchase Request,Otvorena SO Proizvodi za zahtjev za kupnju
 apps/erpnext/erpnext/education/doctype/student_admission/student_admission.py,Student Admissions,student Prijemni
-apps/erpnext/erpnext/accounts/party.py,{0} {1} is disabled,{0} {1} je onemogućena
 DocType: Supplier,Billing Currency,Valuta plaćanja
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py,Extra Large,Ekstra veliki
 DocType: Loan,Loan Application,Aplikacija za kredit
@@ -4487,7 +4495,6 @@
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py,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/accounts/doctype/accounting_dimension/accounting_dimension.py,Creating Dimensions...,Stvaranje dimenzija ...
 apps/erpnext/erpnext/education/doctype/student_group_creation_tool/student_group_creation_tool.py,Student Group Name is mandatory in row {0},Student Ime grupe je obavezno u redu {0}
-DocType: Customer Credit Limit,Bypass credit limit_check,Zaobići limit_check kredita
 DocType: Homepage,Products to be shown on website homepage,Proizvodi koji će biti prikazan na sajtu homepage
 DocType: HR Settings,Password Policy,Politika lozinke
 apps/erpnext/erpnext/setup/doctype/customer_group/customer_group.js,This is a root customer group and cannot be edited.,To jekorijen skupini kupaca i ne može se mijenjati .
@@ -4791,6 +4798,7 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py,Row {0}: Advance against Customer must be credit,Red {0}: Advance protiv Klijent mora biti kredit
 DocType: Quality Meeting,Quality Meeting,Sastanak kvaliteta
 apps/erpnext/erpnext/accounts/doctype/account/account.js,Non-Group to Group,Non-grupe do grupe
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,Molimo postavite Naming Series za {0} putem Podešavanje&gt; Podešavanja&gt; Imenovanje serije
 DocType: Employee,ERPNext User,ERPNext User
 apps/erpnext/erpnext/education/doctype/student_group_creation_tool/student_group_creation_tool.py,Batch is mandatory in row {0},Serija je obavezno u nizu {0}
 DocType: Company,Default Buying Terms,Uvjeti kupnje
@@ -5085,6 +5093,7 @@
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py,No {0} found for Inter Company Transactions.,Nije pronađeno {0} za Inter Company Transactions.
 DocType: Travel Itinerary,Rented Car,Iznajmljen automobil
 apps/erpnext/erpnext/public/js/hub/components/profile_dialog.js,About your Company,O vašoj Kompaniji
+apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.js,Show Stock Ageing Data,Prikaži podatke o starenju zaliha
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py,Credit To account must be a Balance Sheet account,Kredit na račun mora biti bilans stanja računa
 DocType: Donor,Donor,Donor
 DocType: Global Defaults,Disable In Words,Onemogućena u Words
@@ -5099,8 +5108,10 @@
 DocType: Practitioner Schedule,Schedule Name,Ime rasporeda
 apps/erpnext/erpnext/regional/doctype/gstr_3b_report/gstr_3b_report.py,Please enter GSTIN and state for the Company Address {0},Unesite GSTIN i upišite adresu kompanije {0}
 DocType: Currency Exchange,For Buying,Za kupovinu
+apps/erpnext/erpnext/setup/default_energy_point_rules.py,On Purchase Order Submission,Prilikom narudžbe
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js,Add All Suppliers,Dodajte sve dobavljače
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py,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/accounts/doctype/pricing_rule/pricing_rule.js,Customer &gt; Customer Group &gt; Territory,Kupac&gt; grupa kupaca&gt; teritorija
 DocType: Tally Migration,Parties,Stranke
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js,Browse BOM,Browse BOM
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py,Secured Loans,osigurani krediti
@@ -5132,6 +5143,7 @@
 apps/erpnext/erpnext/stock/doctype/item_alternative/item_alternative.py,Not allow to set alternative item for the item {0},Ne dozvolite postavljanje alternativne stavke za stavku {0}
 apps/erpnext/erpnext/hr/doctype/leave_block_list/leave_block_list.py,Date is repeated,Datum se ponavlja
 apps/erpnext/erpnext/accounts/print_format/payment_receipt_voucher/payment_receipt_voucher.html,Authorized Signatory,Ovlašteni potpisnik
+apps/erpnext/erpnext/education/doctype/instructor/instructor.py,Please setup Instructor Naming System in Education &gt; Education Settings,Postavite sistem imenovanja instruktora u Obrazovanje&gt; Postavke obrazovanja
 apps/erpnext/erpnext/regional/doctype/gstr_3b_report/gstr_3b_report.html,Net ITC Available(A) - (B),Neto dostupan ITC (A) - (B)
 apps/erpnext/erpnext/education/doctype/fee_schedule/fee_schedule.js,Create Fees,Kreiraj naknade
 DocType: Project,Total Purchase Cost (via Purchase Invoice),Ukupno TROŠKA (preko fakturi)
@@ -5152,6 +5164,7 @@
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.js,Message Sent,Poruka je poslana
 apps/erpnext/erpnext/accounts/doctype/account/account.py,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/assets/report/fixed_asset_register/fixed_asset_register.py,Vendor Name,Ime dobavljača
 DocType: Quiz Result,Wrong,Pogrešno
 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)
@@ -5395,6 +5408,7 @@
 DocType: Stock Settings,Auto Material Request,Auto Materijal Zahtjev
 DocType: Woocommerce Settings,API consumer secret,API potrošačke tajne
 DocType: Delivery Note Item,Available Batch Qty at From Warehouse,Dostupno Batch Količina na Od Skladište
+,Received Qty Amount,Količina primljene količine
 DocType: Salary Slip,Gross Pay - Total Deduction - Loan Repayment,Bruto Pay - Ukupno odbitak - Otplata kredita
 DocType: Bank Account,Last Integration Date,Datum posljednje integracije
 DocType: Expense Claim,Expense Taxes and Charges,Porezi i takse za trošenje
@@ -5853,6 +5867,8 @@
 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,Please select Qty against item {0},Molimo izaberite Qty protiv stavke {0}
+apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py,Latest Age,Najnovije doba
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js,Transfer Material to Supplier,Transfera Materijal dobavljaču
 apps/erpnext/erpnext/hr/report/loan_repayment/loan_repayment.py,EMI,EMI
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py,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
@@ -5876,7 +5892,6 @@
 apps/erpnext/erpnext/hr/doctype/employee_benefit_application/employee_benefit_application.py,"An amount of {0} already claimed for the component {1},\
 						 set the amount equal or greater than {2}","Količina {0} koja je već zahtevana za komponentu {1}, \ postavite količinu jednaka ili veća od {2}"
 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
 DocType: BOM Update Tool,The new BOM after replacement,Novi BOM nakon zamjene
 ,Point of Sale,Point of Sale
@@ -5996,7 +6011,6 @@
 DocType: Purchase Order Item,Blanket Order Rate,Stopa porudžbine odeće
 ,Customer Ledger Summary,Sažetak knjige klijenta
 apps/erpnext/erpnext/hooks.py,Certification,Certifikat
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js,Are you sure you want to make debit note?,Jeste li sigurni da želite napraviti teret?
 DocType: Bank Guarantee,Clauses and Conditions,Klauzule i uslovi
 DocType: Serial No,Creation Document Type,Tip stvaranje dokumenata
 DocType: Amazon MWS Settings,ES,ES
@@ -6034,8 +6048,6 @@
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py,Financial Services,financijske usluge
 DocType: Student Sibling,Student ID,student ID
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.js,For Quantity must be greater than zero,Za količinu mora biti veća od nule
-apps/erpnext/erpnext/hr/doctype/employee_transfer/employee_transfer.py,"Please delete the Employee <a href=""#Form/Employee/{0}"">{0}</a>\
-					to cancel this document","Izbrišite zaposlenika <a href=""#Form/Employee/{0}"">{0}</a> \ da biste otkazali ovaj dokument"
 apps/erpnext/erpnext/config/projects.py,Types of activities for Time Logs,Vrste aktivnosti za vrijeme Trupci
 DocType: Opening Invoice Creation Tool,Sales,Prodaja
 DocType: Stock Entry Detail,Basic Amount,Osnovni iznos
@@ -6114,6 +6126,7 @@
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py,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,Send Supplier Emails,Pošalji dobavljač Email
+DocType: Asset Movement,ACC-ASM-.YYYY.-,ACC-ASM-.YYYY.-
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py,"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
 apps/erpnext/erpnext/hr/doctype/employee_onboarding/employee_onboarding.py,Submit this to create the Employee record,Pošaljite ovo da biste napravili zapis Zaposlenog
@@ -6191,7 +6204,6 @@
 DocType: Sales Team,Contact No.,Kontakt broj
 apps/erpnext/erpnext/templates/includes/cart/cart_address.html,Billing Address is same as Shipping Address,Adresa za naplatu jednaka je adresi za dostavu
 DocType: Bank Reconciliation,Payment Entries,plaćanje unosi
-apps/erpnext/erpnext/erpnext_integrations/doctype/shopify_settings/shopify_settings.py,Access token or Shopify URL missing,Nije dostupan token ili Shopify URL
 DocType: Location,Latitude,Latitude
 DocType: Work Order,Scrap Warehouse,Scrap Skladište
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py,"Warehouse required at Row No {0}, please set default warehouse for the item {1} for the company {2}","Skladište je potrebno na redosledu {0}, molimo postavite podrazumevano skladište za predmet {1} za kompaniju {2}"
@@ -6234,7 +6246,6 @@
 DocType: Job Offer Term,Value / Description,Vrijednost / Opis
 apps/erpnext/erpnext/controllers/accounts_controller.py,"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
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js,Are you sure you want to make credit note?,Jeste li sigurni da želite da napravite kreditnu belešku?
 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,Debit and Credit not equal for {0} #{1}. Difference is {2}.,Debitne i kreditne nije jednaka za {0} {1} #. Razlika je u tome {2}.
@@ -6359,6 +6370,7 @@
 DocType: Purchase Invoice,Taxes and Charges Added,Porezi i naknade Dodano
 apps/erpnext/erpnext/assets/doctype/asset/asset.py,Depreciation Row {0}: Next Depreciation Date cannot be before Available-for-use Date,Redosled amortizacije {0}: Sledeći datum amortizacije ne može biti pre datuma raspoloživog za upotrebu
 ,Sales Funnel,Tok prodaje (Funnel)
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Item Code &gt; Item Group &gt; Brand,Kod artikla&gt; Grupa artikala&gt; Marka
 apps/erpnext/erpnext/setup/doctype/company/company.py,Abbreviation is mandatory,Skraćenica je obavezno
 DocType: Project,Task Progress,zadatak Napredak
 apps/erpnext/erpnext/templates/includes/navbar/navbar_items.html,Cart,Kolica
@@ -6603,6 +6615,7 @@
 DocType: Employee Grade,Employee Grade,Razred zaposlenih
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py,Piecework,rad plaćen na akord
 DocType: GSTR 3B Report,June,Juna
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Supplier &gt; Supplier Type,Dobavljač&gt; vrsta dobavljača
 DocType: Share Balance,From No,Od br
 DocType: Shift Type,Early Exit Grace Period,Period prijevremenog izlaska
 DocType: Task,Actual Time (in Hours),Stvarno vrijeme (u satima)
@@ -6887,6 +6900,7 @@
 DocType: Warehouse,Warehouse Name,Naziv skladišta
 DocType: Naming Series,Select Transaction,Odaberite transakciju
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py,Please enter Approving Role or Approving User,Unesite Odobravanje ulogu ili Odobravanje korisnike
+apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.py,UOM Conversion factor ({0} -&gt; {1}) not found for item: {2},Faktor konverzije UOM ({0} -&gt; {1}) nije pronađen za stavku: {2}
 apps/erpnext/erpnext/support/doctype/service_level_agreement/service_level_agreement.py,Service Level Agreement with Entity Type {0} and Entity {1} already exists.,Ugovor o nivou usluge sa tipom entiteta {0} i entitetom {1} već postoji.
 DocType: Journal Entry,Write Off Entry,Napišite Off Entry
 DocType: BOM,Rate Of Materials Based On,Stopa materijali na temelju
@@ -7077,6 +7091,7 @@
 DocType: Quality Inspection Reading,Quality Inspection Reading,Kvaliteta Inspekcija čitanje
 apps/erpnext/erpnext/stock/doctype/stock_settings/stock_settings.py,`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/stock/report/stock_balance/stock_balance.py,Earliest Age,Najranije doba
 apps/erpnext/erpnext/utilities/user_progress.py,Set a sales goal you'd like to achieve for your company.,Postavite cilj prodaje koji želite ostvariti za svoju kompaniju.
 DocType: Quality Goal,Revision,Revizija
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js,Healthcare Services,Zdravstvene usluge
@@ -7120,6 +7135,7 @@
 apps/erpnext/erpnext/healthcare/doctype/patient_encounter/patient_encounter.js,Schedule Discharge,Raspoređivanje rasporeda
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py,Cheques and Deposits incorrectly cleared,Čekovi i depoziti pogrešno spašava
 DocType: Homepage Section Card,Homepage Section Card,Kartica odsjeka za početnu stranicu
+,Amount To Be Billed,Iznos koji treba naplatiti
 apps/erpnext/erpnext/accounts/doctype/account/account.py,Account {0}: You can not assign itself as parent account,Konto {0}: Ne može se označiti kao nadređeni konto samom sebi
 DocType: Purchase Invoice Item,Price List Rate,Cjenik Stopa
 apps/erpnext/erpnext/utilities/activation.py,Create customer quotes,Napravi citati kupac
@@ -7172,6 +7188,7 @@
 DocType: Supplier Scorecard Criteria,Supplier Scorecard Criteria,Kriterijumi za ocenjivanje dobavljača
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py,Please select Start Date and End Date for Item {0},Molimo odaberite datum početka i datum završetka za točke {0}
 DocType: Maintenance Schedule,MAT-MSH-.YYYY.-,MAT-MSH-YYYY.-
+,Amount to Receive,Iznos za primanje
 apps/erpnext/erpnext/education/doctype/student_group_creation_tool/student_group_creation_tool.py,Course is mandatory in row {0},Kurs je obavezno u redu {0}
 apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py,From date can not be greater than than To date,Od datuma ne može biti veći od Do danas
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py,To date cannot be before from date,Do danas ne može biti prije od datuma
@@ -7420,7 +7437,6 @@
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js,BOM and Manufacturing Quantity are required,BOM i proizvodnja Količina su potrebne
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js,Ageing Range 2,Starenje Range 2
 DocType: SG Creation Tool Course,Max Strength,Max Snaga
-apps/erpnext/erpnext/accounts/doctype/account/account.py,"Account {0} already exists in child company {1}. The following fields have different values, they should be same:<ul><li>{2}</li></ul>","Račun {0} već postoji u dečijem preduzeću {1}. Sljedeća polja imaju različite vrijednosti, trebala bi biti ista: <ul><li> {2} </li></ul>"
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py,Installing presets,Instaliranje podešavanja
 DocType: Fee Schedule,EDU-FSH-.YYYY.-,EDU-FSH-YYYY.-
 apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js,No Delivery Note selected for Customer {},Nije odabrana beleška za isporuku za kupca {}
@@ -7628,6 +7644,7 @@
 DocType: Delivery Note,Print Without Amount,Ispis Bez visini
 apps/erpnext/erpnext/accounts/report/asset_depreciation_ledger/asset_depreciation_ledger.py,Depreciation Date,Amortizacija Datum
 ,Work Orders in Progress,Radni nalogi u toku
+DocType: Customer Credit Limit,Bypass Credit Limit Check,Zaobiđite provjeru kreditnog limita
 DocType: Issue,Support Team,Tim za podršku
 apps/erpnext/erpnext/stock/report/batch_item_expiry_status/batch_item_expiry_status.py,Expiry (In Days),Isteka (u danima)
 DocType: Appraisal,Total Score (Out of 5),Ukupna ocjena (od 5)
@@ -7811,6 +7828,7 @@
 DocType: Sales Invoice,Customer GSTIN,Customer GSTIN
 DocType: Crop Cycle,List of diseases detected on the field. When selected it'll automatically add a list of tasks to deal with the disease ,"Spisak otkrivenih bolesti na terenu. Kada je izabran, automatski će dodati listu zadataka koji će se baviti bolesti"
 apps/erpnext/erpnext/manufacturing/page/bom_comparison_tool/bom_comparison_tool.js,BOM 1,BOM 1
+apps/erpnext/erpnext/assets/report/fixed_asset_register/fixed_asset_register.py,Asset Id,Id sredstva
 apps/erpnext/erpnext/healthcare/doctype/healthcare_service_unit/healthcare_service_unit.js,This is a root healthcare service unit and cannot be edited.,Ovo je koren zdravstvenog servisa i ne može se uređivati.
 DocType: Asset Repair,Repair Status,Status popravke
 apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.js,"Requested Qty: Quantity requested for purchase, but not ordered.","Tražena količina : Količina zatražio za kupnju , ali ne i naređeno ."
diff --git a/erpnext/translations/ca.csv b/erpnext/translations/ca.csv
index 6b1cdd2..e2e8ae2 100644
--- a/erpnext/translations/ca.csv
+++ b/erpnext/translations/ca.csv
@@ -289,7 +289,6 @@
 DocType: Loan,Repay Over Number of Periods,Retornar al llarg Nombre de períodes
 apps/erpnext/erpnext/manufacturing/report/bom_stock_report/bom_stock_report.py,Quantity to Produce can not be less than Zero,La quantitat per produir no pot ser inferior a zero
 DocType: Stock Entry,Additional Costs,Despeses addicionals
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Customer &gt; Customer Group &gt; Territory,Client&gt; Grup de clients&gt; Territori
 apps/erpnext/erpnext/accounts/doctype/account/account.py,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
@@ -586,6 +585,7 @@
 DocType: Healthcare Settings,Create documents for sample collection,Crea documents per a la recollida de mostres
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py,Payment against {0} {1} cannot be greater than Outstanding Amount {2},Pagament contra {0} {1} no pot ser més gran que Destacat Suma {2}
 apps/erpnext/erpnext/patches/v11_0/add_healthcare_service_unit_tree_root.py,All Healthcare Service Units,Totes les unitats de serveis sanitaris
+apps/erpnext/erpnext/setup/default_energy_point_rules.py,On Converting Opportunity,En convertir l&#39;oportunitat
 DocType: Bank Account,Address HTML,Adreça HTML
 DocType: Lead,Mobile No.,No mòbil
 apps/erpnext/erpnext/selling/doctype/pos_closing_voucher/closing_voucher_details.html,Mode of Payments,Mode de pagament
@@ -650,7 +650,6 @@
 DocType: Accounting Dimension,Dimension Name,Nom de la dimensió
 apps/erpnext/erpnext/healthcare/setup.py,Resistant,Resistent
 apps/erpnext/erpnext/hotels/doctype/hotel_room_reservation/hotel_room_reservation.py,Please set Hotel Room Rate on {},Estableix la tarifa de l&#39;habitació de l&#39;hotel a {}
-apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py,Please setup numbering series for Attendance via Setup &gt; Numbering Series,Configureu les sèries de numeració per assistència mitjançant Configuració&gt; Sèries de numeració
 DocType: Journal Entry,Multi Currency,Multi moneda
 DocType: Bank Statement Transaction Invoice Item,Invoice Type,Tipus de Factura
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py,Valid from date must be less than valid upto date,La data vàlida ha de ser inferior a la data vàlida fins a la data
@@ -765,6 +764,7 @@
 apps/erpnext/erpnext/accounts/page/pos/pos.js,Create a new Customer,Crear un nou client
 apps/erpnext/erpnext/non_profit/report/expiring_memberships/expiring_memberships.py,Expiring On,S&#39;està caducant
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,"If multiple Pricing Rules continue to prevail, users are asked to set Priority manually to resolve conflict.","Si hi ha diverses regles de preus vàlides, es demanarà als usuaris que estableixin la prioritat manualment per resoldre el conflicte."
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js,Purchase Return,Devolució de Compra
 apps/erpnext/erpnext/utilities/activation.py,Create Purchase Orders,Crear ordres de compra
 ,Purchase Register,Compra de Registre
 apps/erpnext/erpnext/healthcare/doctype/patient/patient.py,Patient not found,Pacient no trobat
@@ -780,7 +780,6 @@
 DocType: Location,Area UOM,Àrea UOM
 apps/erpnext/erpnext/manufacturing/doctype/workstation/workstation.py,Workstation is closed on the following dates as per Holiday List: {0},Estació de treball està tancada en les següents dates segons Llista de vacances: {0}
 apps/erpnext/erpnext/selling/page/sales_funnel/sales_funnel.py,Opportunities,Oportunitats
-apps/erpnext/erpnext/www/all-products/index.html,Clear filters,Esborra filtres
 DocType: Lab Test Template,Single,Solter
 DocType: Compensatory Leave Request,Work From Date,Treball des de la data
 DocType: Salary Slip,Total Loan Repayment,El reemborsament total del préstec
@@ -823,6 +822,7 @@
 DocType: Account,Old Parent,Antic Pare
 apps/erpnext/erpnext/education/doctype/program_enrollment_tool/program_enrollment_tool.py,Mandatory field - Academic Year,Camp obligatori - Any Acadèmic
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py,{0} {1} is not associated with {2} {3},{0} {1} no està associat amb {2} {3}
+DocType: Opportunity,Converted By,Convertit per
 apps/erpnext/erpnext/public/js/hub/components/ReviewArea.vue,You need to login as a Marketplace User before you can add any reviews.,"Per poder afegir ressenyes, heu d’iniciar la sessió com a usuari del Marketplace."
 apps/erpnext/erpnext/manufacturing/doctype/job_card/job_card.py,Row {0} : Operation is required against the raw material item {1},Fila {0}: es requereix operació contra l&#39;element de la matèria primera {1}
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py,Please set default payable account for the company {0},Configureu compte per pagar per defecte per a l&#39;empresa {0}
@@ -848,6 +848,8 @@
 DocType: BOM,Work Order,Ordre de treball
 DocType: Sales Invoice,Total Qty,Quantitat total
 apps/erpnext/erpnext/education/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py,Guardian2 Email ID,Guardian2 ID de correu electrònic
+apps/erpnext/erpnext/hr/doctype/employee_transfer/employee_transfer.py,"Please delete the Employee <a href=""#Form/Employee/{0}"">{0}</a>\
+					to cancel this document","Si us plau, suprimiu l&#39;empleat <a href=""#Form/Employee/{0}"">{0}</a> \ per cancel·lar aquest document"
 DocType: Item,Show in Website (Variant),Mostra en el lloc web (variant)
 DocType: Employee,Health Concerns,Problemes de Salut
 DocType: Payroll Entry,Select Payroll Period,Seleccioneu el període de nòmina
@@ -907,7 +909,6 @@
 DocType: Codification Table,Codification Table,Taula de codificació
 DocType: Timesheet Detail,Hrs,hrs
 apps/erpnext/erpnext/manufacturing/page/bom_comparison_tool/bom_comparison_tool.js,Changes in {0},Canvis en {0}
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js,Please select Company,Seleccioneu de l&#39;empresa
 DocType: Employee Skill,Employee Skill,Habilitat dels empleats
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.js,Difference Account,Compte de diferències
 DocType: Pricing Rule,Discount on Other Item,Descompte en un altre article
@@ -975,6 +976,7 @@
 DocType: BOM,Operating Cost,Cost de funcionament
 DocType: Crop,Produced Items,Articles produïts
 DocType: Bank Statement Transaction Entry,Match Transaction to Invoices,Transacció de coincidència amb les factures
+apps/erpnext/erpnext/erpnext_integrations/exotel_integration.py,Error in Exotel incoming call,S&#39;ha produït un error en la trucada entrant a Exotel
 DocType: Sales Order Item,Gross Profit,Benefici Brut
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js,Unblock Invoice,Desbloqueja la factura
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py,Increment cannot be 0,Increment no pot ser 0
@@ -1188,6 +1190,7 @@
 DocType: Activity Cost,Activity Type,Tipus d'activitat
 DocType: Request for Quotation,For individual supplier,Per proveïdor individual
 DocType: BOM Operation,Base Hour Rate(Company Currency),La tarifa bàsica d&#39;Hora (Companyia de divises)
+,Qty To Be Billed,Quantitat per ser facturat
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py,Delivered Amount,Quantitat lliurada
 apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.js,Reserved Qty for Production: Raw materials quantity to make manufacturing items.,Quantitat reservada per a la producció: quantitat de matèries primeres per fabricar articles de fabricació.
 DocType: Loyalty Point Entry Redemption,Redemption Date,Data de reemborsament
@@ -1306,7 +1309,7 @@
 DocType: Sales Invoice,Commission Rate (%),Comissió (%)
 apps/erpnext/erpnext/education/doctype/student_group/student_group.py,Please select Program,Seleccioneu Programa
 DocType: Project,Estimated Cost,cost estimat
-DocType: Request for Quotation,Link to material requests,Enllaç a les sol·licituds de materials
+DocType: Supplier Quotation,Link to material requests,Enllaç a les sol·licituds de materials
 apps/erpnext/erpnext/public/js/hub/pages/Publish.vue,Publish,Publica
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py,Aerospace,Aeroespacial
 ,Fichier des Ecritures Comptables [FEC],Fichier des Ecritures comptables [FEC]
@@ -1319,6 +1322,7 @@
 apps/erpnext/erpnext/utilities/transaction_base.py,Invalid Posting Time,Hora de publicació no vàlida
 DocType: Salary Component,Condition and Formula,Condició i fórmula
 DocType: Lead,Campaign Name,Nom de la campanya
+apps/erpnext/erpnext/setup/default_energy_point_rules.py,On Task Completion,Completat la tasca
 apps/erpnext/erpnext/hr/doctype/compensatory_leave_request/compensatory_leave_request.py,There is no leave period in between {0} and {1},No hi ha cap període de descans entre {0} i {1}
 DocType: Fee Validity,Healthcare Practitioner,Practicant sanitari
 DocType: Hotel Room,Capacity,Capacitat
@@ -1682,7 +1686,6 @@
 DocType: Quality Feedback Template,Quality Feedback Template,Plantilla de comentaris de qualitat
 apps/erpnext/erpnext/config/education.py,LMS Activity,Activitat LMS
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py,Internet Publishing,Publicant a Internet
-DocType: Prescription Duration,Number,Número
 apps/erpnext/erpnext/accounts/doctype/opening_invoice_creation_tool/opening_invoice_creation_tool.js,Creating {0} Invoice,S&#39;està creant {0} factura
 DocType: Medical Code,Medical Code Standard,Codi mèdic estàndard
 DocType: Soil Texture,Clay Composition (%),Composició de fang (%)
@@ -1757,6 +1760,7 @@
 DocType: Support Settings,Get Started Sections,Comença les seccions
 DocType: Lead,CRM-LEAD-.YYYY.-,CRM-LEAD -YYYY.-
 DocType: Invoice Discounting,Sanctioned,sancionada
+,Base Amount,Import base
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.js,Total Contribution Amount: {0},Import total de la contribució: {0}
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py,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: Payroll Entry,Salary Slips Submitted,Rebutjos salaris enviats
@@ -1974,6 +1978,7 @@
 apps/erpnext/erpnext/utilities/user_progress.py,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.
 DocType: Accounting Dimension,Dimension Defaults,Valors per defecte de la dimensió
 apps/erpnext/erpnext/crm/report/prospects_engaged_but_not_converted/prospects_engaged_but_not_converted.js,Minimum Lead Age (Days),El plom sobre l&#39;edat mínima (Dies)
+apps/erpnext/erpnext/assets/report/fixed_asset_register/fixed_asset_register.py,Available For Use Date,Disponible per a la data d’ús
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py,All BOMs,totes les llistes de materials
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js,Create Inter Company Journal Entry,Creeu l&#39;entrada del diari d&#39;Inter Company
 DocType: Company,Parent Company,Empresa matriu
@@ -2038,6 +2043,7 @@
 ,IRS 1099,IRS 1099
 DocType: Salary Slip,Leave Without Pay,Absències sense sou
 DocType: Payment Request,Outward,Cap a fora
+apps/erpnext/erpnext/setup/default_energy_point_rules.py,On {0} Creation,Creació {0}
 apps/erpnext/erpnext/regional/doctype/gstr_3b_report/gstr_3b_report.html,State/UT Tax,Impost estatal / UT
 ,Trial Balance for Party,Balanç de comprovació per a la festa
 ,Gross and Net Profit Report,Informe de benefici brut i net
@@ -2153,6 +2159,7 @@
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js,Make Stock Entry,Fes una entrada en accions
 DocType: Hotel Room Reservation,Hotel Reservation User,Usuari de la reserva d&#39;hotel
 apps/erpnext/erpnext/projects/doctype/project/project.js,Set Status,Definiu l&#39;estat
+apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py,Please setup numbering series for Attendance via Setup &gt; Numbering Series,Configureu les sèries de numeració per assistència mitjançant Configuració&gt; Sèries de numeració
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py,Please select prefix first,Seleccioneu el prefix primer
 DocType: Contract,Fulfilment Deadline,Termini de compliment
 apps/erpnext/erpnext/public/js/hub/pages/Home.vue,Near you,A prop teu
@@ -2168,6 +2175,7 @@
 DocType: Announcement,All Students,tots els alumnes
 apps/erpnext/erpnext/assets/doctype/asset/asset.py,Item {0} must be a non-stock item,Element {0} ha de ser una posició no de magatzem
 apps/erpnext/erpnext/stock/doctype/batch/batch.js,View Ledger,Veure Ledger
+DocType: Cost Center,Lft,LFT
 DocType: Grading Scale,Intervals,intervals
 DocType: Bank Statement Transaction Entry,Reconciled Transactions,Transaccions reconciliades
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py,Earliest,Earliest
@@ -2283,6 +2291,7 @@
 apps/erpnext/erpnext/hr/doctype/employee_benefit_application/employee_benefit_application.py,As per your assigned Salary Structure you cannot apply for benefits,"Segons la seva Estructura Salarial assignada, no pot sol·licitar beneficis"
 apps/erpnext/erpnext/stock/doctype/item/item.py,Website Image should be a public file or website URL,Lloc web imatge ha de ser un arxiu públic o URL del lloc web
 DocType: Purchase Invoice Item,BOM,BOM
+apps/erpnext/erpnext/stock/doctype/item/item.py,Duplicate entry in Manufacturers table,Entrada duplicada a la taula de fabricants
 apps/erpnext/erpnext/setup/doctype/item_group/item_group.js,This is a root item group and cannot be edited.,This is a root item group and cannot be edited.
 apps/erpnext/erpnext/accounts/doctype/account/account.js,Merge,Fusionar
 DocType: Journal Entry Account,Purchase Order,Ordre De Compra
@@ -2427,7 +2436,6 @@
 DocType: Asset,Depreciation Schedules,programes de depreciació
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.js,Create Sales Invoice,Crea factura de vendes
 apps/erpnext/erpnext/regional/doctype/gstr_3b_report/gstr_3b_report.html,Ineligible ITC,TIC no elegible
-apps/erpnext/erpnext/erpnext_integrations/doctype/shopify_settings/shopify_settings.py,"Support for public app is deprecated. Please setup private app, for more details refer user manual","El suport per a l&#39;aplicació pública està obsolet. Configureu l&#39;aplicació privada, per obtenir més informació, consulteu el manual de l&#39;usuari"
 DocType: Task,Dependent Tasks,Tasques depenents
 apps/erpnext/erpnext/regional/report/gstr_1/gstr_1.py,Following accounts might be selected in GST Settings:,Els comptes següents es podrien seleccionar a Configuració de GST:
 apps/erpnext/erpnext/manufacturing/report/bom_stock_report/bom_stock_report.js,Quantity to Produce,Quantitat a produir
@@ -2680,6 +2688,7 @@
 DocType: Water Analysis,Container,Contenidor
 apps/erpnext/erpnext/regional/report/gstr_1/gstr_1.py,Please set valid GSTIN No. in Company Address,Configureu el número de GSTIN vàlid a l&#39;adreça de l&#39;empresa
 apps/erpnext/erpnext/education/utils.py,Student {0} - {1} appears Multiple times in row {2} & {3},Estudiant {0} - {1} apareix en múltiples ocasions consecutives {2} i {3}
+apps/erpnext/erpnext/selling/doctype/customer/customer.py,Following fields are mandatory to create address:,Els camps següents són obligatoris per crear una adreça:
 DocType: Item Alternative,Two-way,Dues vies
 DocType: Item,Manufacturers,Fabricants
 apps/erpnext/erpnext/accounts/deferred_revenue.py,Error while processing deferred accounting for {0},Error al processar la comptabilitat diferida per a {0}
@@ -2754,9 +2763,9 @@
 DocType: Employee,HR-EMP-,HR-EMP-
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py,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: Quality Meeting Minutes,Quality Meeting Minutes,Actes de reunions de qualitat
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Supplier &gt; Supplier Type,Proveïdor&gt; Tipus de proveïdor
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py,Employee Referral,Referències de feina
 DocType: Student Group,Set 0 for no limit,Ajust 0 indica sense límit
+DocType: Cost Center,rgt,RGT
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py,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.
 DocType: Customer,Primary Address and Contact Detail,Direcció principal i detall de contacte
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.js,Resend Payment Email,Torneu a enviar el pagament per correu electrònic
@@ -2866,7 +2875,6 @@
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py,Against Supplier Invoice {0} dated {1},Contra Proveïdor Factura {0} {1} datat
 DocType: Customer,Default Price List,Llista de preus per defecte
 apps/erpnext/erpnext/assets/doctype/asset/asset.py,Asset Movement record {0} created,registrar el moviment d&#39;actius {0} creat
-apps/erpnext/erpnext/utilities/page/leaderboard/leaderboard.js,No items found.,No s&#39;ha trobat cap element.
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py,You cannot delete Fiscal Year {0}. Fiscal Year {0} is set as default in Global Settings,No es pot eliminar l&#39;any fiscal {0}. Any fiscal {0} s&#39;estableix per defecte en la configuració global
 DocType: Share Transfer,Equity/Liability Account,Compte de Patrimoni / Responsabilitat
 apps/erpnext/erpnext/setup/doctype/customer_group/customer_group.py,A customer with the same name already exists,Ja existeix un client amb el mateix nom
@@ -2882,6 +2890,7 @@
 apps/erpnext/erpnext/selling/doctype/customer/customer.py,Credit limit has been crossed for customer {0} ({1}/{2}),S&#39;ha creuat el límit de crèdit per al client {0} ({1} / {2})
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py,Customer required for 'Customerwise Discount',Client requereix per a 'Descompte Customerwise'
 apps/erpnext/erpnext/config/accounting.py,Update bank payment dates with journals.,Actualització de les dates de pagament dels bancs amb les revistes.
+,Billed Qty,Qty facturat
 apps/erpnext/erpnext/stock/doctype/item/item_dashboard.py,Pricing,la fixació de preus
 DocType: Employee,Attendance Device ID (Biometric/RF tag ID),Identificació de dispositiu d&#39;assistència (identificació de l&#39;etiqueta biomètrica / RF)
 DocType: Quotation,Term Details,Detalls termini
@@ -2903,6 +2912,7 @@
 DocType: Share Transfer,Asset Account,Compte d&#39;actius
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js,New release date should be in the future,La nova data de llançament hauria de ser en el futur
 DocType: Purchase Invoice,End date of current invoice's period,Data de finalització del període de facturació actual
+apps/erpnext/erpnext/hr/doctype/employee/employee.py,Please setup Employee Naming System in Human Resource &gt; HR Settings,Configureu el sistema de nominació dels empleats a Recursos humans&gt; Configuració de recursos humans
 DocType: Lab Test,Technician Name,Tècnic Nom
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py,"Cannot ensure delivery by Serial No as \
 					Item {0} is added with and without Ensure Delivery by \
@@ -2910,6 +2920,7 @@
 DocType: Accounts Settings,Unlink Payment on Cancellation of Invoice,Desvinculació de Pagament a la cancel·lació de la factura
 DocType: Bank Reconciliation,From Date,Des de la data
 apps/erpnext/erpnext/hr/doctype/vehicle_log/vehicle_log.py,Current Odometer reading entered should be greater than initial Vehicle Odometer {0},Lectura actual del odòmetre entrat ha de ser més gran que el comptaquilòmetres inicial {0}
+,Purchase Order Items To Be Received or Billed,Comprar articles per rebre o facturar
 DocType: Restaurant Reservation,No Show,No hi ha espectacle
 apps/erpnext/erpnext/regional/india/utils.py,You must be a registered supplier to generate e-Way Bill,Heu de ser un proveïdor registrat per generar la factura electrònica
 DocType: Shipping Rule Country,Shipping Rule Country,Regla País d&#39;enviament
@@ -2952,6 +2963,7 @@
 apps/erpnext/erpnext/templates/generators/item/item_add_to_cart.html,View in Cart,veure Cistella
 DocType: Employee Checkin,Shift Actual Start,Majúscul Inici inicial
 DocType: Tally Migration,Is Day Book Data Imported,S&#39;importen les dades del llibre de dia
+,Purchase Order Items To Be Received or Billed1,Comprar articles per rebre o facturar1
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py,Marketing Expenses,Despeses de Màrqueting
 apps/erpnext/erpnext/stock/doctype/pick_list/pick_list.py,{0} units of {1} is not available.,{0} unitats de {1} no estan disponibles.
 ,Item Shortage Report,Informe d'escassetat d'articles
@@ -3176,7 +3188,6 @@
 apps/erpnext/erpnext/public/js/call_popup/call_popup.js,View all issues from {0},Veure tots els problemes de {0}
 DocType: Quality Inspection,MAT-QA-.YYYY.-,MAT-QA-.YYYY.-
 DocType: Quality Meeting Table,Quality Meeting Table,Taula de reunions de qualitat
-apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,Configureu Naming Series per {0} a través de Configuració&gt; Configuració&gt; Sèries de noms
 apps/erpnext/erpnext/templates/pages/help.html,Visit the forums,Visiteu els fòrums
 DocType: Student,Student Mobile Number,Nombre mòbil Estudiant
 DocType: Item,Has Variants,Té variants
@@ -3319,6 +3330,7 @@
 DocType: Homepage Section,Section Cards,Seccions
 ,Campaign Efficiency,eficiència campanya
 DocType: Discussion,Discussion,discussió
+apps/erpnext/erpnext/setup/default_energy_point_rules.py,On Sales Order Submission,Enviament de la comanda de venda
 DocType: Bank Transaction,Transaction ID,ID de transacció
 DocType: Payroll Entry,Deduct Tax For Unsubmitted Tax Exemption Proof,Deducció d&#39;impostos per a la prova d&#39;exempció d&#39;impostos no enviada
 DocType: Volunteer,Anytime,En qualsevol moment
@@ -3326,7 +3338,6 @@
 DocType: Employee Tax Exemption Proof Submission,Employee Tax Exemption Proof Submission,Sol·licitud d&#39;exempció d&#39;impostos a l&#39;empleat
 DocType: Patient,Surgical History,Història quirúrgica
 DocType: Bank Statement Settings Item,Mapped Header,Capçalera assignada
-apps/erpnext/erpnext/hr/doctype/employee/employee.py,Please setup Employee Naming System in Human Resource &gt; HR Settings,Configureu el sistema de nominació dels empleats a Recursos humans&gt; Configuració de recursos humans
 DocType: Employee,Resignation Letter Date,Carta de renúncia Data
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Pricing Rules are further filtered based on quantity.,Regles de les tarifes es filtren més basat en la quantitat.
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py,Please set the Date Of Joining for employee {0},Si us plau ajust la data d&#39;incorporació dels empleats {0}
@@ -3340,6 +3351,7 @@
 DocType: Bank Statement Settings,Mapped Items,Objectes assignats
 DocType: Amazon MWS Settings,IT,IT
 DocType: Chapter,Chapter,Capítol
+,Fixed Asset Register,Registre d’actius fixos
 apps/erpnext/erpnext/utilities/user_progress.py,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,Select BOM and Qty for Production,Seleccioneu la llista de materials i d&#39;Unitats de Producció
@@ -3475,7 +3487,6 @@
 apps/erpnext/erpnext/templates/emails/reorder_item.html,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
 apps/erpnext/erpnext/controllers/accounts_controller.py,Account {0} is invalid. Account Currency must be {1},Compte {0} no és vàlid. Compte moneda ha de ser {1}
 apps/erpnext/erpnext/hr/doctype/salary_structure_assignment/salary_structure_assignment.py,From Date {0} cannot be after employee's relieving Date {1},Des de la data {0} no es pot produir després de l&#39;alleujament de l&#39;empleat Data {1}
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py,Debit Note {0} has been created automatically,Nota de dèbit {0} s&#39;ha creat automàticament
 apps/erpnext/erpnext/accounts/doctype/payment_order/payment_order.js,Create Payment Entries,Creeu entrades de pagament
 DocType: Supplier,Is Internal Supplier,És proveïdor intern
 DocType: Employee,Create User Permission,Crea permís d&#39;usuari
@@ -4034,7 +4045,6 @@
 DocType: Project User,Project Status,Estat del Projecte
 DocType: UOM,Check this to disallow fractions. (for Nos),Habiliteu aquesta opció per no permetre fraccions. (Per números)
 DocType: Student Admission Program,Naming Series (for Student Applicant),Sèrie de nomenclatura (per Estudiant Sol·licitant)
-apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.py,UOM Conversion factor ({0} -&gt; {1}) not found for item: {2},Factor de conversió UOM ({0} -&gt; {1}) no trobat per a l&#39;element: {2}
 apps/erpnext/erpnext/hr/doctype/retention_bonus/retention_bonus.py,Bonus Payment Date cannot be a past date,La data de pagament addicional no pot ser una data passada
 DocType: Travel Request,Copy of Invitation/Announcement,Còpia de Invitació / Anunci
 DocType: Practitioner Service Unit Schedule,Practitioner Service Unit Schedule,Calendari de la Unitat de Servei de Practitioner
@@ -4202,6 +4212,7 @@
 apps/erpnext/erpnext/utilities/user_progress.py,Setup Company,Configuració de l&#39;empresa
 ,Lab Test Report,Informe de prova de laboratori
 DocType: Employee Benefit Application,Employee Benefit Application,Sol·licitud de prestació d&#39;empleats
+apps/erpnext/erpnext/accounts/doctype/invoice_discounting/invoice_discounting.py,Row({0}): {1} is already discounted in {2},Fila ({0}): {1} ja es descompta a {2}
 apps/erpnext/erpnext/hr/doctype/additional_salary/additional_salary.py,Additional Salary Component Exists.,Existeix un component salarial addicional.
 DocType: Purchase Invoice,Unregistered,No registrat
 DocType: Student Applicant,Application Date,Data de Sol·licitud
@@ -4280,7 +4291,6 @@
 DocType: Journal Entry,Accounting Entries,Assentaments comptables
 DocType: Job Card Time Log,Job Card Time Log,Registre de temps de la targeta de treball
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,"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;."
-apps/erpnext/erpnext/education/doctype/instructor/instructor.py,Please setup Instructor Naming System in Education &gt; Education Settings,Configureu un sistema de nom de l’Instructor a Educació&gt; Configuració d’educació
 DocType: Journal Entry,Paid Loan,Préstec pagat
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py,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
@@ -4297,7 +4307,6 @@
 apps/erpnext/erpnext/templates/pages/projects.html,No time sheets,De llistes d&#39;assistència
 DocType: GoCardless Mandate,GoCardless Customer,Client GoCardless
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py,Leave Type {0} cannot be carry-forwarded,Deixar tipus {0} no es poden enviar-portar
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Item Code &gt; Item Group &gt; Brand,Codi de l&#39;article&gt; Grup d&#39;articles&gt; Marca
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py,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
 DocType: Leave Encashment,Payroll,nòmina de sous
@@ -4412,7 +4421,6 @@
 DocType: Stock Ledger Entry,Actual Qty After Transaction,Actual Quantitat Després de Transacció
 ,Pending SO Items For Purchase Request,A l'espera dels Articles de la SO per la sol·licitud de compra
 apps/erpnext/erpnext/education/doctype/student_admission/student_admission.py,Student Admissions,Admissió d&#39;Estudiants
-apps/erpnext/erpnext/accounts/party.py,{0} {1} is disabled,{0} {1} està desactivat
 DocType: Supplier,Billing Currency,Facturació moneda
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py,Extra Large,Extra gran
 DocType: Loan,Loan Application,Sol·licitud de préstec
@@ -4489,7 +4497,6 @@
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py,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/accounts/doctype/accounting_dimension/accounting_dimension.py,Creating Dimensions...,Creació de dimensions ...
 apps/erpnext/erpnext/education/doctype/student_group_creation_tool/student_group_creation_tool.py,Student Group Name is mandatory in row {0},Estudiant Nom del grup és obligatori a la fila {0}
-DocType: Customer Credit Limit,Bypass credit limit_check,Eviteu el limite de crèdit
 DocType: Homepage,Products to be shown on website homepage,Els productes que es mostren a la pàgina d&#39;inici pàgina web
 DocType: HR Settings,Password Policy,Política de contrasenya
 apps/erpnext/erpnext/setup/doctype/customer_group/customer_group.js,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.
@@ -4793,6 +4800,7 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py,Row {0}: Advance against Customer must be credit,Fila {0}: Avanç contra el Client ha de ser de crèdit
 DocType: Quality Meeting,Quality Meeting,Reunió de qualitat
 apps/erpnext/erpnext/accounts/doctype/account/account.js,Non-Group to Group,No al Grup Grup
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,Configureu Naming Series per {0} a través de Configuració&gt; Configuració&gt; Sèries de noms
 DocType: Employee,ERPNext User,Usuari ERPNext
 apps/erpnext/erpnext/education/doctype/student_group_creation_tool/student_group_creation_tool.py,Batch is mandatory in row {0},Lot és obligatori a la fila {0}
 DocType: Company,Default Buying Terms,Condicions de compra per defecte
@@ -5087,6 +5095,7 @@
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py,No {0} found for Inter Company Transactions.,No s&#39;ha trobat {0} per a les transaccions de l&#39;empresa Inter.
 DocType: Travel Itinerary,Rented Car,Cotxe llogat
 apps/erpnext/erpnext/public/js/hub/components/profile_dialog.js,About your Company,Sobre la vostra empresa
+apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.js,Show Stock Ageing Data,Mostra dades d’envelliment d’estoc
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py,Credit To account must be a Balance Sheet account,Crèdit al compte ha de ser un compte de Balanç
 DocType: Donor,Donor,Donant
 DocType: Global Defaults,Disable In Words,En desactivar Paraules
@@ -5101,8 +5110,10 @@
 DocType: Practitioner Schedule,Schedule Name,Programar el nom
 apps/erpnext/erpnext/regional/doctype/gstr_3b_report/gstr_3b_report.py,Please enter GSTIN and state for the Company Address {0},Introduïu GSTIN i indiqueu l&#39;adreça de l&#39;empresa {0}
 DocType: Currency Exchange,For Buying,Per a la compra
+apps/erpnext/erpnext/setup/default_energy_point_rules.py,On Purchase Order Submission,Enviament de la comanda de compra
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js,Add All Suppliers,Afegeix tots els proveïdors
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py,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/accounts/doctype/pricing_rule/pricing_rule.js,Customer &gt; Customer Group &gt; Territory,Client&gt; Grup de clients&gt; Territori
 DocType: Tally Migration,Parties,Festa
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js,Browse BOM,Navegar per llista de materials
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py,Secured Loans,Préstecs Garantits
@@ -5134,6 +5145,7 @@
 apps/erpnext/erpnext/stock/doctype/item_alternative/item_alternative.py,Not allow to set alternative item for the item {0},No permetis establir un element alternatiu per a l&#39;element {0}
 apps/erpnext/erpnext/hr/doctype/leave_block_list/leave_block_list.py,Date is repeated,Data repetida
 apps/erpnext/erpnext/accounts/print_format/payment_receipt_voucher/payment_receipt_voucher.html,Authorized Signatory,Signant Autoritzat
+apps/erpnext/erpnext/education/doctype/instructor/instructor.py,Please setup Instructor Naming System in Education &gt; Education Settings,Configureu un sistema de nom de l’Instructor a Educació&gt; Configuració d’educació
 apps/erpnext/erpnext/regional/doctype/gstr_3b_report/gstr_3b_report.html,Net ITC Available(A) - (B),TIC net disponible (A) - (B)
 apps/erpnext/erpnext/education/doctype/fee_schedule/fee_schedule.js,Create Fees,Crea tarifes
 DocType: Project,Total Purchase Cost (via Purchase Invoice),Cost total de compra (mitjançant compra de la factura)
@@ -5154,6 +5166,7 @@
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.js,Message Sent,Missatge enviat
 apps/erpnext/erpnext/accounts/doctype/account/account.py,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/assets/report/fixed_asset_register/fixed_asset_register.py,Vendor Name,Nom del venedor
 DocType: Quiz Result,Wrong,Mal
 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)
@@ -5397,6 +5410,7 @@
 DocType: Stock Settings,Auto Material Request,Sol·licitud de material automàtica
 DocType: Woocommerce Settings,API consumer secret,Secret de consum de l&#39;API
 DocType: Delivery Note Item,Available Batch Qty at From Warehouse,Quantitat de lots disponibles a De Magatzem
+,Received Qty Amount,Quantitat rebuda
 DocType: Salary Slip,Gross Pay - Total Deduction - Loan Repayment,Pagament Brut - Deducció total - Pagament de Préstecs
 DocType: Bank Account,Last Integration Date,Última data d’integració
 DocType: Expense Claim,Expense Taxes and Charges,Despeses i impostos
@@ -5856,6 +5870,8 @@
 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,Please select Qty against item {0},Seleccioneu Qty contra l&#39;element {0}
+apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py,Latest Age,Última Edat
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js,Transfer Material to Supplier,Transferència de material a proveïdor
 apps/erpnext/erpnext/hr/report/loan_repayment/loan_repayment.py,EMI,EMI
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py,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
@@ -5879,7 +5895,6 @@
 apps/erpnext/erpnext/hr/doctype/employee_benefit_application/employee_benefit_application.py,"An amount of {0} already claimed for the component {1},\
 						 set the amount equal or greater than {2}","S&#39;ha reclamat una quantitat de {0} per al component {1}, \ estableixi la quantitat igual o superior a {2}"
 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
 DocType: BOM Update Tool,The new BOM after replacement,La nova llista de materials després del reemplaçament
 ,Point of Sale,Punt de Venda
@@ -5999,7 +6014,6 @@
 DocType: Purchase Order Item,Blanket Order Rate,Tarifa de comanda de mantega
 ,Customer Ledger Summary,Resum comptable
 apps/erpnext/erpnext/hooks.py,Certification,Certificació
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js,Are you sure you want to make debit note?,Esteu segur que voleu fer una nota de dèbit?
 DocType: Bank Guarantee,Clauses and Conditions,Clàusules i condicions
 DocType: Serial No,Creation Document Type,Creació de tipus de document
 DocType: Amazon MWS Settings,ES,ES
@@ -6037,8 +6051,6 @@
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py,Financial Services,Serveis Financers
 DocType: Student Sibling,Student ID,Identificació de l&#39;estudiant
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.js,For Quantity must be greater than zero,La quantitat ha de ser superior a zero
-apps/erpnext/erpnext/hr/doctype/employee_transfer/employee_transfer.py,"Please delete the Employee <a href=""#Form/Employee/{0}"">{0}</a>\
-					to cancel this document","Si us plau, suprimiu l&#39;empleat <a href=""#Form/Employee/{0}"">{0}</a> \ per cancel·lar aquest document"
 apps/erpnext/erpnext/config/projects.py,Types of activities for Time Logs,Tipus d&#39;activitats per als registres de temps
 DocType: Opening Invoice Creation Tool,Sales,Venda
 DocType: Stock Entry Detail,Basic Amount,Suma Bàsic
@@ -6117,6 +6129,7 @@
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py,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,Send Supplier Emails,Enviar missatges de correu electrònic del proveïdor
+DocType: Asset Movement,ACC-ASM-.YYYY.-,ACC-ASM -YYYY.-
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py,"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
 apps/erpnext/erpnext/hr/doctype/employee_onboarding/employee_onboarding.py,Submit this to create the Employee record,Envieu això per crear el registre d&#39;empleats
@@ -6194,7 +6207,6 @@
 DocType: Sales Team,Contact No.,Número de Contacte
 apps/erpnext/erpnext/templates/includes/cart/cart_address.html,Billing Address is same as Shipping Address,L’adreça de facturació és la mateixa que l’adreça d’enviament
 DocType: Bank Reconciliation,Payment Entries,Les entrades de pagament
-apps/erpnext/erpnext/erpnext_integrations/doctype/shopify_settings/shopify_settings.py,Access token or Shopify URL missing,Falta l&#39;accés token o Storeify URL
 DocType: Location,Latitude,Latitude
 DocType: Work Order,Scrap Warehouse,Magatzem de ferralla
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py,"Warehouse required at Row No {0}, please set default warehouse for the item {1} for the company {2}","Es necessita un magatzem a la fila No {0}, definiu el magatzem predeterminat per a l&#39;element {1} per a l&#39;empresa {2}"
@@ -6237,7 +6249,6 @@
 DocType: Job Offer Term,Value / Description,Valor / Descripció
 apps/erpnext/erpnext/controllers/accounts_controller.py,"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
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js,Are you sure you want to make credit note?,Esteu segur que voleu fer nota de crèdit?
 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,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}.
@@ -6362,6 +6373,7 @@
 DocType: Purchase Invoice,Taxes and Charges Added,Impostos i càrregues afegides
 apps/erpnext/erpnext/assets/doctype/asset/asset.py,Depreciation Row {0}: Next Depreciation Date cannot be before Available-for-use Date,La fila de depreciació {0}: la següent data de la depreciació no pot ser abans de la data d&#39;ús disponible
 ,Sales Funnel,Sales Funnel
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Item Code &gt; Item Group &gt; Brand,Codi de l&#39;article&gt; Grup d&#39;articles&gt; Marca
 apps/erpnext/erpnext/setup/doctype/company/company.py,Abbreviation is mandatory,Abreviatura és obligatori
 DocType: Project,Task Progress,Grup de Progrés
 apps/erpnext/erpnext/templates/includes/navbar/navbar_items.html,Cart,Carro
@@ -6606,6 +6618,7 @@
 DocType: Employee Grade,Employee Grade,Grau d&#39;empleat
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py,Piecework,Treball a preu fet
 DocType: GSTR 3B Report,June,juny
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Supplier &gt; Supplier Type,Proveïdor&gt; Tipus de proveïdor
 DocType: Share Balance,From No,Del núm
 DocType: Shift Type,Early Exit Grace Period,Període de gràcia de sortida
 DocType: Task,Actual Time (in Hours),Temps real (en hores)
@@ -6890,6 +6903,7 @@
 DocType: Warehouse,Warehouse Name,Nom Magatzem
 DocType: Naming Series,Select Transaction,Seleccionar Transacció
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py,Please enter Approving Role or Approving User,Si us plau entra el rol d'aprovació o l'usuari aprovador
+apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.py,UOM Conversion factor ({0} -&gt; {1}) not found for item: {2},Factor de conversió UOM ({0} -&gt; {1}) no trobat per a l&#39;element: {2}
 apps/erpnext/erpnext/support/doctype/service_level_agreement/service_level_agreement.py,Service Level Agreement with Entity Type {0} and Entity {1} already exists.,Ja existeix un contracte de nivell de servei amb el tipus d&#39;entitat {0} i l&#39;entitat {1}.
 DocType: Journal Entry,Write Off Entry,Escriu Off Entrada
 DocType: BOM,Rate Of Materials Based On,Tarifa de materials basats en
@@ -7080,6 +7094,7 @@
 DocType: Quality Inspection Reading,Quality Inspection Reading,Qualitat de Lectura d'Inspecció
 apps/erpnext/erpnext/stock/doctype/stock_settings/stock_settings.py,`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/stock/report/stock_balance/stock_balance.py,Earliest Age,Edat més primerenca
 apps/erpnext/erpnext/utilities/user_progress.py,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.
 DocType: Quality Goal,Revision,Revisió
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js,Healthcare Services,Serveis sanitaris
@@ -7123,6 +7138,7 @@
 apps/erpnext/erpnext/healthcare/doctype/patient_encounter/patient_encounter.js,Schedule Discharge,Horari d&#39;alta
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py,Cheques and Deposits incorrectly cleared,Els xecs i dipòsits esborren de forma incorrecta
 DocType: Homepage Section Card,Homepage Section Card,Fitxa de la secció de la pàgina principal
+,Amount To Be Billed,Quantitat a pagar
 apps/erpnext/erpnext/accounts/doctype/account/account.py,Account {0}: You can not assign itself as parent account,Compte {0}: No es pot assignar com compte principal
 DocType: Purchase Invoice Item,Price List Rate,Preu de llista Rate
 apps/erpnext/erpnext/utilities/activation.py,Create customer quotes,Crear cites de clients
@@ -7175,6 +7191,7 @@
 DocType: Supplier Scorecard Criteria,Supplier Scorecard Criteria,Criteris de quadre de comandament de proveïdors
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py,Please select Start Date and End Date for Item {0},Seleccioneu data d'inici i data de finalització per a l'article {0}
 DocType: Maintenance Schedule,MAT-MSH-.YYYY.-,MAT-MSH-.YYYY.-
+,Amount to Receive,Import a rebre
 apps/erpnext/erpnext/education/doctype/student_group_creation_tool/student_group_creation_tool.py,Course is mandatory in row {0},Per descomptat és obligatori a la fila {0}
 apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py,From date can not be greater than than To date,Des de la data no pot ser superior a fins a la data
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py,To date cannot be before from date,Fins a la data no pot ser anterior a partir de la data
@@ -7423,7 +7440,6 @@
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js,BOM and Manufacturing Quantity are required,Llista de materials i de fabricació es requereixen Quantitat
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js,Ageing Range 2,Rang 2 Envelliment
 DocType: SG Creation Tool Course,Max Strength,força màx
-apps/erpnext/erpnext/accounts/doctype/account/account.py,"Account {0} already exists in child company {1}. The following fields have different values, they should be same:<ul><li>{2}</li></ul>","El compte {0} ja existeix a la companyia secundària {1}. Els camps següents tenen valors diferents, haurien de ser iguals: <ul><li> {2} </li></ul>"
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py,Installing presets,Instal·lació de valors predeterminats
 DocType: Fee Schedule,EDU-FSH-.YYYY.-,EDU-FSH-.YYYY.-
 apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js,No Delivery Note selected for Customer {},No s&#39;ha seleccionat cap nota de lliurament per al client {}
@@ -7631,6 +7647,7 @@
 DocType: Delivery Note,Print Without Amount,Imprimir Sense Monto
 apps/erpnext/erpnext/accounts/report/asset_depreciation_ledger/asset_depreciation_ledger.py,Depreciation Date,La depreciació Data
 ,Work Orders in Progress,Ordres de treball en progrés
+DocType: Customer Credit Limit,Bypass Credit Limit Check,Control de límit de crèdit de desviament
 DocType: Issue,Support Team,Equip de suport
 apps/erpnext/erpnext/stock/report/batch_item_expiry_status/batch_item_expiry_status.py,Expiry (In Days),Caducitat (en dies)
 DocType: Appraisal,Total Score (Out of 5),Puntuació total (de 5)
@@ -7814,6 +7831,7 @@
 DocType: Sales Invoice,Customer GSTIN,GSTIN client
 DocType: Crop Cycle,List of diseases detected on the field. When selected it'll automatically add a list of tasks to deal with the disease ,"Llista de malalties detectades al camp. Quan estigui seleccionat, afegirà automàticament una llista de tasques per fer front a la malaltia"
 apps/erpnext/erpnext/manufacturing/page/bom_comparison_tool/bom_comparison_tool.js,BOM 1,BOM 1
+apps/erpnext/erpnext/assets/report/fixed_asset_register/fixed_asset_register.py,Asset Id,Identificador de l’actiu
 apps/erpnext/erpnext/healthcare/doctype/healthcare_service_unit/healthcare_service_unit.js,This is a root healthcare service unit and cannot be edited.,Aquesta és una unitat de servei d&#39;assistència sanitària racial i no es pot editar.
 DocType: Asset Repair,Repair Status,Estat de reparació
 apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.js,"Requested Qty: Quantity requested for purchase, but not ordered.","Quantitat Sol·licitada: Quantitat sol·licitada per a la compra, però sense demanar."
diff --git a/erpnext/translations/cs.csv b/erpnext/translations/cs.csv
index 66b4602..aa526b1 100644
--- a/erpnext/translations/cs.csv
+++ b/erpnext/translations/cs.csv
@@ -288,7 +288,6 @@
 DocType: Loan,Repay Over Number of Periods,Splatit Over počet období
 apps/erpnext/erpnext/manufacturing/report/bom_stock_report/bom_stock_report.py,Quantity to Produce can not be less than Zero,Množství na výrobu nesmí být menší než nula
 DocType: Stock Entry,Additional Costs,Dodatečné náklady
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Customer &gt; Customer Group &gt; Territory,Zákazník&gt; Skupina zákazníků&gt; Území
 apps/erpnext/erpnext/accounts/doctype/account/account.py,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ů
@@ -585,6 +584,7 @@
 DocType: Healthcare Settings,Create documents for sample collection,Vytvořte dokumenty pro výběr vzorků
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py,Payment against {0} {1} cannot be greater than Outstanding Amount {2},Platba proti {0} {1} nemůže být větší než dlužné částky {2}
 apps/erpnext/erpnext/patches/v11_0/add_healthcare_service_unit_tree_root.py,All Healthcare Service Units,Všechny jednotky zdravotnických služeb
+apps/erpnext/erpnext/setup/default_energy_point_rules.py,On Converting Opportunity,O převodu příležitostí
 DocType: Bank Account,Address HTML,Adresa HTML
 DocType: Lead,Mobile No.,Mobile No.
 apps/erpnext/erpnext/selling/doctype/pos_closing_voucher/closing_voucher_details.html,Mode of Payments,Způsob platby
@@ -649,7 +649,6 @@
 DocType: Accounting Dimension,Dimension Name,Název dimenze
 apps/erpnext/erpnext/healthcare/setup.py,Resistant,Odolný
 apps/erpnext/erpnext/hotels/doctype/hotel_room_reservation/hotel_room_reservation.py,Please set Hotel Room Rate on {},"Prosím, nastavte Hotel Room Rate na {}"
-apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py,Please setup numbering series for Attendance via Setup &gt; Numbering Series,Nastavte číslovací řady pro Docházku prostřednictvím Nastavení&gt; Číslovací řady
 DocType: Journal Entry,Multi Currency,Více měn
 DocType: Bank Statement Transaction Invoice Item,Invoice Type,Typ faktury
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py,Valid from date must be less than valid upto date,Platné od data musí být kratší než platné datum
@@ -764,6 +763,7 @@
 apps/erpnext/erpnext/accounts/page/pos/pos.js,Create a new Customer,Vytvořit nový zákazník
 apps/erpnext/erpnext/non_profit/report/expiring_memberships/expiring_memberships.py,Expiring On,Vypnuto Zapnuto
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,"If multiple Pricing Rules continue to prevail, users are asked to set Priority manually to resolve conflict.","Je-li více pravidla pro tvorbu cen i nadále přednost, jsou uživatelé vyzváni k nastavení priority pro vyřešení konfliktu."
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js,Purchase Return,Nákup Return
 apps/erpnext/erpnext/utilities/activation.py,Create Purchase Orders,Vytvoření objednávek
 ,Purchase Register,Nákup Register
 apps/erpnext/erpnext/healthcare/doctype/patient/patient.py,Patient not found,Pacient nebyl nalezen
@@ -779,7 +779,6 @@
 DocType: Location,Area UOM,Oblast UOM
 apps/erpnext/erpnext/manufacturing/doctype/workstation/workstation.py,Workstation is closed on the following dates as per Holiday List: {0},Workstation je uzavřena v následujících dnech podle Prázdninový Seznam: {0}
 apps/erpnext/erpnext/selling/page/sales_funnel/sales_funnel.py,Opportunities,Příležitosti
-apps/erpnext/erpnext/www/all-products/index.html,Clear filters,Vymazat filtry
 DocType: Lab Test Template,Single,Jednolůžkový
 DocType: Compensatory Leave Request,Work From Date,Práce od data
 DocType: Salary Slip,Total Loan Repayment,Celková splátky
@@ -822,6 +821,7 @@
 DocType: Account,Old Parent,Staré nadřazené
 apps/erpnext/erpnext/education/doctype/program_enrollment_tool/program_enrollment_tool.py,Mandatory field - Academic Year,Povinná oblast - Akademický rok
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py,{0} {1} is not associated with {2} {3},{0} {1} není přidružen k {2} {3}
+DocType: Opportunity,Converted By,Převedeno
 apps/erpnext/erpnext/public/js/hub/components/ReviewArea.vue,You need to login as a Marketplace User before you can add any reviews.,"Než budete moci přidat recenze, musíte se přihlásit jako uživatel Marketplace."
 apps/erpnext/erpnext/manufacturing/doctype/job_card/job_card.py,Row {0} : Operation is required against the raw material item {1},Řádek {0}: vyžaduje se operace proti položce suroviny {1}
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py,Please set default payable account for the company {0},Nastavte prosím výchozí splatný účet společnosti {0}
@@ -847,6 +847,8 @@
 DocType: BOM,Work Order,Zakázka
 DocType: Sales Invoice,Total Qty,Celkem Množství
 apps/erpnext/erpnext/education/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py,Guardian2 Email ID,ID e-mailu Guardian2
+apps/erpnext/erpnext/hr/doctype/employee_transfer/employee_transfer.py,"Please delete the Employee <a href=""#Form/Employee/{0}"">{0}</a>\
+					to cancel this document","Chcete-li tento dokument zrušit, prosím odstraňte zaměstnance <a href=""#Form/Employee/{0}"">{0}</a> \"
 DocType: Item,Show in Website (Variant),Show do webových stránek (Variant)
 DocType: Employee,Health Concerns,Zdravotní Obavy
 DocType: Payroll Entry,Select Payroll Period,Vyberte mzdové
@@ -906,7 +908,6 @@
 DocType: Codification Table,Codification Table,Kodifikační tabulka
 DocType: Timesheet Detail,Hrs,hod
 apps/erpnext/erpnext/manufacturing/page/bom_comparison_tool/bom_comparison_tool.js,Changes in {0},Změny v {0}
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js,Please select Company,"Prosím, vyberte Company"
 DocType: Employee Skill,Employee Skill,Dovednost zaměstnanců
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.js,Difference Account,Rozdíl účtu
 DocType: Pricing Rule,Discount on Other Item,Sleva na další položku
@@ -974,6 +975,7 @@
 DocType: BOM,Operating Cost,Provozní náklady
 DocType: Crop,Produced Items,Vyrobené položky
 DocType: Bank Statement Transaction Entry,Match Transaction to Invoices,Shoda transakce na faktury
+apps/erpnext/erpnext/erpnext_integrations/exotel_integration.py,Error in Exotel incoming call,Chyba při příchozím hovoru Exotel
 DocType: Sales Order Item,Gross Profit,Hrubý Zisk
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js,Unblock Invoice,Odblokovat fakturu
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py,Increment cannot be 0,Přírůstek nemůže být 0
@@ -1187,6 +1189,7 @@
 DocType: Activity Cost,Activity Type,Druh činnosti
 DocType: Request for Quotation,For individual supplier,Pro jednotlivé dodavatele
 DocType: BOM Operation,Base Hour Rate(Company Currency),Základna hodinová sazba (Company měny)
+,Qty To Be Billed,Množství k vyúčtování
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py,Delivered Amount,Dodává Částka
 apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.js,Reserved Qty for Production: Raw materials quantity to make manufacturing items.,Vyhrazeno Množství pro výrobu: Množství surovin pro výrobu výrobních položek.
 DocType: Loyalty Point Entry Redemption,Redemption Date,Datum vykoupení
@@ -1305,7 +1308,7 @@
 DocType: Sales Invoice,Commission Rate (%),Výše provize (%)
 apps/erpnext/erpnext/education/doctype/student_group/student_group.py,Please select Program,Vyberte prosím Program
 DocType: Project,Estimated Cost,Odhadované náklady
-DocType: Request for Quotation,Link to material requests,Odkaz na materiálních požadavků
+DocType: Supplier Quotation,Link to material requests,Odkaz na materiálních požadavků
 apps/erpnext/erpnext/public/js/hub/pages/Publish.vue,Publish,Publikovat
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py,Aerospace,Aerospace
 ,Fichier des Ecritures Comptables [FEC],Fichier des Ecritures Comptables [FEC]
@@ -1318,6 +1321,7 @@
 apps/erpnext/erpnext/utilities/transaction_base.py,Invalid Posting Time,Neplatný čas přidávání
 DocType: Salary Component,Condition and Formula,Stav a vzorec
 DocType: Lead,Campaign Name,Název kampaně
+apps/erpnext/erpnext/setup/default_energy_point_rules.py,On Task Completion,Při dokončení úkolu
 apps/erpnext/erpnext/hr/doctype/compensatory_leave_request/compensatory_leave_request.py,There is no leave period in between {0} and {1},"Mezi {0} a {1} není žádná doba dovolené,"
 DocType: Fee Validity,Healthcare Practitioner,Zdravotnický praktik
 DocType: Hotel Room,Capacity,Kapacita
@@ -1681,7 +1685,6 @@
 DocType: Quality Feedback Template,Quality Feedback Template,Šablona zpětné vazby kvality
 apps/erpnext/erpnext/config/education.py,LMS Activity,Aktivita LMS
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py,Internet Publishing,Internet Publishing
-DocType: Prescription Duration,Number,Číslo
 apps/erpnext/erpnext/accounts/doctype/opening_invoice_creation_tool/opening_invoice_creation_tool.js,Creating {0} Invoice,Vytvoření faktury {0}
 DocType: Medical Code,Medical Code Standard,Standardní zdravotnický kód
 DocType: Soil Texture,Clay Composition (%),Složení jílů (%)
@@ -1756,6 +1759,7 @@
 DocType: Support Settings,Get Started Sections,Začínáme sekce
 DocType: Lead,CRM-LEAD-.YYYY.-,CRM-LEAD-.YYYY.-
 DocType: Invoice Discounting,Sanctioned,schválený
+,Base Amount,Základní částka
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.js,Total Contribution Amount: {0},Celková částka příspěvku: {0}
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py,Row #{0}: Please specify Serial No for Item {1},Row # {0}: Zadejte Pořadové číslo k bodu {1}
 DocType: Payroll Entry,Salary Slips Submitted,Příspěvky na plat
@@ -1973,6 +1977,7 @@
 apps/erpnext/erpnext/utilities/user_progress.py,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.
 DocType: Accounting Dimension,Dimension Defaults,Výchozí hodnoty dimenze
 apps/erpnext/erpnext/crm/report/prospects_engaged_but_not_converted/prospects_engaged_but_not_converted.js,Minimum Lead Age (Days),Minimální doba plnění (dny)
+apps/erpnext/erpnext/assets/report/fixed_asset_register/fixed_asset_register.py,Available For Use Date,K dispozici pro datum použití
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py,All BOMs,Všechny kusovníky
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js,Create Inter Company Journal Entry,Vytvořte položku inter firemního deníku
 DocType: Company,Parent Company,Mateřská společnost
@@ -2037,6 +2042,7 @@
 ,IRS 1099,IRS 1099
 DocType: Salary Slip,Leave Without Pay,Volno bez nároku na mzdu
 DocType: Payment Request,Outward,Vnější
+apps/erpnext/erpnext/setup/default_energy_point_rules.py,On {0} Creation,Na {0} stvoření
 apps/erpnext/erpnext/regional/doctype/gstr_3b_report/gstr_3b_report.html,State/UT Tax,Daň státu / UT
 ,Trial Balance for Party,Trial váhy pro stranu
 ,Gross and Net Profit Report,Hrubý a čistý zisk
@@ -2152,6 +2158,7 @@
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js,Make Stock Entry,Proveďte zadávání zásob
 DocType: Hotel Room Reservation,Hotel Reservation User,Uživatel rezervace ubytování
 apps/erpnext/erpnext/projects/doctype/project/project.js,Set Status,Nastavit stav
+apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py,Please setup numbering series for Attendance via Setup &gt; Numbering Series,Nastavte číslovací řady pro Docházku prostřednictvím Nastavení&gt; Číslovací řady
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py,Please select prefix first,"Prosím, vyberte první prefix"
 DocType: Contract,Fulfilment Deadline,Termín splnění
 apps/erpnext/erpnext/public/js/hub/pages/Home.vue,Near you,Ve vašem okolí
@@ -2167,6 +2174,7 @@
 DocType: Announcement,All Students,Všichni studenti
 apps/erpnext/erpnext/assets/doctype/asset/asset.py,Item {0} must be a non-stock item,Item {0} musí být non-skladová položka
 apps/erpnext/erpnext/stock/doctype/batch/batch.js,View Ledger,View Ledger
+DocType: Cost Center,Lft,LFT
 DocType: Grading Scale,Intervals,intervaly
 DocType: Bank Statement Transaction Entry,Reconciled Transactions,Zkombinované transakce
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py,Earliest,Nejstarší
@@ -2282,6 +2290,7 @@
 apps/erpnext/erpnext/hr/doctype/employee_benefit_application/employee_benefit_application.py,As per your assigned Salary Structure you cannot apply for benefits,Podle vaší přiřazené struktury platu nemůžete žádat o výhody
 apps/erpnext/erpnext/stock/doctype/item/item.py,Website Image should be a public file or website URL,Webové stránky Image by měla být veřejná souboru nebo webové stránky URL
 DocType: Purchase Invoice Item,BOM,BOM
+apps/erpnext/erpnext/stock/doctype/item/item.py,Duplicate entry in Manufacturers table,Duplicitní záznam v tabulce Výrobci
 apps/erpnext/erpnext/setup/doctype/item_group/item_group.js,This is a root item group and cannot be edited.,Jedná se o skupinu kořen položky a nelze upravovat.
 apps/erpnext/erpnext/accounts/doctype/account/account.js,Merge,Spojit
 DocType: Journal Entry Account,Purchase Order,Vydaná objednávka
@@ -2426,7 +2435,6 @@
 DocType: Asset,Depreciation Schedules,odpisy Plány
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.js,Create Sales Invoice,Vytvořit prodejní fakturu
 apps/erpnext/erpnext/regional/doctype/gstr_3b_report/gstr_3b_report.html,Ineligible ITC,Nezpůsobilé ITC
-apps/erpnext/erpnext/erpnext_integrations/doctype/shopify_settings/shopify_settings.py,"Support for public app is deprecated. Please setup private app, for more details refer user manual","Podpora pro veřejnou aplikaci je zastaralá. Prosím, nastavte soukromou aplikaci, další podrobnosti naleznete v uživatelské příručce"
 DocType: Task,Dependent Tasks,Závislé úkoly
 apps/erpnext/erpnext/regional/report/gstr_1/gstr_1.py,Following accounts might be selected in GST Settings:,V nastavení GST lze vybrat následující účty:
 apps/erpnext/erpnext/manufacturing/report/bom_stock_report/bom_stock_report.js,Quantity to Produce,Množství k výrobě
@@ -2679,6 +2687,7 @@
 DocType: Water Analysis,Container,Kontejner
 apps/erpnext/erpnext/regional/report/gstr_1/gstr_1.py,Please set valid GSTIN No. in Company Address,Zadejte prosím platné číslo GSTIN v adrese společnosti
 apps/erpnext/erpnext/education/utils.py,Student {0} - {1} appears Multiple times in row {2} & {3},Student {0} - {1} objeví vícekrát za sebou {2} {3}
+apps/erpnext/erpnext/selling/doctype/customer/customer.py,Following fields are mandatory to create address:,K vytvoření adresy jsou povinná následující pole:
 DocType: Item Alternative,Two-way,Obousměrné
 DocType: Item,Manufacturers,Výrobci
 apps/erpnext/erpnext/accounts/deferred_revenue.py,Error while processing deferred accounting for {0},Chyba při zpracování odloženého účetnictví pro {0}
@@ -2753,9 +2762,9 @@
 DocType: Employee,HR-EMP-,HR-EMP-
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py,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: Quality Meeting Minutes,Quality Meeting Minutes,Kvalitní zápisnice z jednání
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Supplier &gt; Supplier Type,Dodavatel&gt; Typ dodavatele
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py,Employee Referral,Doporučení zaměstnance
 DocType: Student Group,Set 0 for no limit,Nastavte 0 pro žádný limit
+DocType: Cost Center,rgt,Rgt
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py,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."
 DocType: Customer,Primary Address and Contact Detail,Primární adresa a podrobnosti kontaktu
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.js,Resend Payment Email,Znovu poslat e-mail Payment
@@ -2865,7 +2874,6 @@
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py,Against Supplier Invoice {0} dated {1},Proti faktuře dodavatele {0} ze dne {1}
 DocType: Customer,Default Price List,Výchozí Ceník
 apps/erpnext/erpnext/assets/doctype/asset/asset.py,Asset Movement record {0} created,Záznam Asset Pohyb {0} vytvořil
-apps/erpnext/erpnext/utilities/page/leaderboard/leaderboard.js,No items found.,Žádné předměty nenalezeny.
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py,You cannot delete Fiscal Year {0}. Fiscal Year {0} is set as default in Global Settings,Nelze odstranit fiskální rok {0}. Fiskální rok {0} je nastaven jako výchozí v globálním nastavení
 DocType: Share Transfer,Equity/Liability Account,Účet vlastního kapitálu / odpovědnosti
 apps/erpnext/erpnext/setup/doctype/customer_group/customer_group.py,A customer with the same name already exists,Zákazník se stejným jménem již existuje
@@ -2881,6 +2889,7 @@
 apps/erpnext/erpnext/selling/doctype/customer/customer.py,Credit limit has been crossed for customer {0} ({1}/{2}),Kreditní limit byl překročen pro zákazníka {0} ({1} / {2})
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py,Customer required for 'Customerwise Discount',"Zákazník požadoval pro 'Customerwise sleva """
 apps/erpnext/erpnext/config/accounting.py,Update bank payment dates with journals.,"Aktualizujte bankovní platební termín, časopisů."
+,Billed Qty,Účtované množství
 apps/erpnext/erpnext/stock/doctype/item/item_dashboard.py,Pricing,Stanovení ceny
 DocType: Employee,Attendance Device ID (Biometric/RF tag ID),ID docházkového zařízení (Biometric / RF tag ID)
 DocType: Quotation,Term Details,Termín Podrobnosti
@@ -2902,6 +2911,7 @@
 DocType: Share Transfer,Asset Account,Účet aktiv
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js,New release date should be in the future,Nové datum vydání by mělo být v budoucnosti
 DocType: Purchase Invoice,End date of current invoice's period,Datum ukončení doby aktuální faktury je
+apps/erpnext/erpnext/hr/doctype/employee/employee.py,Please setup Employee Naming System in Human Resource &gt; HR Settings,Nastavte prosím systém názvů zaměstnanců v části Lidské zdroje&gt; Nastavení lidských zdrojů
 DocType: Lab Test,Technician Name,Jméno technika
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py,"Cannot ensure delivery by Serial No as \
 					Item {0} is added with and without Ensure Delivery by \
@@ -2909,6 +2919,7 @@
 DocType: Accounts Settings,Unlink Payment on Cancellation of Invoice,Odpojit Platba o zrušení faktury
 DocType: Bank Reconciliation,From Date,Od data
 apps/erpnext/erpnext/hr/doctype/vehicle_log/vehicle_log.py,Current Odometer reading entered should be greater than initial Vehicle Odometer {0},Aktuální stavu km vstoupil by měla být větší než počáteční měřiče ujeté vzdálenosti {0}
+,Purchase Order Items To Be Received or Billed,Položky objednávek k přijetí nebo vyúčtování
 DocType: Restaurant Reservation,No Show,Žádné vystoupení
 apps/erpnext/erpnext/regional/india/utils.py,You must be a registered supplier to generate e-Way Bill,"Chcete-li vygenerovat e-Way Bill, musíte být registrovaným dodavatelem"
 DocType: Shipping Rule Country,Shipping Rule Country,Přepravní Pravidlo Země
@@ -2951,6 +2962,7 @@
 apps/erpnext/erpnext/templates/generators/item/item_add_to_cart.html,View in Cart,Zobrazit Košík
 DocType: Employee Checkin,Shift Actual Start,Shift Skutečný start
 DocType: Tally Migration,Is Day Book Data Imported,Jsou importována data denní knihy
+,Purchase Order Items To Be Received or Billed1,Položky objednávek k přijetí nebo vyúčtování1
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py,Marketing Expenses,Marketingové náklady
 apps/erpnext/erpnext/stock/doctype/pick_list/pick_list.py,{0} units of {1} is not available.,{0} jednotek {1} není k dispozici.
 ,Item Shortage Report,Položka Nedostatek Report
@@ -3175,7 +3187,6 @@
 apps/erpnext/erpnext/public/js/call_popup/call_popup.js,View all issues from {0},Zobrazit všechna čísla od {0}
 DocType: Quality Inspection,MAT-QA-.YYYY.-,MAT-QA-.YYYY.-
 DocType: Quality Meeting Table,Quality Meeting Table,Tabulka setkání kvality
-apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,Nastavte Naming Series pro {0} prostřednictvím Nastavení&gt; Nastavení&gt; Naming Series
 apps/erpnext/erpnext/templates/pages/help.html,Visit the forums,Navštivte fóra
 DocType: Student,Student Mobile Number,Student Číslo mobilního telefonu
 DocType: Item,Has Variants,Má varianty
@@ -3318,6 +3329,7 @@
 DocType: Homepage Section,Section Cards,Karty sekce
 ,Campaign Efficiency,Efektivita kampaně
 DocType: Discussion,Discussion,Diskuse
+apps/erpnext/erpnext/setup/default_energy_point_rules.py,On Sales Order Submission,Při zadávání prodejní objednávky
 DocType: Bank Transaction,Transaction ID,ID transakce
 DocType: Payroll Entry,Deduct Tax For Unsubmitted Tax Exemption Proof,Odpočet daně za nezdařené osvobození od daně
 DocType: Volunteer,Anytime,Kdykoliv
@@ -3325,7 +3337,6 @@
 DocType: Employee Tax Exemption Proof Submission,Employee Tax Exemption Proof Submission,Osvobození od daně z osvobození zaměstnanců
 DocType: Patient,Surgical History,Chirurgická historie
 DocType: Bank Statement Settings Item,Mapped Header,Mapované záhlaví
-apps/erpnext/erpnext/hr/doctype/employee/employee.py,Please setup Employee Naming System in Human Resource &gt; HR Settings,Nastavte prosím systém názvů zaměstnanců v části Lidské zdroje&gt; Nastavení lidských zdrojů
 DocType: Employee,Resignation Letter Date,Rezignace Letter Datum
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Pricing Rules are further filtered based on quantity.,Pravidla pro stanovení sazeb jsou dále filtrována na základě množství.
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py,Please set the Date Of Joining for employee {0},Nastavte prosím datum zapojení pro zaměstnance {0}
@@ -3339,6 +3350,7 @@
 DocType: Bank Statement Settings,Mapped Items,Mapované položky
 DocType: Amazon MWS Settings,IT,TO
 DocType: Chapter,Chapter,Kapitola
+,Fixed Asset Register,Registr dlouhodobých aktiv
 apps/erpnext/erpnext/utilities/user_progress.py,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,Select BOM and Qty for Production,Vyberte BOM a Množství pro výrobu
@@ -3474,7 +3486,6 @@
 apps/erpnext/erpnext/templates/emails/reorder_item.html,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
 apps/erpnext/erpnext/controllers/accounts_controller.py,Account {0} is invalid. Account Currency must be {1},Účet {0} je neplatný. Měna účtu musí být {1}
 apps/erpnext/erpnext/hr/doctype/salary_structure_assignment/salary_structure_assignment.py,From Date {0} cannot be after employee's relieving Date {1},Od data {0} nemůže být po uvolnění zaměstnance Datum {1}
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py,Debit Note {0} has been created automatically,Debetní poznámka {0} byla vytvořena automaticky
 apps/erpnext/erpnext/accounts/doctype/payment_order/payment_order.js,Create Payment Entries,Vytvořit platební záznamy
 DocType: Supplier,Is Internal Supplier,Je interní dodavatel
 DocType: Employee,Create User Permission,Vytvořit oprávnění uživatele
@@ -4033,7 +4044,6 @@
 DocType: Project User,Project Status,Stav projektu
 DocType: UOM,Check this to disallow fractions. (for Nos),"Zkontrolujte, zda to zakázat frakce. (U č)"
 DocType: Student Admission Program,Naming Series (for Student Applicant),Pojmenování Series (pro studentské přihlašovatel)
-apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.py,UOM Conversion factor ({0} -&gt; {1}) not found for item: {2},UOM konverzní faktor ({0} -&gt; {1}) nebyl nalezen pro položku: {2}
 apps/erpnext/erpnext/hr/doctype/retention_bonus/retention_bonus.py,Bonus Payment Date cannot be a past date,Datum splatnosti bonusu nemůže být poslední datum
 DocType: Travel Request,Copy of Invitation/Announcement,Kopie pozvánky / oznámení
 DocType: Practitioner Service Unit Schedule,Practitioner Service Unit Schedule,Pracovní služba Servisní plán
@@ -4201,6 +4211,7 @@
 apps/erpnext/erpnext/utilities/user_progress.py,Setup Company,Nastavení společnosti
 ,Lab Test Report,Zkušební protokol
 DocType: Employee Benefit Application,Employee Benefit Application,Aplikace pro zaměstnance
+apps/erpnext/erpnext/accounts/doctype/invoice_discounting/invoice_discounting.py,Row({0}): {1} is already discounted in {2},Řádek ({0}): {1} je již zlevněn v {2}
 apps/erpnext/erpnext/hr/doctype/additional_salary/additional_salary.py,Additional Salary Component Exists.,Další platová složka existuje.
 DocType: Purchase Invoice,Unregistered,Neregistrováno
 DocType: Student Applicant,Application Date,aplikace Datum
@@ -4279,7 +4290,6 @@
 DocType: Journal Entry,Accounting Entries,Účetní záznamy
 DocType: Job Card Time Log,Job Card Time Log,Časový záznam karty práce
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,"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;."
-apps/erpnext/erpnext/education/doctype/instructor/instructor.py,Please setup Instructor Naming System in Education &gt; Education Settings,Nastavte prosím Pojmenovací systém instruktorů v sekci Vzdělávání&gt; Nastavení vzdělávání
 DocType: Journal Entry,Paid Loan,Placený úvěr
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py,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
@@ -4296,7 +4306,6 @@
 apps/erpnext/erpnext/templates/pages/projects.html,No time sheets,Žádné pracovní výkazy
 DocType: GoCardless Mandate,GoCardless Customer,Zákazník GoCardless
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py,Leave Type {0} cannot be carry-forwarded,Nechte typ {0} nelze provádět předávány
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Item Code &gt; Item Group &gt; Brand,Kód položky&gt; Skupina položek&gt; Značka
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py,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ě
 DocType: Leave Encashment,Payroll,Mzdy
@@ -4411,7 +4420,6 @@
 DocType: Stock Ledger Entry,Actual Qty After Transaction,Skutečné Množství Po transakci
 ,Pending SO Items For Purchase Request,"Do doby, než SO položky k nákupu Poptávka"
 apps/erpnext/erpnext/education/doctype/student_admission/student_admission.py,Student Admissions,Student Přijímací
-apps/erpnext/erpnext/accounts/party.py,{0} {1} is disabled,{0} {1} je zakázán
 DocType: Supplier,Billing Currency,Fakturace Měna
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py,Extra Large,Extra Velké
 DocType: Loan,Loan Application,Žádost o půjčku
@@ -4488,7 +4496,6 @@
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py,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/accounts/doctype/accounting_dimension/accounting_dimension.py,Creating Dimensions...,Vytváření dimenzí ...
 apps/erpnext/erpnext/education/doctype/student_group_creation_tool/student_group_creation_tool.py,Student Group Name is mandatory in row {0},Student Název skupiny je povinné v řadě {0}
-DocType: Customer Credit Limit,Bypass credit limit_check,Obejít kreditní limit limit_check
 DocType: Homepage,Products to be shown on website homepage,"Produkty, které mají být uvedeny na internetových stránkách domovské"
 DocType: HR Settings,Password Policy,Zásady hesla
 apps/erpnext/erpnext/setup/doctype/customer_group/customer_group.js,This is a root customer group and cannot be edited.,"To je kořen skupiny zákazníků, a nelze upravovat."
@@ -4792,6 +4799,7 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py,Row {0}: Advance against Customer must be credit,Řádek {0}: Advance proti zákazník musí být úvěr
 DocType: Quality Meeting,Quality Meeting,Kvalitní setkání
 apps/erpnext/erpnext/accounts/doctype/account/account.js,Non-Group to Group,Non-skupiny ke skupině
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,Nastavte Naming Series pro {0} prostřednictvím Nastavení&gt; Nastavení&gt; Naming Series
 DocType: Employee,ERPNext User,ERPN další uživatel
 apps/erpnext/erpnext/education/doctype/student_group_creation_tool/student_group_creation_tool.py,Batch is mandatory in row {0},Dávka je povinná v řádku {0}
 DocType: Company,Default Buying Terms,Výchozí nákupní podmínky
@@ -5086,6 +5094,7 @@
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py,No {0} found for Inter Company Transactions.,Nebylo nalezeno {0} pro interní transakce společnosti.
 DocType: Travel Itinerary,Rented Car,Pronajaté auto
 apps/erpnext/erpnext/public/js/hub/components/profile_dialog.js,About your Company,O vaší společnosti
+apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.js,Show Stock Ageing Data,Zobrazit údaje o stárnutí populace
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py,Credit To account must be a Balance Sheet account,Připsat na účet musí být účtu Rozvaha
 DocType: Donor,Donor,Dárce
 DocType: Global Defaults,Disable In Words,Zakázat ve slovech
@@ -5100,8 +5109,10 @@
 DocType: Practitioner Schedule,Schedule Name,Název plánu
 apps/erpnext/erpnext/regional/doctype/gstr_3b_report/gstr_3b_report.py,Please enter GSTIN and state for the Company Address {0},Zadejte GSTIN a uveďte adresu společnosti {0}
 DocType: Currency Exchange,For Buying,Pro nákup
+apps/erpnext/erpnext/setup/default_energy_point_rules.py,On Purchase Order Submission,Při zadávání objednávky
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js,Add All Suppliers,Přidat všechny dodavatele
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py,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/accounts/doctype/pricing_rule/pricing_rule.js,Customer &gt; Customer Group &gt; Territory,Zákazník&gt; Skupina zákazníků&gt; Území
 DocType: Tally Migration,Parties,Strany
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js,Browse BOM,Procházet kusovník
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py,Secured Loans,Zajištěné úvěry
@@ -5133,6 +5144,7 @@
 apps/erpnext/erpnext/stock/doctype/item_alternative/item_alternative.py,Not allow to set alternative item for the item {0},Neumožňuje nastavit alternativní položku pro položku {0}
 apps/erpnext/erpnext/hr/doctype/leave_block_list/leave_block_list.py,Date is repeated,Datum se opakuje
 apps/erpnext/erpnext/accounts/print_format/payment_receipt_voucher/payment_receipt_voucher.html,Authorized Signatory,Prokurista
+apps/erpnext/erpnext/education/doctype/instructor/instructor.py,Please setup Instructor Naming System in Education &gt; Education Settings,Nastavte prosím Pojmenovací systém instruktorů v sekci Vzdělávání&gt; Nastavení vzdělávání
 apps/erpnext/erpnext/regional/doctype/gstr_3b_report/gstr_3b_report.html,Net ITC Available(A) - (B),Dostupné ITC (A) - (B)
 apps/erpnext/erpnext/education/doctype/fee_schedule/fee_schedule.js,Create Fees,Vytvořte poplatky
 DocType: Project,Total Purchase Cost (via Purchase Invoice),Celkové pořizovací náklady (přes nákupní faktury)
@@ -5153,6 +5165,7 @@
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.js,Message Sent,Zpráva byla odeslána
 apps/erpnext/erpnext/accounts/doctype/account/account.py,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/assets/report/fixed_asset_register/fixed_asset_register.py,Vendor Name,Jméno prodejce
 DocType: Quiz Result,Wrong,Špatně
 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)
@@ -5395,6 +5408,7 @@
 DocType: Stock Settings,Auto Material Request,Auto materiálu Poptávka
 DocType: Woocommerce Settings,API consumer secret,API spotřebitelské tajemství
 DocType: Delivery Note Item,Available Batch Qty at From Warehouse,K dispozici šarže Množství na Od Warehouse
+,Received Qty Amount,Přijatá částka Množství
 DocType: Salary Slip,Gross Pay - Total Deduction - Loan Repayment,Hrubé mzdy - Total dedukce - splátky
 DocType: Bank Account,Last Integration Date,Datum poslední integrace
 DocType: Expense Claim,Expense Taxes and Charges,Nákladové daně a poplatky
@@ -5853,6 +5867,8 @@
 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,Please select Qty against item {0},Zvolte prosím množství v položce {0}
+apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py,Latest Age,Pozdní fáze
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js,Transfer Material to Supplier,Přeneste materiál Dodavateli
 apps/erpnext/erpnext/hr/report/loan_repayment/loan_repayment.py,EMI,EMI
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py,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
@@ -5876,7 +5892,6 @@
 apps/erpnext/erpnext/hr/doctype/employee_benefit_application/employee_benefit_application.py,"An amount of {0} already claimed for the component {1},\
 						 set the amount equal or greater than {2}","Část {0} již byla nárokována pro složku {1}, \ nastavte částku rovnající se nebo větší než {2}"
 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
 DocType: BOM Update Tool,The new BOM after replacement,Nový BOM po změně
 ,Point of Sale,Místo Prodeje
@@ -5996,7 +6011,6 @@
 DocType: Purchase Order Item,Blanket Order Rate,Dekorační objednávka
 ,Customer Ledger Summary,Shrnutí účetní knihy zákazníka
 apps/erpnext/erpnext/hooks.py,Certification,Osvědčení
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js,Are you sure you want to make debit note?,"Jste si jisti, že si chcete zapsat dluhopis?"
 DocType: Bank Guarantee,Clauses and Conditions,Doložky a podmínky
 DocType: Serial No,Creation Document Type,Tvorba Typ dokumentu
 DocType: Amazon MWS Settings,ES,ES
@@ -6034,8 +6048,6 @@
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py,Financial Services,Finanční služby
 DocType: Student Sibling,Student ID,Student ID
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.js,For Quantity must be greater than zero,Pro množství musí být větší než nula
-apps/erpnext/erpnext/hr/doctype/employee_transfer/employee_transfer.py,"Please delete the Employee <a href=""#Form/Employee/{0}"">{0}</a>\
-					to cancel this document","Chcete-li tento dokument zrušit, prosím odstraňte zaměstnance <a href=""#Form/Employee/{0}"">{0}</a> \"
 apps/erpnext/erpnext/config/projects.py,Types of activities for Time Logs,Typy činností pro Time Záznamy
 DocType: Opening Invoice Creation Tool,Sales,Prodej
 DocType: Stock Entry Detail,Basic Amount,Základní částka
@@ -6114,6 +6126,7 @@
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py,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,Send Supplier Emails,Poslat Dodavatel e-maily
+DocType: Asset Movement,ACC-ASM-.YYYY.-,ACC-ASM-.RRRR.-
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py,"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
 apps/erpnext/erpnext/hr/doctype/employee_onboarding/employee_onboarding.py,Submit this to create the Employee record,"Chcete-li vytvořit záznam zaměstnance, odešlete jej"
@@ -6191,7 +6204,6 @@
 DocType: Sales Team,Contact No.,Kontakt Číslo
 apps/erpnext/erpnext/templates/includes/cart/cart_address.html,Billing Address is same as Shipping Address,Fakturační adresa je stejná jako dodací adresa
 DocType: Bank Reconciliation,Payment Entries,Platební Příspěvky
-apps/erpnext/erpnext/erpnext_integrations/doctype/shopify_settings/shopify_settings.py,Access token or Shopify URL missing,Přístupový token nebo Adresa URL nákupu chybí
 DocType: Location,Latitude,Zeměpisná šířka
 DocType: Work Order,Scrap Warehouse,šrot Warehouse
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py,"Warehouse required at Row No {0}, please set default warehouse for the item {1} for the company {2}","Chcete-li požadovat sklad v řádku č. {0}, nastavte výchozí sklad pro položku {1} pro firmu {2}"
@@ -6234,7 +6246,6 @@
 DocType: Job Offer Term,Value / Description,Hodnota / Popis
 apps/erpnext/erpnext/controllers/accounts_controller.py,"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ě
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js,Are you sure you want to make credit note?,Opravdu chcete provést dobropis?
 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,Debit and Credit not equal for {0} #{1}. Difference is {2}.,Debetní a kreditní nerovná za {0} # {1}. Rozdíl je v tom {2}.
@@ -6359,6 +6370,7 @@
 DocType: Purchase Invoice,Taxes and Charges Added,Daně a poplatky přidané
 apps/erpnext/erpnext/assets/doctype/asset/asset.py,Depreciation Row {0}: Next Depreciation Date cannot be before Available-for-use Date,Odpisový řádek {0}: Další datum odpisování nemůže být před datem k dispozici
 ,Sales Funnel,Prodej Nálevka
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Item Code &gt; Item Group &gt; Brand,Kód položky&gt; Skupina položek&gt; Značka
 apps/erpnext/erpnext/setup/doctype/company/company.py,Abbreviation is mandatory,Zkratka je povinná
 DocType: Project,Task Progress,Pokrok úkol
 apps/erpnext/erpnext/templates/includes/navbar/navbar_items.html,Cart,Vozík
@@ -6603,6 +6615,7 @@
 DocType: Employee Grade,Employee Grade,Pracovní zařazení
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py,Piecework,Úkolová práce
 DocType: GSTR 3B Report,June,červen
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Supplier &gt; Supplier Type,Dodavatel&gt; Typ dodavatele
 DocType: Share Balance,From No,Od č
 DocType: Shift Type,Early Exit Grace Period,Časné ukončení odkladu
 DocType: Task,Actual Time (in Hours),Skutečná doba (v hodinách)
@@ -6887,6 +6900,7 @@
 DocType: Warehouse,Warehouse Name,Název Skladu
 DocType: Naming Series,Select Transaction,Vybrat Transaction
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py,Please enter Approving Role or Approving User,Zadejte Schvalování role nebo Schvalování Uživatel
+apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.py,UOM Conversion factor ({0} -&gt; {1}) not found for item: {2},UOM konverzní faktor ({0} -&gt; {1}) nebyl nalezen pro položku: {2}
 apps/erpnext/erpnext/support/doctype/service_level_agreement/service_level_agreement.py,Service Level Agreement with Entity Type {0} and Entity {1} already exists.,Dohoda o úrovni služeb s typem entity {0} a entitou {1} již existuje.
 DocType: Journal Entry,Write Off Entry,Odepsat Vstup
 DocType: BOM,Rate Of Materials Based On,Ocenění materiálů na bázi
@@ -7077,6 +7091,7 @@
 DocType: Quality Inspection Reading,Quality Inspection Reading,Kvalita Kontrola Reading
 apps/erpnext/erpnext/stock/doctype/stock_settings/stock_settings.py,`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/stock/report/stock_balance/stock_balance.py,Earliest Age,Nejstarší věk
 apps/erpnext/erpnext/utilities/user_progress.py,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."
 DocType: Quality Goal,Revision,Revize
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js,Healthcare Services,Zdravotnické služby
@@ -7120,6 +7135,7 @@
 apps/erpnext/erpnext/healthcare/doctype/patient_encounter/patient_encounter.js,Schedule Discharge,Plán výtoku
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py,Cheques and Deposits incorrectly cleared,Šeky a Vklady nesprávně vymazány
 DocType: Homepage Section Card,Homepage Section Card,Karta sekce domovské stránky
+,Amount To Be Billed,Částka k vyúčtování
 apps/erpnext/erpnext/accounts/doctype/account/account.py,Account {0}: You can not assign itself as parent account,Účet {0}: nelze přiřadit sebe jako nadřazený účet
 DocType: Purchase Invoice Item,Price List Rate,Ceník Rate
 apps/erpnext/erpnext/utilities/activation.py,Create customer quotes,Vytvořit citace zákazníků
@@ -7172,6 +7188,7 @@
 DocType: Supplier Scorecard Criteria,Supplier Scorecard Criteria,Kritéria dodavatele skóre karty
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py,Please select Start Date and End Date for Item {0},"Prosím, vyberte Počáteční datum a koncové datum pro položku {0}"
 DocType: Maintenance Schedule,MAT-MSH-.YYYY.-,MAT-MSH-.YYYY.-
+,Amount to Receive,Částka k přijetí
 apps/erpnext/erpnext/education/doctype/student_group_creation_tool/student_group_creation_tool.py,Course is mandatory in row {0},Samozřejmě je povinné v řadě {0}
 apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py,From date can not be greater than than To date,Od data nemůže být větší než Do dne
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py,To date cannot be before from date,K dnešnímu dni nemůže být dříve od data
@@ -7420,7 +7437,6 @@
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js,BOM and Manufacturing Quantity are required,BOM a výroba množství jsou povinné
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js,Ageing Range 2,Stárnutí rozsah 2
 DocType: SG Creation Tool Course,Max Strength,Max Síla
-apps/erpnext/erpnext/accounts/doctype/account/account.py,"Account {0} already exists in child company {1}. The following fields have different values, they should be same:<ul><li>{2}</li></ul>","Účet {0} již existuje v podřízené společnosti {1}. Následující pole mají různé hodnoty, měla by být stejná: <ul><li> {2} </li></ul>"
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py,Installing presets,Instalace předvoleb
 DocType: Fee Schedule,EDU-FSH-.YYYY.-,EDU-FSH-.YYYY.-
 apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js,No Delivery Note selected for Customer {},Pro zákazníka nebyl vybrán žádný zákazník {}
@@ -7628,6 +7644,7 @@
 DocType: Delivery Note,Print Without Amount,Tisknout bez Částka
 apps/erpnext/erpnext/accounts/report/asset_depreciation_ledger/asset_depreciation_ledger.py,Depreciation Date,odpisy Datum
 ,Work Orders in Progress,Pracovní příkazy v procesu
+DocType: Customer Credit Limit,Bypass Credit Limit Check,Překonejte kontrolu úvěrového limitu
 DocType: Issue,Support Team,Tým podpory
 apps/erpnext/erpnext/stock/report/batch_item_expiry_status/batch_item_expiry_status.py,Expiry (In Days),Doba použitelnosti (ve dnech)
 DocType: Appraisal,Total Score (Out of 5),Celkové skóre (Out of 5)
@@ -7811,6 +7828,7 @@
 DocType: Sales Invoice,Customer GSTIN,Zákazník GSTIN
 DocType: Crop Cycle,List of diseases detected on the field. When selected it'll automatically add a list of tasks to deal with the disease ,"Seznam onemocnění zjištěných v terénu. Když je vybráno, automaticky přidá seznam úkolů, které se mají vypořádat s tímto onemocněním"
 apps/erpnext/erpnext/manufacturing/page/bom_comparison_tool/bom_comparison_tool.js,BOM 1,Kus 1
+apps/erpnext/erpnext/assets/report/fixed_asset_register/fixed_asset_register.py,Asset Id,ID majetku
 apps/erpnext/erpnext/healthcare/doctype/healthcare_service_unit/healthcare_service_unit.js,This is a root healthcare service unit and cannot be edited.,Jedná se o základní službu zdravotnické služby a nelze ji editovat.
 DocType: Asset Repair,Repair Status,Stav opravy
 apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.js,"Requested Qty: Quantity requested for purchase, but not ordered.","Požadované množství: Množství požádalo o koupi, ale nenařídil."
diff --git a/erpnext/translations/da.csv b/erpnext/translations/da.csv
index 8536ae5..4f7b189 100644
--- a/erpnext/translations/da.csv
+++ b/erpnext/translations/da.csv
@@ -289,7 +289,6 @@
 DocType: Loan,Repay Over Number of Periods,Tilbagebetale over antallet af perioder
 apps/erpnext/erpnext/manufacturing/report/bom_stock_report/bom_stock_report.py,Quantity to Produce can not be less than Zero,"Mængden, der skal produceres, kan ikke være mindre end Nul"
 DocType: Stock Entry,Additional Costs,Yderligere omkostninger
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Customer &gt; Customer Group &gt; Territory,Kunde&gt; Kundegruppe&gt; Territorium
 apps/erpnext/erpnext/accounts/doctype/account/account.py,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
@@ -586,6 +585,7 @@
 DocType: Healthcare Settings,Create documents for sample collection,Opret dokumenter til prøveindsamling
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py,Payment against {0} {1} cannot be greater than Outstanding Amount {2},Betaling mod {0} {1} kan ikke være større end udestående beløb {2}
 apps/erpnext/erpnext/patches/v11_0/add_healthcare_service_unit_tree_root.py,All Healthcare Service Units,Alle sundhedsvæsener
+apps/erpnext/erpnext/setup/default_energy_point_rules.py,On Converting Opportunity,Om konvertering af mulighed
 DocType: Bank Account,Address HTML,Adresse HTML
 DocType: Lead,Mobile No.,Mobiltelefonnr.
 apps/erpnext/erpnext/selling/doctype/pos_closing_voucher/closing_voucher_details.html,Mode of Payments,Betalingsmåde
@@ -650,7 +650,6 @@
 DocType: Accounting Dimension,Dimension Name,Dimension Navn
 apps/erpnext/erpnext/healthcare/setup.py,Resistant,Resistente
 apps/erpnext/erpnext/hotels/doctype/hotel_room_reservation/hotel_room_reservation.py,Please set Hotel Room Rate on {},Indstil hotelpris på {}
-apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py,Please setup numbering series for Attendance via Setup &gt; Numbering Series,Indstil nummerserier for deltagelse via Opsætning&gt; Nummereringsserie
 DocType: Journal Entry,Multi Currency,Multi Valuta
 DocType: Bank Statement Transaction Invoice Item,Invoice Type,Fakturatype
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py,Valid from date must be less than valid upto date,Gyldig fra dato skal være mindre end gyldig indtil dato
@@ -765,6 +764,7 @@
 apps/erpnext/erpnext/accounts/page/pos/pos.js,Create a new Customer,Opret ny kunde
 apps/erpnext/erpnext/non_profit/report/expiring_memberships/expiring_memberships.py,Expiring On,Udløbsdato
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,"If multiple Pricing Rules continue to prevail, users are asked to set Priority manually to resolve conflict.","Hvis flere Priser Regler fortsat gældende, er brugerne bedt om at indstille prioritet manuelt for at løse konflikter."
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js,Purchase Return,Indkøb Return
 apps/erpnext/erpnext/utilities/activation.py,Create Purchase Orders,Opret indkøbsordrer
 ,Purchase Register,Indkøb Register
 apps/erpnext/erpnext/healthcare/doctype/patient/patient.py,Patient not found,Patient ikke fundet
@@ -780,7 +780,6 @@
 DocType: Location,Area UOM,Område UOM
 apps/erpnext/erpnext/manufacturing/doctype/workstation/workstation.py,Workstation is closed on the following dates as per Holiday List: {0},Workstation er lukket på følgende datoer ifølge helligdagskalenderen: {0}
 apps/erpnext/erpnext/selling/page/sales_funnel/sales_funnel.py,Opportunities,Salgsmuligheder
-apps/erpnext/erpnext/www/all-products/index.html,Clear filters,Ryd filtre
 DocType: Lab Test Template,Single,Enkeltværelse
 DocType: Compensatory Leave Request,Work From Date,Arbejde fra dato
 DocType: Salary Slip,Total Loan Repayment,Samlet lån til tilbagebetaling
@@ -823,6 +822,7 @@
 DocType: Account,Old Parent,Gammel Parent
 apps/erpnext/erpnext/education/doctype/program_enrollment_tool/program_enrollment_tool.py,Mandatory field - Academic Year,Obligatorisk felt - skoleår
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py,{0} {1} is not associated with {2} {3},{0} {1} er ikke forbundet med {2} {3}
+DocType: Opportunity,Converted By,Konverteret af
 apps/erpnext/erpnext/public/js/hub/components/ReviewArea.vue,You need to login as a Marketplace User before you can add any reviews.,"Du skal logge ind som Marketplace-bruger, før du kan tilføje anmeldelser."
 apps/erpnext/erpnext/manufacturing/doctype/job_card/job_card.py,Row {0} : Operation is required against the raw material item {1},Række {0}: Drift er påkrævet mod råvareelementet {1}
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py,Please set default payable account for the company {0},Indtast venligst standardbetalt konto for virksomheden {0}
@@ -848,6 +848,8 @@
 DocType: BOM,Work Order,Arbejdsordre
 DocType: Sales Invoice,Total Qty,Antal i alt
 apps/erpnext/erpnext/education/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py,Guardian2 Email ID,Guardian2 Email ID
+apps/erpnext/erpnext/hr/doctype/employee_transfer/employee_transfer.py,"Please delete the Employee <a href=""#Form/Employee/{0}"">{0}</a>\
+					to cancel this document","Slet medarbejderen <a href=""#Form/Employee/{0}"">{0}</a> \ for at annullere dette dokument"
 DocType: Item,Show in Website (Variant),Vis på hjemmesiden (Variant)
 DocType: Employee,Health Concerns,Sundhedsmæssige betænkeligheder
 DocType: Payroll Entry,Select Payroll Period,Vælg Lønperiode
@@ -907,7 +909,6 @@
 DocType: Codification Table,Codification Table,Kodifikationstabel
 DocType: Timesheet Detail,Hrs,timer
 apps/erpnext/erpnext/manufacturing/page/bom_comparison_tool/bom_comparison_tool.js,Changes in {0},Ændringer i {0}
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js,Please select Company,Vælg firma
 DocType: Employee Skill,Employee Skill,Medarbejderfærdighed
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.js,Difference Account,Differencekonto
 DocType: Pricing Rule,Discount on Other Item,Rabat på anden vare
@@ -975,6 +976,7 @@
 DocType: BOM,Operating Cost,Driftsomkostninger
 DocType: Crop,Produced Items,Producerede varer
 DocType: Bank Statement Transaction Entry,Match Transaction to Invoices,Match transaktion til fakturaer
+apps/erpnext/erpnext/erpnext_integrations/exotel_integration.py,Error in Exotel incoming call,Fejl i Exotel indgående opkald
 DocType: Sales Order Item,Gross Profit,Gross Profit
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js,Unblock Invoice,Fjern blokering af faktura
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py,Increment cannot be 0,Tilvækst kan ikke være 0
@@ -1188,6 +1190,7 @@
 DocType: Activity Cost,Activity Type,Aktivitetstype
 DocType: Request for Quotation,For individual supplier,Til individuel leverandør
 DocType: BOM Operation,Base Hour Rate(Company Currency),Basistimesats (firmavaluta)
+,Qty To Be Billed,"Antal, der skal faktureres"
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py,Delivered Amount,Leveres Beløb
 apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.js,Reserved Qty for Production: Raw materials quantity to make manufacturing items.,Reserveret antal til produktion: Råvaremængde til fremstilling af produktionsartikler.
 DocType: Loyalty Point Entry Redemption,Redemption Date,Indløsningsdato
@@ -1306,7 +1309,7 @@
 DocType: Sales Invoice,Commission Rate (%),Provisionssats (%)
 apps/erpnext/erpnext/education/doctype/student_group/student_group.py,Please select Program,Vælg venligst Program
 DocType: Project,Estimated Cost,Anslåede omkostninger
-DocType: Request for Quotation,Link to material requests,Link til materialeanmodninger
+DocType: Supplier Quotation,Link to material requests,Link til materialeanmodninger
 apps/erpnext/erpnext/public/js/hub/pages/Publish.vue,Publish,Offentliggøre
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py,Aerospace,Luftfart
 ,Fichier des Ecritures Comptables [FEC],Fichier des Ecritures Comptables [FEC]
@@ -1319,6 +1322,7 @@
 apps/erpnext/erpnext/utilities/transaction_base.py,Invalid Posting Time,Ugyldig postetid
 DocType: Salary Component,Condition and Formula,Tilstand og formel
 DocType: Lead,Campaign Name,Kampagne Navn
+apps/erpnext/erpnext/setup/default_energy_point_rules.py,On Task Completion,Ved færdiggørelse af opgaver
 apps/erpnext/erpnext/hr/doctype/compensatory_leave_request/compensatory_leave_request.py,There is no leave period in between {0} and {1},Der er ingen ledig periode mellem {0} og {1}
 DocType: Fee Validity,Healthcare Practitioner,Sundhedspleje
 DocType: Hotel Room,Capacity,Kapacitet
@@ -1663,7 +1667,6 @@
 DocType: Quality Feedback Template,Quality Feedback Template,Kvalitetsfeedback-skabelon
 apps/erpnext/erpnext/config/education.py,LMS Activity,LMS-aktivitet
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py,Internet Publishing,Internet Publishing
-DocType: Prescription Duration,Number,Nummer
 apps/erpnext/erpnext/accounts/doctype/opening_invoice_creation_tool/opening_invoice_creation_tool.js,Creating {0} Invoice,Oprettelse af {0} faktura
 DocType: Medical Code,Medical Code Standard,Medical Code Standard
 DocType: Soil Texture,Clay Composition (%),Ler sammensætning (%)
@@ -1738,6 +1741,7 @@
 DocType: Support Settings,Get Started Sections,Kom i gang sektioner
 DocType: Lead,CRM-LEAD-.YYYY.-,CRM-LEAD-.YYYY.-
 DocType: Invoice Discounting,Sanctioned,sanktioneret
+,Base Amount,Basisbeløb
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.js,Total Contribution Amount: {0},Samlet bidragsbeløb: {0}
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py,Row #{0}: Please specify Serial No for Item {1},Række # {0}: Angiv serienummer for vare {1}
 DocType: Payroll Entry,Salary Slips Submitted,Lønssedler indsendes
@@ -1955,6 +1959,7 @@
 apps/erpnext/erpnext/utilities/user_progress.py,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.
 DocType: Accounting Dimension,Dimension Defaults,Dimensionstandarder
 apps/erpnext/erpnext/crm/report/prospects_engaged_but_not_converted/prospects_engaged_but_not_converted.js,Minimum Lead Age (Days),Mindste levealder (dage)
+apps/erpnext/erpnext/assets/report/fixed_asset_register/fixed_asset_register.py,Available For Use Date,Tilgængelig til brugsdato
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py,All BOMs,Alle styklister
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js,Create Inter Company Journal Entry,Oprettelse af Inter Company-journal
 DocType: Company,Parent Company,Moderselskab
@@ -2019,6 +2024,7 @@
 ,IRS 1099,IRS 1099
 DocType: Salary Slip,Leave Without Pay,Fravær uden løn
 DocType: Payment Request,Outward,Udgående
+apps/erpnext/erpnext/setup/default_energy_point_rules.py,On {0} Creation,Ved {0} Oprettelse
 apps/erpnext/erpnext/regional/doctype/gstr_3b_report/gstr_3b_report.html,State/UT Tax,Stat / UT-skat
 ,Trial Balance for Party,Prøvebalance for Selskab
 ,Gross and Net Profit Report,Brutto- og resultatopgørelse
@@ -2134,6 +2140,7 @@
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js,Make Stock Entry,Foretag lagerindtastning
 DocType: Hotel Room Reservation,Hotel Reservation User,Hotel Reservation Bruger
 apps/erpnext/erpnext/projects/doctype/project/project.js,Set Status,Indstil status
+apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py,Please setup numbering series for Attendance via Setup &gt; Numbering Series,Indstil nummerserier for deltagelse via Opsætning&gt; Nummereringsserie
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py,Please select prefix first,Vælg venligst præfiks først
 DocType: Contract,Fulfilment Deadline,Opfyldelsesfrist
 apps/erpnext/erpnext/public/js/hub/pages/Home.vue,Near you,I nærheden af dig
@@ -2149,6 +2156,7 @@
 DocType: Announcement,All Students,Alle studerende
 apps/erpnext/erpnext/assets/doctype/asset/asset.py,Item {0} must be a non-stock item,Vare {0} skal være en ikke-lagervare
 apps/erpnext/erpnext/stock/doctype/batch/batch.js,View Ledger,Se kladde
+DocType: Cost Center,Lft,LFT
 DocType: Grading Scale,Intervals,Intervaller
 DocType: Bank Statement Transaction Entry,Reconciled Transactions,Afstemte transaktioner
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py,Earliest,Tidligste
@@ -2264,6 +2272,7 @@
 apps/erpnext/erpnext/hr/doctype/employee_benefit_application/employee_benefit_application.py,As per your assigned Salary Structure you cannot apply for benefits,I henhold til din tildelte lønstruktur kan du ikke søge om ydelser
 apps/erpnext/erpnext/stock/doctype/item/item.py,Website Image should be a public file or website URL,Website Billede bør være en offentlig fil eller webadresse
 DocType: Purchase Invoice Item,BOM,Stykliste
+apps/erpnext/erpnext/stock/doctype/item/item.py,Duplicate entry in Manufacturers table,Duplikatindtastning i tabellen Producenter
 apps/erpnext/erpnext/setup/doctype/item_group/item_group.js,This is a root item group and cannot be edited.,Dette er en rod-varegruppe og kan ikke redigeres.
 apps/erpnext/erpnext/accounts/doctype/account/account.js,Merge,Fusionere
 DocType: Journal Entry Account,Purchase Order,Indkøbsordre
@@ -2408,7 +2417,6 @@
 DocType: Asset,Depreciation Schedules,Afskrivninger Tidsplaner
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.js,Create Sales Invoice,Opret salgsfaktura
 apps/erpnext/erpnext/regional/doctype/gstr_3b_report/gstr_3b_report.html,Ineligible ITC,Ikke-støtteberettiget ITC
-apps/erpnext/erpnext/erpnext_integrations/doctype/shopify_settings/shopify_settings.py,"Support for public app is deprecated. Please setup private app, for more details refer user manual","Støtten til offentlig app er afskediget. Venligst opsæt privat app, for flere detaljer, se brugervejledningen"
 DocType: Task,Dependent Tasks,Afhængige opgaver
 apps/erpnext/erpnext/regional/report/gstr_1/gstr_1.py,Following accounts might be selected in GST Settings:,Følgende konti kan vælges i GST-indstillinger:
 apps/erpnext/erpnext/manufacturing/report/bom_stock_report/bom_stock_report.js,Quantity to Produce,Mængde at fremstille
@@ -2660,6 +2668,7 @@
 DocType: Water Analysis,Container,Beholder
 apps/erpnext/erpnext/regional/report/gstr_1/gstr_1.py,Please set valid GSTIN No. in Company Address,Angiv et gyldigt GSTIN-nr. I firmaets adresse
 apps/erpnext/erpnext/education/utils.py,Student {0} - {1} appears Multiple times in row {2} & {3},Student {0} - {1} forekommer flere gange i træk {2} &amp; {3}
+apps/erpnext/erpnext/selling/doctype/customer/customer.py,Following fields are mandatory to create address:,Følgende felter er obligatoriske for at oprette adresse:
 DocType: Item Alternative,Two-way,To-vejs
 DocType: Item,Manufacturers,producenter
 apps/erpnext/erpnext/accounts/deferred_revenue.py,Error while processing deferred accounting for {0},Fejl under behandling af udskudt regnskab for {0}
@@ -2734,9 +2743,9 @@
 DocType: Employee,HR-EMP-,HR-EMP-
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py,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: Quality Meeting Minutes,Quality Meeting Minutes,Mødemøde for kvalitet
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Supplier &gt; Supplier Type,Leverandør&gt; Leverandørtype
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py,Employee Referral,Medarbejder Henvisning
 DocType: Student Group,Set 0 for no limit,Sæt 0 for ingen grænse
+DocType: Cost Center,rgt,RGT
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py,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."
 DocType: Customer,Primary Address and Contact Detail,Primæradresse og kontaktdetaljer
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.js,Resend Payment Email,Gensend Betaling E-mail
@@ -2846,7 +2855,6 @@
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py,Against Supplier Invoice {0} dated {1},Imod Leverandør Faktura {0} dateret {1}
 DocType: Customer,Default Price List,Standardprisliste
 apps/erpnext/erpnext/assets/doctype/asset/asset.py,Asset Movement record {0} created,Aktiver flytnings rekord {0} oprettet
-apps/erpnext/erpnext/utilities/page/leaderboard/leaderboard.js,No items found.,Ingen emner fundet.
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py,You cannot delete Fiscal Year {0}. Fiscal Year {0} is set as default in Global Settings,Du kan ikke slette Regnskabsår {0}. Regnskabsår {0} er indstillet som standard i Globale indstillinger
 DocType: Share Transfer,Equity/Liability Account,Egenkapital / Ansvarskonto
 apps/erpnext/erpnext/setup/doctype/customer_group/customer_group.py,A customer with the same name already exists,En kunde med samme navn eksisterer allerede
@@ -2862,6 +2870,7 @@
 apps/erpnext/erpnext/selling/doctype/customer/customer.py,Credit limit has been crossed for customer {0} ({1}/{2}),Kreditgrænsen er overskredet for kunden {0} ({1} / {2})
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py,Customer required for 'Customerwise Discount',Kunden kræves for &#39;Customerwise Discount&#39;
 apps/erpnext/erpnext/config/accounting.py,Update bank payment dates with journals.,Opdatér bankbetalingsdatoerne med kladderne.
+,Billed Qty,Faktureret antal
 apps/erpnext/erpnext/stock/doctype/item/item_dashboard.py,Pricing,Priser
 DocType: Employee,Attendance Device ID (Biometric/RF tag ID),Deltagelsesenheds-id (biometrisk / RF-tag-id)
 DocType: Quotation,Term Details,Betingelsesdetaljer
@@ -2883,6 +2892,7 @@
 DocType: Share Transfer,Asset Account,Aktiver konto
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js,New release date should be in the future,Ny udgivelsesdato skulle være i fremtiden
 DocType: Purchase Invoice,End date of current invoice's period,Slutdato for aktuelle faktura menstruation
+apps/erpnext/erpnext/hr/doctype/employee/employee.py,Please setup Employee Naming System in Human Resource &gt; HR Settings,Indstil venligst medarbejdernavningssystem i menneskelig ressource&gt; HR-indstillinger
 DocType: Lab Test,Technician Name,Tekniker navn
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py,"Cannot ensure delivery by Serial No as \
 					Item {0} is added with and without Ensure Delivery by \
@@ -2890,6 +2900,7 @@
 DocType: Accounts Settings,Unlink Payment on Cancellation of Invoice,Fjern link Betaling ved Annullering af faktura
 DocType: Bank Reconciliation,From Date,Fra dato
 apps/erpnext/erpnext/hr/doctype/vehicle_log/vehicle_log.py,Current Odometer reading entered should be greater than initial Vehicle Odometer {0},Aktuel kilometerstand indtastet bør være større end Køretøjets indledende kilometerstand {0}
+,Purchase Order Items To Be Received or Billed,"Køb ordreemner, der skal modtages eller faktureres"
 DocType: Restaurant Reservation,No Show,Ingen Vis
 apps/erpnext/erpnext/regional/india/utils.py,You must be a registered supplier to generate e-Way Bill,Du skal være en registreret leverandør for at generere e-Way Bill
 DocType: Shipping Rule Country,Shipping Rule Country,Forsendelsesregelland
@@ -2932,6 +2943,7 @@
 apps/erpnext/erpnext/templates/generators/item/item_add_to_cart.html,View in Cart,Se i indkøbskurven
 DocType: Employee Checkin,Shift Actual Start,Skift faktisk start
 DocType: Tally Migration,Is Day Book Data Imported,Er dagbogsdata importeret
+,Purchase Order Items To Be Received or Billed1,"Køb ordreemner, der skal modtages eller faktureres1"
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py,Marketing Expenses,Markedsføringsomkostninger
 apps/erpnext/erpnext/stock/doctype/pick_list/pick_list.py,{0} units of {1} is not available.,{0} enheder på {1} er ikke tilgængelig.
 ,Item Shortage Report,Item Mangel Rapport
@@ -3156,7 +3168,6 @@
 apps/erpnext/erpnext/public/js/call_popup/call_popup.js,View all issues from {0},Se alle udgaver fra {0}
 DocType: Quality Inspection,MAT-QA-.YYYY.-,MAT-QA-.YYYY.-
 DocType: Quality Meeting Table,Quality Meeting Table,Mødebord af kvalitet
-apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,Indstil Naming Series for {0} via Setup&gt; Settings&gt; Naming Series
 apps/erpnext/erpnext/templates/pages/help.html,Visit the forums,Besøg fora
 DocType: Student,Student Mobile Number,Studerende mobiltelefonnr.
 DocType: Item,Has Variants,Har Varianter
@@ -3298,6 +3309,7 @@
 DocType: Homepage Section,Section Cards,Sektionskort
 ,Campaign Efficiency,Kampagneeffektivitet
 DocType: Discussion,Discussion,Diskussion
+apps/erpnext/erpnext/setup/default_energy_point_rules.py,On Sales Order Submission,Ved levering af ordreordre
 DocType: Bank Transaction,Transaction ID,Transaktions-ID
 DocType: Payroll Entry,Deduct Tax For Unsubmitted Tax Exemption Proof,Fradragsafgift for ikke-meddelt skattefritagelse bevis
 DocType: Volunteer,Anytime,Når som helst
@@ -3305,7 +3317,6 @@
 DocType: Employee Tax Exemption Proof Submission,Employee Tax Exemption Proof Submission,Beskæftigelse af medarbejderskattefritagelse
 DocType: Patient,Surgical History,Kirurgisk historie
 DocType: Bank Statement Settings Item,Mapped Header,Mapped Header
-apps/erpnext/erpnext/hr/doctype/employee/employee.py,Please setup Employee Naming System in Human Resource &gt; HR Settings,Indstil venligst medarbejdernavningssystem i menneskelig ressource&gt; HR-indstillinger
 DocType: Employee,Resignation Letter Date,Udmeldelse Brev Dato
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Pricing Rules are further filtered based on quantity.,Prisfastsættelsesregler er yderligere filtreret på mængden.
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py,Please set the Date Of Joining for employee {0},Angiv ansættelsesdatoen for medarbejder {0}
@@ -3319,6 +3330,7 @@
 DocType: Bank Statement Settings,Mapped Items,Mappede elementer
 DocType: Amazon MWS Settings,IT,DET
 DocType: Chapter,Chapter,Kapitel
+,Fixed Asset Register,Fast aktivregister
 apps/erpnext/erpnext/utilities/user_progress.py,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,Select BOM and Qty for Production,Vælg stykliste og produceret antal
@@ -3454,7 +3466,6 @@
 apps/erpnext/erpnext/templates/emails/reorder_item.html,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
 apps/erpnext/erpnext/controllers/accounts_controller.py,Account {0} is invalid. Account Currency must be {1},Konto {0} er ugyldig. Konto Valuta skal være {1}
 apps/erpnext/erpnext/hr/doctype/salary_structure_assignment/salary_structure_assignment.py,From Date {0} cannot be after employee's relieving Date {1},Fra dato {0} kan ikke være efter medarbejderens lindrende dato {1}
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py,Debit Note {0} has been created automatically,Debet note {0} er oprettet automatisk
 apps/erpnext/erpnext/accounts/doctype/payment_order/payment_order.js,Create Payment Entries,Opret betalingsindlæg
 DocType: Supplier,Is Internal Supplier,Er intern leverandør
 DocType: Employee,Create User Permission,Opret brugertilladelse
@@ -4013,7 +4024,6 @@
 DocType: Project User,Project Status,Sagsstatus
 DocType: UOM,Check this to disallow fractions. (for Nos),Markér dette for at forbyde fraktioner. (For NOS)
 DocType: Student Admission Program,Naming Series (for Student Applicant),Navngivningsnummerserie (for elevansøger)
-apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.py,UOM Conversion factor ({0} -&gt; {1}) not found for item: {2},UOM-konverteringsfaktor ({0} -&gt; {1}) ikke fundet for varen: {2}
 apps/erpnext/erpnext/hr/doctype/retention_bonus/retention_bonus.py,Bonus Payment Date cannot be a past date,Bonus Betalingsdato kan ikke være en tidligere dato
 DocType: Travel Request,Copy of Invitation/Announcement,Kopi af invitation / meddelelse
 DocType: Practitioner Service Unit Schedule,Practitioner Service Unit Schedule,Practitioner Service Unit Schedule
@@ -4161,6 +4171,7 @@
 apps/erpnext/erpnext/utilities/user_progress.py,Setup Company,Setup Company
 ,Lab Test Report,Lab Test Report
 DocType: Employee Benefit Application,Employee Benefit Application,Ansættelsesfordel Ansøgning
+apps/erpnext/erpnext/accounts/doctype/invoice_discounting/invoice_discounting.py,Row({0}): {1} is already discounted in {2},Række ({0}): {1} er allerede nedsat i {2}
 apps/erpnext/erpnext/hr/doctype/additional_salary/additional_salary.py,Additional Salary Component Exists.,Der findes yderligere lønkomponenter.
 DocType: Purchase Invoice,Unregistered,Uregistreret
 DocType: Student Applicant,Application Date,Ansøgningsdato
@@ -4239,7 +4250,6 @@
 DocType: Journal Entry,Accounting Entries,Bogføringsposter
 DocType: Job Card Time Log,Job Card Time Log,Jobkort tidslogg
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,"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;."
-apps/erpnext/erpnext/education/doctype/instructor/instructor.py,Please setup Instructor Naming System in Education &gt; Education Settings,Opsæt instruktør navngivningssystem i uddannelse&gt; Uddannelsesindstillinger
 DocType: Journal Entry,Paid Loan,Betalt lån
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py,Duplicate Entry. Please check Authorization Rule {0},Duplicate indtastning. Forhør Authorization Rule {0}
 DocType: Journal Entry Account,Reference Due Date,Reference Due Date
@@ -4256,7 +4266,6 @@
 apps/erpnext/erpnext/templates/pages/projects.html,No time sheets,Ingen tidsregistreringer
 DocType: GoCardless Mandate,GoCardless Customer,GoCardless kunde
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py,Leave Type {0} cannot be carry-forwarded,Fraværstype {0} kan ikke bæres videre
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Item Code &gt; Item Group &gt; Brand,Varekode&gt; Varegruppe&gt; Mærke
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py,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
 DocType: Leave Encashment,Payroll,Løn
@@ -4371,7 +4380,6 @@
 DocType: Stock Ledger Entry,Actual Qty After Transaction,Aktuel Antal Efter Transaktion
 ,Pending SO Items For Purchase Request,Afventende salgsordre-varer til indkøbsanmodning
 apps/erpnext/erpnext/education/doctype/student_admission/student_admission.py,Student Admissions,Studerende optagelser
-apps/erpnext/erpnext/accounts/party.py,{0} {1} is disabled,{0} {1} er deaktiveret
 DocType: Supplier,Billing Currency,Fakturering Valuta
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py,Extra Large,Extra Large
 DocType: Loan,Loan Application,Lån ansøgning
@@ -4448,7 +4456,6 @@
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py,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/accounts/doctype/accounting_dimension/accounting_dimension.py,Creating Dimensions...,Opretter dimensioner ...
 apps/erpnext/erpnext/education/doctype/student_group_creation_tool/student_group_creation_tool.py,Student Group Name is mandatory in row {0},Elevgruppenavn er obligatorisk i rækken {0}
-DocType: Customer Credit Limit,Bypass credit limit_check,Omgå kreditgrænse-check
 DocType: Homepage,Products to be shown on website homepage,Produkter til at blive vist på hjemmesidens startside
 DocType: HR Settings,Password Policy,Kodeordspolitik
 apps/erpnext/erpnext/setup/doctype/customer_group/customer_group.js,This is a root customer group and cannot be edited.,Dette er en rod-kundegruppe og kan ikke redigeres.
@@ -4740,6 +4747,7 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py,Row {0}: Advance against Customer must be credit,Række {0}: Advance mod Kunden skal være kredit
 DocType: Quality Meeting,Quality Meeting,Kvalitetsmøde
 apps/erpnext/erpnext/accounts/doctype/account/account.js,Non-Group to Group,Ikke-gruppe til gruppe
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,Indstil Naming Series for {0} via Setup&gt; Settings&gt; Naming Series
 DocType: Employee,ERPNext User,ERPNæste bruger
 apps/erpnext/erpnext/education/doctype/student_group_creation_tool/student_group_creation_tool.py,Batch is mandatory in row {0},Parti er obligatorisk i række {0}
 DocType: Company,Default Buying Terms,Standard købsbetingelser
@@ -5034,6 +5042,7 @@
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py,No {0} found for Inter Company Transactions.,Nej {0} fundet for Inter Company Transactions.
 DocType: Travel Itinerary,Rented Car,Lejet bil
 apps/erpnext/erpnext/public/js/hub/components/profile_dialog.js,About your Company,Om din virksomhed
+apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.js,Show Stock Ageing Data,Vis lagringsalder
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py,Credit To account must be a Balance Sheet account,Kredit til konto skal være en balance konto
 DocType: Donor,Donor,Donor
 DocType: Global Defaults,Disable In Words,Deaktiver i ord
@@ -5048,8 +5057,10 @@
 DocType: Practitioner Schedule,Schedule Name,Planlægningsnavn
 apps/erpnext/erpnext/regional/doctype/gstr_3b_report/gstr_3b_report.py,Please enter GSTIN and state for the Company Address {0},Indtast GSTIN og angiv firmaadressen {0}
 DocType: Currency Exchange,For Buying,Til køb
+apps/erpnext/erpnext/setup/default_energy_point_rules.py,On Purchase Order Submission,Ved levering af indkøbsordre
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js,Add All Suppliers,Tilføj alle leverandører
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py,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/accounts/doctype/pricing_rule/pricing_rule.js,Customer &gt; Customer Group &gt; Territory,Kunde&gt; Kundegruppe&gt; Territorium
 DocType: Tally Migration,Parties,parterne
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js,Browse BOM,Gennemse styklister
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py,Secured Loans,Sikrede lån
@@ -5081,6 +5092,7 @@
 apps/erpnext/erpnext/stock/doctype/item_alternative/item_alternative.py,Not allow to set alternative item for the item {0},Tillad ikke at indstille alternativt element til varen {0}
 apps/erpnext/erpnext/hr/doctype/leave_block_list/leave_block_list.py,Date is repeated,Datoen er gentaget
 apps/erpnext/erpnext/accounts/print_format/payment_receipt_voucher/payment_receipt_voucher.html,Authorized Signatory,Tegningsberettiget
+apps/erpnext/erpnext/education/doctype/instructor/instructor.py,Please setup Instructor Naming System in Education &gt; Education Settings,Opsæt instruktør navngivningssystem i uddannelse&gt; Uddannelsesindstillinger
 apps/erpnext/erpnext/regional/doctype/gstr_3b_report/gstr_3b_report.html,Net ITC Available(A) - (B),Net ITC tilgængelig (A) - (B)
 apps/erpnext/erpnext/education/doctype/fee_schedule/fee_schedule.js,Create Fees,Opret gebyrer
 DocType: Project,Total Purchase Cost (via Purchase Invoice),Samlet anskaffelsespris (via købsfaktura)
@@ -5101,6 +5113,7 @@
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.js,Message Sent,Besked sendt
 apps/erpnext/erpnext/accounts/doctype/account/account.py,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/assets/report/fixed_asset_register/fixed_asset_register.py,Vendor Name,Leverandørnavn
 DocType: Quiz Result,Wrong,Forkert
 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)
@@ -5344,6 +5357,7 @@
 DocType: Stock Settings,Auto Material Request,Automatisk materialeanmodning
 DocType: Woocommerce Settings,API consumer secret,API forbruger hemmelighed
 DocType: Delivery Note Item,Available Batch Qty at From Warehouse,Tilgængeligt batch-antal fra lageret
+,Received Qty Amount,Modtaget antal
 DocType: Salary Slip,Gross Pay - Total Deduction - Loan Repayment,Bruttoløn - Fradrag i alt - Tilbagebetaling af lån
 DocType: Bank Account,Last Integration Date,Sidste integrationsdato
 DocType: Expense Claim,Expense Taxes and Charges,Udgifter til skatter og afgifter
@@ -5803,6 +5817,8 @@
 DocType: Drug Prescription,Hour,Time
 DocType: Restaurant Order Entry,Last Sales Invoice,Sidste salgsfaktura
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py,Please select Qty against item {0},Vælg venligst antal imod vare {0}
+apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py,Latest Age,Seneste alder
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js,Transfer Material to Supplier,Overførsel Materiale til Leverandøren
 apps/erpnext/erpnext/hr/report/loan_repayment/loan_repayment.py,EMI,EMI
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py,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
@@ -5826,7 +5842,6 @@
 apps/erpnext/erpnext/hr/doctype/employee_benefit_application/employee_benefit_application.py,"An amount of {0} already claimed for the component {1},\
 						 set the amount equal or greater than {2}","En mængde på {0}, der allerede er påkrævet for komponenten {1}, \ indstil størrelsen lig med eller større end {2}"
 DocType: Shipping Rule,Shipping Rule Conditions,Forsendelsesregelbetingelser
-DocType: Purchase Invoice,Export Type,Eksporttype
 DocType: Salary Slip Loan,Salary Slip Loan,Salary Slip Lån
 DocType: BOM Update Tool,The new BOM after replacement,Den nye BOM efter udskiftning
 ,Point of Sale,Kassesystem
@@ -5946,7 +5961,6 @@
 DocType: Purchase Order Item,Blanket Order Rate,Tæppe Ordre Rate
 ,Customer Ledger Summary,Oversigt over kundehovedbog
 apps/erpnext/erpnext/hooks.py,Certification,Certificering
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js,Are you sure you want to make debit note?,"Er du sikker på, at du vil oprette debitnotat?"
 DocType: Bank Guarantee,Clauses and Conditions,Klausuler og betingelser
 DocType: Serial No,Creation Document Type,Oprettet dokumenttype
 DocType: Amazon MWS Settings,ES,ES
@@ -5984,8 +5998,6 @@
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py,Financial Services,Financial Services
 DocType: Student Sibling,Student ID,Studiekort
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.js,For Quantity must be greater than zero,For Mængde skal være større end nul
-apps/erpnext/erpnext/hr/doctype/employee_transfer/employee_transfer.py,"Please delete the Employee <a href=""#Form/Employee/{0}"">{0}</a>\
-					to cancel this document","Slet medarbejderen <a href=""#Form/Employee/{0}"">{0}</a> \ for at annullere dette dokument"
 apps/erpnext/erpnext/config/projects.py,Types of activities for Time Logs,Typer af aktiviteter for Time Logs
 DocType: Opening Invoice Creation Tool,Sales,Salg
 DocType: Stock Entry Detail,Basic Amount,Grundbeløb
@@ -6064,6 +6076,7 @@
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py,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,Send Supplier Emails,Send Leverandør Emails
+DocType: Asset Movement,ACC-ASM-.YYYY.-,ACC-ASM-.YYYY.-
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py,"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
 apps/erpnext/erpnext/hr/doctype/employee_onboarding/employee_onboarding.py,Submit this to create the Employee record,Indsend dette for at oprette medarbejderposten
@@ -6141,7 +6154,6 @@
 DocType: Sales Team,Contact No.,Kontaktnr.
 apps/erpnext/erpnext/templates/includes/cart/cart_address.html,Billing Address is same as Shipping Address,Faktureringsadresse er den samme som forsendelsesadresse
 DocType: Bank Reconciliation,Payment Entries,Betalings Entries
-apps/erpnext/erpnext/erpnext_integrations/doctype/shopify_settings/shopify_settings.py,Access token or Shopify URL missing,Adkomst token eller Shopify URL mangler
 DocType: Location,Latitude,Breddegrad
 DocType: Work Order,Scrap Warehouse,Skrotlager
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py,"Warehouse required at Row No {0}, please set default warehouse for the item {1} for the company {2}","Lager krævet på række nr. {0}, angiv standardlager for varen {1} for virksomheden {2}"
@@ -6184,7 +6196,6 @@
 DocType: Job Offer Term,Value / Description,/ Beskrivelse
 apps/erpnext/erpnext/controllers/accounts_controller.py,"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
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js,Are you sure you want to make credit note?,"Er du sikker på, at du vil oprette kreditnota?"
 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,Debit and Credit not equal for {0} #{1}. Difference is {2}.,Debet og kredit ikke ens for {0} # {1}. Forskellen er {2}.
@@ -6309,6 +6320,7 @@
 DocType: Purchase Invoice,Taxes and Charges Added,Skatter og Afgifter Tilføjet
 apps/erpnext/erpnext/assets/doctype/asset/asset.py,Depreciation Row {0}: Next Depreciation Date cannot be before Available-for-use Date,Afskrivnings række {0}: Næste afskrivningsdato kan ikke være før tilgængelig dato
 ,Sales Funnel,Salgstragt
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Item Code &gt; Item Group &gt; Brand,Varekode&gt; Varegruppe&gt; Mærke
 apps/erpnext/erpnext/setup/doctype/company/company.py,Abbreviation is mandatory,Forkortelsen er obligatorisk
 DocType: Project,Task Progress,Opgave-fremskridt
 apps/erpnext/erpnext/templates/includes/navbar/navbar_items.html,Cart,Kurv
@@ -6552,6 +6564,7 @@
 DocType: Employee Grade,Employee Grade,Medarbejderklasse
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py,Piecework,Akkordarbejde
 DocType: GSTR 3B Report,June,juni
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Supplier &gt; Supplier Type,Leverandør&gt; Leverandørtype
 DocType: Share Balance,From No,Fra nr
 DocType: Shift Type,Early Exit Grace Period,Tidlig afgangsperiode
 DocType: Task,Actual Time (in Hours),Faktisk tid (i timer)
@@ -6836,6 +6849,7 @@
 DocType: Warehouse,Warehouse Name,Lagernavn
 DocType: Naming Series,Select Transaction,Vælg Transaktion
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py,Please enter Approving Role or Approving User,Indtast Godkendelse Rolle eller godkender Bruger
+apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.py,UOM Conversion factor ({0} -&gt; {1}) not found for item: {2},UOM-konverteringsfaktor ({0} -&gt; {1}) ikke fundet for varen: {2}
 apps/erpnext/erpnext/support/doctype/service_level_agreement/service_level_agreement.py,Service Level Agreement with Entity Type {0} and Entity {1} already exists.,Serviceniveauaftale med entitetstype {0} og enhed {1} findes allerede.
 DocType: Journal Entry,Write Off Entry,Skriv Off indtastning
 DocType: BOM,Rate Of Materials Based On,Rate Of materialer baseret på
@@ -7026,6 +7040,7 @@
 DocType: Quality Inspection Reading,Quality Inspection Reading,Kvalitetskontrol-aflæsning
 apps/erpnext/erpnext/stock/doctype/stock_settings/stock_settings.py,`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/stock/report/stock_balance/stock_balance.py,Earliest Age,Tidligste alder
 apps/erpnext/erpnext/utilities/user_progress.py,Set a sales goal you'd like to achieve for your company.,"Indstil et salgsmål, du gerne vil opnå for din virksomhed."
 DocType: Quality Goal,Revision,Revision
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js,Healthcare Services,Sundhedsydelser
@@ -7069,6 +7084,7 @@
 apps/erpnext/erpnext/healthcare/doctype/patient_encounter/patient_encounter.js,Schedule Discharge,Planlægningsudladning
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py,Cheques and Deposits incorrectly cleared,Anvendes ikke
 DocType: Homepage Section Card,Homepage Section Card,Hjemmesektionsafsnitskort
+,Amount To Be Billed,"Beløb, der skal faktureres"
 apps/erpnext/erpnext/accounts/doctype/account/account.py,Account {0}: You can not assign itself as parent account,Konto {0}: Konto kan ikke samtidig være forældre-konto
 DocType: Purchase Invoice Item,Price List Rate,Prisliste Rate
 apps/erpnext/erpnext/utilities/activation.py,Create customer quotes,Opret tilbud til kunder
@@ -7121,6 +7137,7 @@
 DocType: Supplier Scorecard Criteria,Supplier Scorecard Criteria,Leverandør Scorecard Criteria
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py,Please select Start Date and End Date for Item {0},Vælg Start og slutdato for Item {0}
 DocType: Maintenance Schedule,MAT-MSH-.YYYY.-,MAT-MSH-.YYYY.-
+,Amount to Receive,"Beløb, der skal modtages"
 apps/erpnext/erpnext/education/doctype/student_group_creation_tool/student_group_creation_tool.py,Course is mandatory in row {0},Kursus er obligatorisk i række {0}
 apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py,From date can not be greater than than To date,Fra dato kan ikke være større end til dato
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py,To date cannot be before from date,Til dato kan ikke være før fra dato
@@ -7368,7 +7385,6 @@
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js,BOM and Manufacturing Quantity are required,Stykliste and produceret mængde skal angives
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js,Ageing Range 2,Ageing Range 2
 DocType: SG Creation Tool Course,Max Strength,Max Strength
-apps/erpnext/erpnext/accounts/doctype/account/account.py,"Account {0} already exists in child company {1}. The following fields have different values, they should be same:<ul><li>{2}</li></ul>","Konto {0} findes allerede i børneselskabet {1}. Følgende felter har forskellige værdier, de skal være ens: <ul><li> {2} </li></ul>"
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py,Installing presets,Installation af forudindstillinger
 DocType: Fee Schedule,EDU-FSH-.YYYY.-,EDU-FSH-.YYYY.-
 apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js,No Delivery Note selected for Customer {},Ingen leveringskort valgt til kunden {}
@@ -7576,6 +7592,7 @@
 DocType: Delivery Note,Print Without Amount,Print uden Beløb
 apps/erpnext/erpnext/accounts/report/asset_depreciation_ledger/asset_depreciation_ledger.py,Depreciation Date,Afskrivningsdato
 ,Work Orders in Progress,Arbejdsordrer i gang
+DocType: Customer Credit Limit,Bypass Credit Limit Check,Omgå kreditgrænsetjek
 DocType: Issue,Support Team,Supportteam
 apps/erpnext/erpnext/stock/report/batch_item_expiry_status/batch_item_expiry_status.py,Expiry (In Days),Udløb (i dage)
 DocType: Appraisal,Total Score (Out of 5),Samlet score (ud af 5)
@@ -7759,6 +7776,7 @@
 DocType: Sales Invoice,Customer GSTIN,Kunde GSTIN
 DocType: Crop Cycle,List of diseases detected on the field. When selected it'll automatically add a list of tasks to deal with the disease ,"Liste over sygdomme opdaget på marken. Når den er valgt, tilføjer den automatisk en liste over opgaver for at håndtere sygdommen"
 apps/erpnext/erpnext/manufacturing/page/bom_comparison_tool/bom_comparison_tool.js,BOM 1,BOM 1
+apps/erpnext/erpnext/assets/report/fixed_asset_register/fixed_asset_register.py,Asset Id,Aktiv-id
 apps/erpnext/erpnext/healthcare/doctype/healthcare_service_unit/healthcare_service_unit.js,This is a root healthcare service unit and cannot be edited.,Dette er en root sundheds service enhed og kan ikke redigeres.
 DocType: Asset Repair,Repair Status,Reparation Status
 apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.js,"Requested Qty: Quantity requested for purchase, but not ordered.","Anmodet antal: Antal anmodet om køb, men ikke bestilt."
diff --git a/erpnext/translations/de.csv b/erpnext/translations/de.csv
index 3a60d73..297da9f 100644
--- a/erpnext/translations/de.csv
+++ b/erpnext/translations/de.csv
@@ -289,7 +289,6 @@
 DocType: Loan,Repay Over Number of Periods,Repay über Anzahl der Perioden
 apps/erpnext/erpnext/manufacturing/report/bom_stock_report/bom_stock_report.py,Quantity to Produce can not be less than Zero,Die zu produzierende Menge darf nicht unter Null liegen
 DocType: Stock Entry,Additional Costs,Zusätzliche Kosten
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Customer &gt; Customer Group &gt; Territory,Kunde&gt; Kundengruppe&gt; Gebiet
 apps/erpnext/erpnext/accounts/doctype/account/account.py,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
@@ -586,6 +585,7 @@
 DocType: Healthcare Settings,Create documents for sample collection,Erstellen Sie Dokumente für die Probenahme
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py,Payment against {0} {1} cannot be greater than Outstanding Amount {2},Zahlung zu {0} {1} kann nicht größer als ausstehender Betrag {2} sein
 apps/erpnext/erpnext/patches/v11_0/add_healthcare_service_unit_tree_root.py,All Healthcare Service Units,Alle Gesundheitseinheiten
+apps/erpnext/erpnext/setup/default_energy_point_rules.py,On Converting Opportunity,Über die Konvertierung von Opportunitys
 DocType: Bank Account,Address HTML,Adresse im HTML-Format
 DocType: Lead,Mobile No.,Mobilfunknr.
 apps/erpnext/erpnext/selling/doctype/pos_closing_voucher/closing_voucher_details.html,Mode of Payments,Zahlungsweise
@@ -650,7 +650,6 @@
 DocType: Accounting Dimension,Dimension Name,Dimensionsname
 apps/erpnext/erpnext/healthcare/setup.py,Resistant,Beständig
 apps/erpnext/erpnext/hotels/doctype/hotel_room_reservation/hotel_room_reservation.py,Please set Hotel Room Rate on {},Bitte setzen Sie den Zimmerpreis auf {}
-apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py,Please setup numbering series for Attendance via Setup &gt; Numbering Series,Richten Sie die Nummerierungsserie für die Teilnahme über Setup&gt; Nummerierungsserie ein
 DocType: Journal Entry,Multi Currency,Unterschiedliche Währungen
 DocType: Bank Statement Transaction Invoice Item,Invoice Type,Rechnungstyp
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py,Valid from date must be less than valid upto date,Gültig ab Datum muss kleiner als aktuell sein
@@ -765,6 +764,7 @@
 apps/erpnext/erpnext/accounts/page/pos/pos.js,Create a new Customer,Erstellen Sie einen neuen Kunden
 apps/erpnext/erpnext/non_profit/report/expiring_memberships/expiring_memberships.py,Expiring On,Verfällt am
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,"If multiple Pricing Rules continue to prevail, users are asked to set Priority manually to resolve conflict.","Wenn mehrere Preisregeln weiterhin gleichrangig gelten, werden die Benutzer aufgefordert, Vorrangregelungen manuell zu erstellen, um den Konflikt zu lösen."
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js,Purchase Return,Warenrücksendung
 apps/erpnext/erpnext/utilities/activation.py,Create Purchase Orders,Bestellungen erstellen
 ,Purchase Register,Übersicht über Einkäufe
 apps/erpnext/erpnext/healthcare/doctype/patient/patient.py,Patient not found,Patient nicht gefunden
@@ -780,7 +780,6 @@
 DocType: Location,Area UOM,Bereichs-Maßeinheit
 apps/erpnext/erpnext/manufacturing/doctype/workstation/workstation.py,Workstation is closed on the following dates as per Holiday List: {0},Arbeitsplatz ist an folgenden Tagen gemäß der Urlaubsliste geschlossen: {0}
 apps/erpnext/erpnext/selling/page/sales_funnel/sales_funnel.py,Opportunities,Chancen
-apps/erpnext/erpnext/www/all-products/index.html,Clear filters,Filter löschen
 DocType: Lab Test Template,Single,Ledig
 DocType: Compensatory Leave Request,Work From Date,Arbeit von Datum
 DocType: Salary Slip,Total Loan Repayment,Insgesamt Loan Rückzahlung
@@ -823,6 +822,7 @@
 DocType: Account,Old Parent,Alte übergeordnetes Element
 apps/erpnext/erpnext/education/doctype/program_enrollment_tool/program_enrollment_tool.py,Mandatory field - Academic Year,Pflichtfeld - Akademisches Jahr
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py,{0} {1} is not associated with {2} {3},{0} {1} ist nicht mit {2} {3} verknüpft
+DocType: Opportunity,Converted By,Konvertiert von
 apps/erpnext/erpnext/public/js/hub/components/ReviewArea.vue,You need to login as a Marketplace User before you can add any reviews.,"Sie müssen sich als Marketplace-Benutzer anmelden, bevor Sie Bewertungen hinzufügen können."
 apps/erpnext/erpnext/manufacturing/doctype/job_card/job_card.py,Row {0} : Operation is required against the raw material item {1},Zeile {0}: Vorgang ist für die Rohmaterialposition {1} erforderlich
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py,Please set default payable account for the company {0},Bitte das Standard-Verbindlichkeiten-Konto für Unternehmen {0} setzen.
@@ -848,6 +848,8 @@
 DocType: BOM,Work Order,Arbeitsauftrag
 DocType: Sales Invoice,Total Qty,Gesamtmenge
 apps/erpnext/erpnext/education/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py,Guardian2 Email ID,Guardian2 E-Mail-ID
+apps/erpnext/erpnext/hr/doctype/employee_transfer/employee_transfer.py,"Please delete the Employee <a href=""#Form/Employee/{0}"">{0}</a>\
+					to cancel this document","Bitte löschen Sie den Mitarbeiter <a href=""#Form/Employee/{0}"">{0}</a> \, um dieses Dokument zu stornieren"
 DocType: Item,Show in Website (Variant),Auf der Website anzeigen (Variante)
 DocType: Employee,Health Concerns,Gesundheitsfragen
 DocType: Payroll Entry,Select Payroll Period,Wählen Sie Abrechnungsperiode
@@ -907,7 +909,6 @@
 DocType: Codification Table,Codification Table,Kodifizierungstabelle
 DocType: Timesheet Detail,Hrs,Std
 apps/erpnext/erpnext/manufacturing/page/bom_comparison_tool/bom_comparison_tool.js,Changes in {0},Änderungen in {0}
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js,Please select Company,Bitte Unternehmen auswählen
 DocType: Employee Skill,Employee Skill,Mitarbeiterfähigkeit
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.js,Difference Account,Differenzkonto
 DocType: Pricing Rule,Discount on Other Item,Rabatt auf andere Artikel
@@ -975,6 +976,7 @@
 DocType: BOM,Operating Cost,Betriebskosten
 DocType: Crop,Produced Items,Produzierte Artikel
 DocType: Bank Statement Transaction Entry,Match Transaction to Invoices,Transaktion mit Rechnungen abgleichen
+apps/erpnext/erpnext/erpnext_integrations/exotel_integration.py,Error in Exotel incoming call,Fehler bei eingehendem Exotel-Anruf
 DocType: Sales Order Item,Gross Profit,Rohgewinn
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js,Unblock Invoice,Rechnung entsperren
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py,Increment cannot be 0,Schrittweite kann nicht 0 sein
@@ -1188,6 +1190,7 @@
 DocType: Activity Cost,Activity Type,Aktivitätsart
 DocType: Request for Quotation,For individual supplier,Für einzelne Anbieter
 DocType: BOM Operation,Base Hour Rate(Company Currency),Basis Stundensatz (Unternehmenswährung)
+,Qty To Be Billed,Abzurechnende Menge
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py,Delivered Amount,Gelieferte Menge
 apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.js,Reserved Qty for Production: Raw materials quantity to make manufacturing items.,Reservierte Menge für die Produktion: Rohstoffmenge zur Herstellung von Produktionsartikeln.
 DocType: Loyalty Point Entry Redemption,Redemption Date,Rückzahlungsdatum
@@ -1306,7 +1309,7 @@
 DocType: Sales Invoice,Commission Rate (%),Provisionssatz (%)
 apps/erpnext/erpnext/education/doctype/student_group/student_group.py,Please select Program,Bitte wählen Sie Programm
 DocType: Project,Estimated Cost,Geschätzte Kosten
-DocType: Request for Quotation,Link to material requests,mit Materialanforderungen verknüpfen
+DocType: Supplier Quotation,Link to material requests,mit Materialanforderungen verknüpfen
 apps/erpnext/erpnext/public/js/hub/pages/Publish.vue,Publish,Veröffentlichen
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py,Aerospace,Luft- und Raumfahrt
 ,Fichier des Ecritures Comptables [FEC],Fichier des Ecritures Comptables [FEC]
@@ -1319,6 +1322,7 @@
 apps/erpnext/erpnext/utilities/transaction_base.py,Invalid Posting Time,Ungültige Buchungszeit
 DocType: Salary Component,Condition and Formula,Zustand und Formel
 DocType: Lead,Campaign Name,Kampagnenname
+apps/erpnext/erpnext/setup/default_energy_point_rules.py,On Task Completion,Bei Abschluss der Aufgabe
 apps/erpnext/erpnext/hr/doctype/compensatory_leave_request/compensatory_leave_request.py,There is no leave period in between {0} and {1},Es gibt keinen Urlaub zwischen {0} und {1}
 DocType: Fee Validity,Healthcare Practitioner,praktischer Arzt
 DocType: Hotel Room,Capacity,Kapazität
@@ -1682,7 +1686,6 @@
 DocType: Quality Feedback Template,Quality Feedback Template,Qualitäts-Feedback-Vorlage
 apps/erpnext/erpnext/config/education.py,LMS Activity,LMS-Aktivität
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py,Internet Publishing,Veröffentlichung im Internet
-DocType: Prescription Duration,Number,Nummer
 apps/erpnext/erpnext/accounts/doctype/opening_invoice_creation_tool/opening_invoice_creation_tool.js,Creating {0} Invoice,{0} Rechnung erstellen
 DocType: Medical Code,Medical Code Standard,Medizinischer Code Standard
 DocType: Soil Texture,Clay Composition (%),Tonzusammensetzung (%)
@@ -1757,6 +1760,7 @@
 DocType: Support Settings,Get Started Sections,Erste Schritte Abschnitte
 DocType: Lead,CRM-LEAD-.YYYY.-,CRM-LEAD-.YYYY.-
 DocType: Invoice Discounting,Sanctioned,sanktionierte
+,Base Amount,Grundbetrag
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.js,Total Contribution Amount: {0},Gesamtbeitragsbetrag: {0}
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py,Row #{0}: Please specify Serial No for Item {1},Zeile #{0}: Bitte Seriennummer für Artikel {1} angeben
 DocType: Payroll Entry,Salary Slips Submitted,Gehaltszettel eingereicht
@@ -1974,6 +1978,7 @@
 apps/erpnext/erpnext/utilities/user_progress.py,List a few of your suppliers. They could be organizations or individuals.,Bitte ein paar Lieferanten angeben. Diese können Firmen oder Einzelpersonen sein.
 DocType: Accounting Dimension,Dimension Defaults,Bemaßungsstandards
 apps/erpnext/erpnext/crm/report/prospects_engaged_but_not_converted/prospects_engaged_but_not_converted.js,Minimum Lead Age (Days),Mindest Lead-Alter (in Tagen)
+apps/erpnext/erpnext/assets/report/fixed_asset_register/fixed_asset_register.py,Available For Use Date,Verfügbar für Verwendungsdatum
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py,All BOMs,Alle Stücklisten
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js,Create Inter Company Journal Entry,Erstellen Sie einen Inter Company Journal Eintrag
 DocType: Company,Parent Company,Muttergesellschaft
@@ -2038,6 +2043,7 @@
 ,IRS 1099,IRS 1099
 DocType: Salary Slip,Leave Without Pay,Unbezahlter Urlaub
 DocType: Payment Request,Outward,Nach außen
+apps/erpnext/erpnext/setup/default_energy_point_rules.py,On {0} Creation,Bei {0} Erstellung
 apps/erpnext/erpnext/regional/doctype/gstr_3b_report/gstr_3b_report.html,State/UT Tax,Staatliche / UT-Steuer
 ,Trial Balance for Party,Summen- und Saldenliste für Gruppe
 ,Gross and Net Profit Report,Brutto- und Nettogewinnbericht
@@ -2153,6 +2159,7 @@
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js,Make Stock Entry,Bestandserfassung vornehmen
 DocType: Hotel Room Reservation,Hotel Reservation User,Hotelreservierung Benutzer
 apps/erpnext/erpnext/projects/doctype/project/project.js,Set Status,Status setzen
+apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py,Please setup numbering series for Attendance via Setup &gt; Numbering Series,Richten Sie die Nummerierungsserie für die Teilnahme über Setup&gt; Nummerierungsserie ein
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py,Please select prefix first,Bitte zuerst Präfix auswählen
 DocType: Contract,Fulfilment Deadline,Erfüllungsfrist
 apps/erpnext/erpnext/public/js/hub/pages/Home.vue,Near you,Nahe bei dir
@@ -2168,6 +2175,7 @@
 DocType: Announcement,All Students,Alle Schüler
 apps/erpnext/erpnext/assets/doctype/asset/asset.py,Item {0} must be a non-stock item,Artikel {0} darf kein Lagerartikel sein
 apps/erpnext/erpnext/stock/doctype/batch/batch.js,View Ledger,Hauptbuch anzeigen
+DocType: Cost Center,Lft,lft
 DocType: Grading Scale,Intervals,Intervalle
 DocType: Bank Statement Transaction Entry,Reconciled Transactions,Abgestimmte Transaktionen
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py,Earliest,Frühestens
@@ -2283,6 +2291,7 @@
 apps/erpnext/erpnext/hr/doctype/employee_benefit_application/employee_benefit_application.py,As per your assigned Salary Structure you cannot apply for benefits,Gemäß Ihrer aktuellen Gehaltsstruktur können Sie keine Leistungen beantragen.
 apps/erpnext/erpnext/stock/doctype/item/item.py,Website Image should be a public file or website URL,Das Webseiten-Bild sollte eine öffentliche Datei oder eine Webseiten-URL sein
 DocType: Purchase Invoice Item,BOM,Stückliste
+apps/erpnext/erpnext/stock/doctype/item/item.py,Duplicate entry in Manufacturers table,Doppelter Eintrag in Herstellertabelle
 apps/erpnext/erpnext/setup/doctype/item_group/item_group.js,This is a root item group and cannot be edited.,Dies ist eine Root-Artikelgruppe und kann nicht bearbeitet werden.
 apps/erpnext/erpnext/accounts/doctype/account/account.js,Merge,zusammenfassen
 DocType: Journal Entry Account,Purchase Order,Lieferantenauftrag
@@ -2427,7 +2436,6 @@
 DocType: Asset,Depreciation Schedules,Abschreibungen Termine
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.js,Create Sales Invoice,Verkaufsrechnung erstellen
 apps/erpnext/erpnext/regional/doctype/gstr_3b_report/gstr_3b_report.html,Ineligible ITC,Nicht förderfähiges ITC
-apps/erpnext/erpnext/erpnext_integrations/doctype/shopify_settings/shopify_settings.py,"Support for public app is deprecated. Please setup private app, for more details refer user manual","Die Unterstützung für öffentliche Apps ist veraltet. Bitte richten Sie eine private App ein, für weitere Informationen lesen Sie das Benutzerhandbuch"
 DocType: Task,Dependent Tasks,Abhängige Aufgaben
 apps/erpnext/erpnext/regional/report/gstr_1/gstr_1.py,Following accounts might be selected in GST Settings:,In den GST-Einstellungen können folgende Konten ausgewählt werden:
 apps/erpnext/erpnext/manufacturing/report/bom_stock_report/bom_stock_report.js,Quantity to Produce,Menge zu produzieren
@@ -2679,6 +2687,7 @@
 DocType: Water Analysis,Container,Container
 apps/erpnext/erpnext/regional/report/gstr_1/gstr_1.py,Please set valid GSTIN No. in Company Address,Bitte geben Sie eine gültige GSTIN-Nummer in der Firmenadresse ein
 apps/erpnext/erpnext/education/utils.py,Student {0} - {1} appears Multiple times in row {2} & {3},Student {0} - {1} erscheint mehrfach in Zeile {2} &amp; {3}
+apps/erpnext/erpnext/selling/doctype/customer/customer.py,Following fields are mandatory to create address:,"Folgende Felder müssen ausgefüllt werden, um eine Adresse zu erstellen:"
 DocType: Item Alternative,Two-way,Zwei-Wege
 DocType: Item,Manufacturers,Hersteller
 apps/erpnext/erpnext/accounts/deferred_revenue.py,Error while processing deferred accounting for {0},Fehler beim Verarbeiten der verzögerten Abrechnung für {0}
@@ -2753,9 +2762,9 @@
 DocType: Employee,HR-EMP-,HR-EMP-
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py,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. Überprüfen Sie die Standardeinstellung in Reihe {1} für diesen Benutzer.
 DocType: Quality Meeting Minutes,Quality Meeting Minutes,Qualitätssitzungsprotokoll
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Supplier &gt; Supplier Type,Lieferant&gt; Lieferantentyp
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py,Employee Referral,Mitarbeiterempfehlung
 DocType: Student Group,Set 0 for no limit,Stellen Sie 0 für keine Grenze
+DocType: Cost Center,rgt,rgt
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py,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."
 DocType: Customer,Primary Address and Contact Detail,Primäre Adresse und Kontaktdetails
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.js,Resend Payment Email,Zahlungsemail erneut senden
@@ -2865,7 +2874,6 @@
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py,Against Supplier Invoice {0} dated {1},Zu Eingangsrechnung {0} vom {1}
 DocType: Customer,Default Price List,Standardpreisliste
 apps/erpnext/erpnext/assets/doctype/asset/asset.py,Asset Movement record {0} created,Asset-Bewegung Datensatz {0} erstellt
-apps/erpnext/erpnext/utilities/page/leaderboard/leaderboard.js,No items found.,Keine Elemente gefunden.
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py,You cannot delete Fiscal Year {0}. Fiscal Year {0} is set as default in Global Settings,Sie können das Geschäftsjahr {0} nicht löschen. Das Geschäftsjahr {0} ist als Standard in den globalen Einstellungen festgelegt
 DocType: Share Transfer,Equity/Liability Account,Eigenkapital / Verbindlichkeitskonto
 apps/erpnext/erpnext/setup/doctype/customer_group/customer_group.py,A customer with the same name already exists,Ein Kunde mit demselben Namen existiert bereits
@@ -2881,6 +2889,7 @@
 apps/erpnext/erpnext/selling/doctype/customer/customer.py,Credit limit has been crossed for customer {0} ({1}/{2}),Das Kreditlimit wurde für den Kunden {0} ({1} / {2}) überschritten.
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py,Customer required for 'Customerwise Discount',"Kunde erforderlich für ""Kundenbezogener Rabatt"""
 apps/erpnext/erpnext/config/accounting.py,Update bank payment dates with journals.,Bankzahlungsdaten anhand der Belege aktualisieren.
+,Billed Qty,Rechnungsmenge
 apps/erpnext/erpnext/stock/doctype/item/item_dashboard.py,Pricing,Preisgestaltung
 DocType: Employee,Attendance Device ID (Biometric/RF tag ID),Anwesenheitsgeräte-ID (biometrische / RF-Tag-ID)
 DocType: Quotation,Term Details,Details der Geschäftsbedingungen
@@ -2902,6 +2911,7 @@
 DocType: Share Transfer,Asset Account,Anlagenkonto
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js,New release date should be in the future,Das neue Erscheinungsdatum sollte in der Zukunft liegen
 DocType: Purchase Invoice,End date of current invoice's period,Schlußdatum der laufenden Eingangsrechnungsperiode
+apps/erpnext/erpnext/hr/doctype/employee/employee.py,Please setup Employee Naming System in Human Resource &gt; HR Settings,Richten Sie das Employee Naming System unter Human Resource&gt; HR Settings ein
 DocType: Lab Test,Technician Name,Techniker Name
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py,"Cannot ensure delivery by Serial No as \
 					Item {0} is added with and without Ensure Delivery by \
@@ -2909,6 +2919,7 @@
 DocType: Accounts Settings,Unlink Payment on Cancellation of Invoice,Zahlung bei Stornierung der Rechnung aufheben
 DocType: Bank Reconciliation,From Date,Von-Datum
 apps/erpnext/erpnext/hr/doctype/vehicle_log/vehicle_log.py,Current Odometer reading entered should be greater than initial Vehicle Odometer {0},Der eingegebene aktuelle Kilometerstand sollte größer sein als der Anfangskilometerstand {0}
+,Purchase Order Items To Be Received or Billed,"Bestellpositionen, die empfangen oder in Rechnung gestellt werden sollen"
 DocType: Restaurant Reservation,No Show,Keine Show
 apps/erpnext/erpnext/regional/india/utils.py,You must be a registered supplier to generate e-Way Bill,"Sie müssen ein registrierter Anbieter sein, um eine E-Way-Rechnung erstellen zu können"
 DocType: Shipping Rule Country,Shipping Rule Country,Versandregel für Land
@@ -2951,6 +2962,7 @@
 apps/erpnext/erpnext/templates/generators/item/item_add_to_cart.html,View in Cart,Ansicht Warenkorb
 DocType: Employee Checkin,Shift Actual Start,Tatsächlichen Start verschieben
 DocType: Tally Migration,Is Day Book Data Imported,Werden Tagebuchdaten importiert?
+,Purchase Order Items To Be Received or Billed1,Zu empfangende oder abzurechnende Bestellpositionen1
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py,Marketing Expenses,Marketingkosten
 apps/erpnext/erpnext/stock/doctype/pick_list/pick_list.py,{0} units of {1} is not available.,{0} Einheiten von {1} sind nicht verfügbar.
 ,Item Shortage Report,Artikelengpass-Bericht
@@ -3175,7 +3187,6 @@
 apps/erpnext/erpnext/public/js/call_popup/call_popup.js,View all issues from {0},Alle Ausgaben von {0} anzeigen
 DocType: Quality Inspection,MAT-QA-.YYYY.-,MAT-QA-.YYYY.-
 DocType: Quality Meeting Table,Quality Meeting Table,Qualität Besprechungstisch
-apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,Stellen Sie die Benennungsserie für {0} über Setup&gt; Einstellungen&gt; Benennungsserie ein
 apps/erpnext/erpnext/templates/pages/help.html,Visit the forums,Besuche die Foren
 DocType: Student,Student Mobile Number,Student Mobile Number
 DocType: Item,Has Variants,Hat Varianten
@@ -3317,6 +3328,7 @@
 DocType: Homepage Section,Section Cards,Abschnitt Karten
 ,Campaign Efficiency,Effizienz der Kampagne
 DocType: Discussion,Discussion,Diskussion
+apps/erpnext/erpnext/setup/default_energy_point_rules.py,On Sales Order Submission,On Sales Order Submission
 DocType: Bank Transaction,Transaction ID,Transaktions-ID
 DocType: Payroll Entry,Deduct Tax For Unsubmitted Tax Exemption Proof,Steuern für nicht abgegebenen Steuerbefreiungsnachweis abziehen
 DocType: Volunteer,Anytime,Jederzeit
@@ -3324,7 +3336,6 @@
 DocType: Employee Tax Exemption Proof Submission,Employee Tax Exemption Proof Submission,Employee Tax Exemption Proof Submission
 DocType: Patient,Surgical History,Chirurgische Geschichte
 DocType: Bank Statement Settings Item,Mapped Header,Zugeordnete Kopfzeile
-apps/erpnext/erpnext/hr/doctype/employee/employee.py,Please setup Employee Naming System in Human Resource &gt; HR Settings,Richten Sie das Employee Naming System unter Human Resource&gt; HR Settings ein
 DocType: Employee,Resignation Letter Date,Datum des Kündigungsschreibens
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Pricing Rules are further filtered based on quantity.,Preisregeln werden zudem nach Menge angewandt.
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py,Please set the Date Of Joining for employee {0},Bitte setzen Sie das Datum des Beitritts für Mitarbeiter {0}
@@ -3338,6 +3349,7 @@
 DocType: Bank Statement Settings,Mapped Items,Zugeordnete Elemente
 DocType: Amazon MWS Settings,IT,ES
 DocType: Chapter,Chapter,Gruppe
+,Fixed Asset Register,Anlagebuch
 apps/erpnext/erpnext/utilities/user_progress.py,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,Select BOM and Qty for Production,Wählen Sie Stückliste und Menge für die Produktion
@@ -3473,7 +3485,6 @@
 apps/erpnext/erpnext/templates/emails/reorder_item.html,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
 apps/erpnext/erpnext/controllers/accounts_controller.py,Account {0} is invalid. Account Currency must be {1},Konto {0} ist ungültig. Kontenwährung muss {1} sein
 apps/erpnext/erpnext/hr/doctype/salary_structure_assignment/salary_structure_assignment.py,From Date {0} cannot be after employee's relieving Date {1},Ab Datum {0} kann nicht nach dem Entlastungsdatum des Mitarbeiters sein {1}
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py,Debit Note {0} has been created automatically,Lastschrift {0} wurde automatisch erstellt
 apps/erpnext/erpnext/accounts/doctype/payment_order/payment_order.js,Create Payment Entries,Zahlungseinträge erstellen
 DocType: Supplier,Is Internal Supplier,Ist interner Lieferant
 DocType: Employee,Create User Permission,Benutzerberechtigung Erstellen
@@ -4031,7 +4042,6 @@
 DocType: Project User,Project Status,Projektstatus
 DocType: UOM,Check this to disallow fractions. (for Nos),"Hier aktivieren, um keine Bruchteile zuzulassen (für Nr.)"
 DocType: Student Admission Program,Naming Series (for Student Applicant),Nummernkreis Studienbewerber
-apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.py,UOM Conversion factor ({0} -&gt; {1}) not found for item: {2},UOM-Umrechnungsfaktor ({0} -&gt; {1}) für Artikel nicht gefunden: {2}
 apps/erpnext/erpnext/hr/doctype/retention_bonus/retention_bonus.py,Bonus Payment Date cannot be a past date,Das Bonuszahlungsdatum kann kein vergangenes Datum sein
 DocType: Travel Request,Copy of Invitation/Announcement,Kopie der Einladung / Ankündigung
 DocType: Practitioner Service Unit Schedule,Practitioner Service Unit Schedule,Practitioner Service Unit Zeitplan
@@ -4199,6 +4209,7 @@
 apps/erpnext/erpnext/utilities/user_progress.py,Setup Company,Unternehmen einrichten
 ,Lab Test Report,Labor Testbericht
 DocType: Employee Benefit Application,Employee Benefit Application,Employee Benefit Anwendung
+apps/erpnext/erpnext/accounts/doctype/invoice_discounting/invoice_discounting.py,Row({0}): {1} is already discounted in {2},Zeile ({0}): {1} ist bereits in {2} abgezinst.
 apps/erpnext/erpnext/hr/doctype/additional_salary/additional_salary.py,Additional Salary Component Exists.,Zusätzliche Gehaltsbestandteile sind vorhanden.
 DocType: Purchase Invoice,Unregistered,Nicht registriert
 DocType: Student Applicant,Application Date,Antragsdatum
@@ -4277,7 +4288,6 @@
 DocType: Journal Entry,Accounting Entries,Buchungen
 DocType: Job Card Time Log,Job Card Time Log,Jobkarten-Zeitprotokoll
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,"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."
-apps/erpnext/erpnext/education/doctype/instructor/instructor.py,Please setup Instructor Naming System in Education &gt; Education Settings,Richten Sie das Instructor Naming System unter Education&gt; Education Settings ein
 DocType: Journal Entry,Paid Loan,Bezahlter Kredit
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py,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
@@ -4294,7 +4304,6 @@
 apps/erpnext/erpnext/templates/pages/projects.html,No time sheets,Keine Zeitblätter
 DocType: GoCardless Mandate,GoCardless Customer,GoCardloser Kunde
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py,Leave Type {0} cannot be carry-forwarded,Urlaubstyp {0} kann nicht in die Zukunft übertragen werden
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Item Code &gt; Item Group &gt; Brand,Artikelcode&gt; Artikelgruppe&gt; Marke
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py,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
 DocType: Leave Encashment,Payroll,Lohn-und Gehaltsabrechnung
@@ -4409,7 +4418,6 @@
 DocType: Stock Ledger Entry,Actual Qty After Transaction,Tatsächliche Anzahl nach Transaktionen
 ,Pending SO Items For Purchase Request,Ausstehende Artikel aus Kundenaufträgen für Lieferantenanfrage
 apps/erpnext/erpnext/education/doctype/student_admission/student_admission.py,Student Admissions,Student Admissions
-apps/erpnext/erpnext/accounts/party.py,{0} {1} is disabled,{0} {1} ist deaktiviert
 DocType: Supplier,Billing Currency,Abrechnungswährung
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py,Extra Large,Besonders groß
 DocType: Loan,Loan Application,Kreditantrag
@@ -4486,7 +4494,6 @@
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py,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/accounts/doctype/accounting_dimension/accounting_dimension.py,Creating Dimensions...,Dimensionen erstellen ...
 apps/erpnext/erpnext/education/doctype/student_group_creation_tool/student_group_creation_tool.py,Student Group Name is mandatory in row {0},Studentengruppenname ist obligatorisch in Zeile {0}
-DocType: Customer Credit Limit,Bypass credit limit_check,Kreditlimit_check umgehen
 DocType: Homepage,Products to be shown on website homepage,"Produkte, die auf der Webseite angezeigt werden"
 DocType: HR Settings,Password Policy,Kennwortrichtlinie
 apps/erpnext/erpnext/setup/doctype/customer_group/customer_group.js,This is a root customer group and cannot be edited.,Dies ist eine Root-Kundengruppe und kann nicht bearbeitet werden.
@@ -4790,6 +4797,7 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py,Row {0}: Advance against Customer must be credit,Row {0}: Voraus gegen Kunde muss Kredit
 DocType: Quality Meeting,Quality Meeting,Qualitätstreffen
 apps/erpnext/erpnext/accounts/doctype/account/account.js,Non-Group to Group,Non-Group-Gruppe
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,Stellen Sie die Benennungsserie für {0} über Setup&gt; Einstellungen&gt; Benennungsserie ein
 DocType: Employee,ERPNext User,ERPNext Benutzer
 apps/erpnext/erpnext/education/doctype/student_group_creation_tool/student_group_creation_tool.py,Batch is mandatory in row {0},Batch ist obligatorisch in Zeile {0}
 DocType: Company,Default Buying Terms,Standard-Einkaufsbedingungen
@@ -5084,6 +5092,7 @@
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py,No {0} found for Inter Company Transactions.,Keine {0} für Inter-Company-Transaktionen gefunden.
 DocType: Travel Itinerary,Rented Car,Gemietetes Auto
 apps/erpnext/erpnext/public/js/hub/components/profile_dialog.js,About your Company,Über das Unternehmen
+apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.js,Show Stock Ageing Data,Alterungsdaten anzeigen
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py,Credit To account must be a Balance Sheet account,Habenkonto muss ein Bilanzkonto sein
 DocType: Donor,Donor,Spender
 DocType: Global Defaults,Disable In Words,"""Betrag in Worten"" abschalten"
@@ -5098,8 +5107,10 @@
 DocType: Practitioner Schedule,Schedule Name,Planungsname
 apps/erpnext/erpnext/regional/doctype/gstr_3b_report/gstr_3b_report.py,Please enter GSTIN and state for the Company Address {0},Bitte geben Sie GSTIN ein und geben Sie die Firmenadresse {0} an.
 DocType: Currency Exchange,For Buying,Für den Kauf
+apps/erpnext/erpnext/setup/default_energy_point_rules.py,On Purchase Order Submission,On Purchase Order Submission
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js,Add All Suppliers,Alle Lieferanten hinzufügen
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py,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/accounts/doctype/pricing_rule/pricing_rule.js,Customer &gt; Customer Group &gt; Territory,Kunde&gt; Kundengruppe&gt; Gebiet
 DocType: Tally Migration,Parties,Parteien
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js,Browse BOM,Stückliste durchsuchen
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py,Secured Loans,Gedeckte Kredite
@@ -5131,6 +5142,7 @@
 apps/erpnext/erpnext/stock/doctype/item_alternative/item_alternative.py,Not allow to set alternative item for the item {0},"Nicht zulassen, alternative Artikel für den Artikel {0} festzulegen"
 apps/erpnext/erpnext/hr/doctype/leave_block_list/leave_block_list.py,Date is repeated,Ereignis wiederholen
 apps/erpnext/erpnext/accounts/print_format/payment_receipt_voucher/payment_receipt_voucher.html,Authorized Signatory,Zeichnungsberechtigte/-r
+apps/erpnext/erpnext/education/doctype/instructor/instructor.py,Please setup Instructor Naming System in Education &gt; Education Settings,Richten Sie das Instructor Naming System unter Education&gt; Education Settings ein
 apps/erpnext/erpnext/regional/doctype/gstr_3b_report/gstr_3b_report.html,Net ITC Available(A) - (B),Netto-ITC verfügbar (A) - (B)
 apps/erpnext/erpnext/education/doctype/fee_schedule/fee_schedule.js,Create Fees,Gebühren anlegen
 DocType: Project,Total Purchase Cost (via Purchase Invoice),Summe Einkaufskosten (über Einkaufsrechnung)
@@ -5151,6 +5163,7 @@
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.js,Message Sent,Mitteilung gesendet
 apps/erpnext/erpnext/accounts/doctype/account/account.py,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/assets/report/fixed_asset_register/fixed_asset_register.py,Vendor Name,Herstellername
 DocType: Quiz Result,Wrong,Falsch
 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 (Unternehmenswährung)
@@ -5394,6 +5407,7 @@
 DocType: Stock Settings,Auto Material Request,Automatische Materialanfrage
 DocType: Woocommerce Settings,API consumer secret,API-Konsumentengeheimnis
 DocType: Delivery Note Item,Available Batch Qty at From Warehouse,Verfügbare Chargenmenge im Ausgangslager
+,Received Qty Amount,Erhaltene Menge Menge
 DocType: Salary Slip,Gross Pay - Total Deduction - Loan Repayment,Bruttolohn - Gesamtabzug - Darlehensrückzahlung
 DocType: Bank Account,Last Integration Date,Letztes Integrationsdatum
 DocType: Expense Claim,Expense Taxes and Charges,Steuern und Gebühren
@@ -5852,6 +5866,8 @@
 DocType: Drug Prescription,Hour,Stunde
 DocType: Restaurant Order Entry,Last Sales Invoice,Letzte Verkaufsrechnung
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py,Please select Qty against item {0},Bitte wählen Sie Menge für Artikel {0}
+apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py,Latest Age,Spätes Stadium
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js,Transfer Material to Supplier,Material dem Lieferanten übergeben
 apps/erpnext/erpnext/hr/report/loan_repayment/loan_repayment.py,EMI,EMI
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py,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
@@ -5875,7 +5891,6 @@
 apps/erpnext/erpnext/hr/doctype/employee_benefit_application/employee_benefit_application.py,"An amount of {0} already claimed for the component {1},\
 						 set the amount equal or greater than {2}","Ein Betrag von {0}, der bereits für die Komponente {1} beansprucht wurde, \ den Betrag gleich oder größer als {2} festlegen"
 DocType: Shipping Rule,Shipping Rule Conditions,Versandbedingungen
-DocType: Purchase Invoice,Export Type,Exporttyp
 DocType: Salary Slip Loan,Salary Slip Loan,Gehaltsabrechnung Vorschuss
 DocType: BOM Update Tool,The new BOM after replacement,Die neue Stückliste nach dem Austausch
 ,Point of Sale,Verkaufsstelle
@@ -5995,7 +6010,6 @@
 DocType: Purchase Order Item,Blanket Order Rate,Pauschale Bestellrate
 ,Customer Ledger Summary,Kundenbuchzusammenfassung
 apps/erpnext/erpnext/hooks.py,Certification,Zertifizierung
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js,Are you sure you want to make debit note?,Möchten Sie wirklich eine Lastschrift erstellen?
 DocType: Bank Guarantee,Clauses and Conditions,Klauseln und Bedingungen
 DocType: Serial No,Creation Document Type,Belegerstellungs-Typ
 DocType: Amazon MWS Settings,ES,ES
@@ -6033,8 +6047,6 @@
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py,Financial Services,Finanzdienstleistungen
 DocType: Student Sibling,Student ID,Studenten ID
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.js,For Quantity must be greater than zero,Für Menge muss größer als Null sein
-apps/erpnext/erpnext/hr/doctype/employee_transfer/employee_transfer.py,"Please delete the Employee <a href=""#Form/Employee/{0}"">{0}</a>\
-					to cancel this document","Bitte löschen Sie den Mitarbeiter <a href=""#Form/Employee/{0}"">{0}</a> \, um dieses Dokument zu stornieren"
 apps/erpnext/erpnext/config/projects.py,Types of activities for Time Logs,Arten von Aktivitäten für Time Logs
 DocType: Opening Invoice Creation Tool,Sales,Vertrieb
 DocType: Stock Entry Detail,Basic Amount,Grundbetrag
@@ -6113,6 +6125,7 @@
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py,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,Send Supplier Emails,Lieferantenemails senden
+DocType: Asset Movement,ACC-ASM-.YYYY.-,ACC-ASM-.YYYY.-
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py,"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
 apps/erpnext/erpnext/hr/doctype/employee_onboarding/employee_onboarding.py,Submit this to create the Employee record,"Übergeben Sie dies, um den Mitarbeiterdatensatz zu erstellen"
@@ -6190,7 +6203,6 @@
 DocType: Sales Team,Contact No.,Kontakt-Nr.
 apps/erpnext/erpnext/templates/includes/cart/cart_address.html,Billing Address is same as Shipping Address,Rechnungsadresse stimmt mit Versandadresse überein
 DocType: Bank Reconciliation,Payment Entries,Zahlungs Einträge
-apps/erpnext/erpnext/erpnext_integrations/doctype/shopify_settings/shopify_settings.py,Access token or Shopify URL missing,Zugriffstoken oder Shopify-URL fehlt
 DocType: Location,Latitude,Breite
 DocType: Work Order,Scrap Warehouse,Ausschusslager
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py,"Warehouse required at Row No {0}, please set default warehouse for the item {1} for the company {2}","Warehouse erforderlich in Zeile Nein {0}, legen Sie das Standard-Warehouse für das Element {1} für das Unternehmen {2} fest."
@@ -6233,7 +6245,6 @@
 DocType: Job Offer Term,Value / Description,Wert / Beschreibung
 apps/erpnext/erpnext/controllers/accounts_controller.py,"Row #{0}: Asset {1} cannot be submitted, it is already {2}","Zeile Nr. {0}: Vermögenswert {1} kann nicht vorgelegt werden, es ist bereits {2}"
 DocType: Tax Rule,Billing Country,Land laut Rechnungsadresse
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js,Are you sure you want to make credit note?,Möchten Sie wirklich eine Gutschrift erstellen?
 DocType: Purchase Order Item,Expected Delivery Date,Geplanter Liefertermin
 DocType: Restaurant Order Entry,Restaurant Order Entry,Restaurantbestellung
 apps/erpnext/erpnext/accounts/general_ledger.py,Debit and Credit not equal for {0} #{1}. Difference is {2}.,Soll und Haben nicht gleich für {0} #{1}. Unterschied ist {2}.
@@ -6358,6 +6369,7 @@
 DocType: Purchase Invoice,Taxes and Charges Added,Steuern und Gebühren hinzugefügt
 apps/erpnext/erpnext/assets/doctype/asset/asset.py,Depreciation Row {0}: Next Depreciation Date cannot be before Available-for-use Date,Abschreibungszeile {0}: Das nächste Abschreibungsdatum darf nicht vor dem Verfügbarkeitsdatum liegen
 ,Sales Funnel,Verkaufstrichter
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Item Code &gt; Item Group &gt; Brand,Artikelcode&gt; Artikelgruppe&gt; Marke
 apps/erpnext/erpnext/setup/doctype/company/company.py,Abbreviation is mandatory,Abkürzung ist zwingend erforderlich
 DocType: Project,Task Progress,Vorgangsentwicklung
 apps/erpnext/erpnext/templates/includes/navbar/navbar_items.html,Cart,Einkaufswagen
@@ -6601,6 +6613,7 @@
 DocType: Employee Grade,Employee Grade,Mitarbeiterklasse
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py,Piecework,Akkordarbeit
 DocType: GSTR 3B Report,June,Juni
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Supplier &gt; Supplier Type,Lieferant&gt; Lieferantentyp
 DocType: Share Balance,From No,Von Nr
 DocType: Shift Type,Early Exit Grace Period,Early Exit Grace Period
 DocType: Task,Actual Time (in Hours),Tatsächliche Zeit (in Stunden)
@@ -6883,6 +6896,7 @@
 DocType: Warehouse,Warehouse Name,Lagername
 DocType: Naming Series,Select Transaction,Bitte Transaktionen auswählen
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py,Please enter Approving Role or Approving User,Bitte genehmigende Rolle oder genehmigenden Nutzer eingeben
+apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.py,UOM Conversion factor ({0} -&gt; {1}) not found for item: {2},UOM-Umrechnungsfaktor ({0} -&gt; {1}) für Artikel nicht gefunden: {2}
 apps/erpnext/erpnext/support/doctype/service_level_agreement/service_level_agreement.py,Service Level Agreement with Entity Type {0} and Entity {1} already exists.,Service Level Agreement mit Entitätstyp {0} und Entität {1} ist bereits vorhanden.
 DocType: Journal Entry,Write Off Entry,Abschreibungsbuchung
 DocType: BOM,Rate Of Materials Based On,Anteil der zu Grunde liegenden Materialien
@@ -7073,6 +7087,7 @@
 DocType: Quality Inspection Reading,Quality Inspection Reading,Ablesung zur Qualitätsprüfung
 apps/erpnext/erpnext/stock/doctype/stock_settings/stock_settings.py,`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/stock/report/stock_balance/stock_balance.py,Earliest Age,Frühestes Alter
 apps/erpnext/erpnext/utilities/user_progress.py,Set a sales goal you'd like to achieve for your company.,Gewünschtes Umsatz-Ziel setzen
 DocType: Quality Goal,Revision,Revision
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js,Healthcare Services,Gesundheitswesen
@@ -7116,6 +7131,7 @@
 apps/erpnext/erpnext/healthcare/doctype/patient_encounter/patient_encounter.js,Schedule Discharge,Zeitplan Entlassung
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py,Cheques and Deposits incorrectly cleared,Schecks und Kautionen fälschlicherweise gelöscht
 DocType: Homepage Section Card,Homepage Section Card,Homepage-Bereichskarte
+,Amount To Be Billed,Abzurechnender Betrag
 apps/erpnext/erpnext/accounts/doctype/account/account.py,Account {0}: You can not assign itself as parent account,Konto {0}: Sie können dieses Konto sich selbst nicht als Über-Konto zuweisen
 DocType: Purchase Invoice Item,Price List Rate,Preisliste
 apps/erpnext/erpnext/utilities/activation.py,Create customer quotes,Kunden Angebote erstellen
@@ -7168,6 +7184,7 @@
 DocType: Supplier Scorecard Criteria,Supplier Scorecard Criteria,Lieferanten-Scorecard-Kriterien
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py,Please select Start Date and End Date for Item {0},Bitte Start -und Enddatum für den Artikel {0} auswählen
 DocType: Maintenance Schedule,MAT-MSH-.YYYY.-,MAT-MSH-.YYYY.-
+,Amount to Receive,Zu empfangender Betrag
 apps/erpnext/erpnext/education/doctype/student_group_creation_tool/student_group_creation_tool.py,Course is mandatory in row {0},Kurs ist obligatorisch in Zeile {0}
 apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py,From date can not be greater than than To date,Ab Datum kann nicht größer als Bis Datum sein
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py,To date cannot be before from date,Bis-Datum kann nicht vor Von-Datum liegen
@@ -7416,7 +7433,6 @@
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js,BOM and Manufacturing Quantity are required,Stückliste und Fertigungsmenge werden benötigt
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js,Ageing Range 2,Alter Bereich 2
 DocType: SG Creation Tool Course,Max Strength,Max Kraft
-apps/erpnext/erpnext/accounts/doctype/account/account.py,"Account {0} already exists in child company {1}. The following fields have different values, they should be same:<ul><li>{2}</li></ul>",Das Konto {0} ist bereits in der untergeordneten Firma {1} vorhanden. Die folgenden Felder haben unterschiedliche Werte und sollten gleich sein: <ul><li> {2} </li></ul>
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py,Installing presets,Voreinstellungen installieren
 DocType: Fee Schedule,EDU-FSH-.YYYY.-,EDU-FSH-.YYYY.-
 apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js,No Delivery Note selected for Customer {},Kein Lieferschein für den Kunden {} ausgewählt
@@ -7624,6 +7640,7 @@
 DocType: Delivery Note,Print Without Amount,Drucken ohne Betrag
 apps/erpnext/erpnext/accounts/report/asset_depreciation_ledger/asset_depreciation_ledger.py,Depreciation Date,Abschreibungen Datum
 ,Work Orders in Progress,Arbeitsaufträge in Bearbeitung
+DocType: Customer Credit Limit,Bypass Credit Limit Check,Kreditlimitprüfung umgehen
 DocType: Issue,Support Team,Support-Team
 apps/erpnext/erpnext/stock/report/batch_item_expiry_status/batch_item_expiry_status.py,Expiry (In Days),Verfällt (in Tagen)
 DocType: Appraisal,Total Score (Out of 5),Gesamtwertung (max 5)
@@ -7807,6 +7824,7 @@
 DocType: Sales Invoice,Customer GSTIN,Kunde GSTIN
 DocType: Crop Cycle,List of diseases detected on the field. When selected it'll automatically add a list of tasks to deal with the disease ,"Liste der erkannten Krankheiten auf dem Feld. Wenn diese Option ausgewählt ist, wird automatisch eine Liste mit Aufgaben zur Behandlung der Krankheit hinzugefügt"
 apps/erpnext/erpnext/manufacturing/page/bom_comparison_tool/bom_comparison_tool.js,BOM 1,Stückliste 1
+apps/erpnext/erpnext/assets/report/fixed_asset_register/fixed_asset_register.py,Asset Id,Asset-ID
 apps/erpnext/erpnext/healthcare/doctype/healthcare_service_unit/healthcare_service_unit.js,This is a root healthcare service unit and cannot be edited.,Dies ist eine Root Healthcare Service Unit und kann nicht bearbeitet werden.
 DocType: Asset Repair,Repair Status,Reparaturstatus
 apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.js,"Requested Qty: Quantity requested for purchase, but not ordered.","Angeforderte Menge : Menge durch einen Verkauf benötigt, aber nicht bestellt."
diff --git a/erpnext/translations/el.csv b/erpnext/translations/el.csv
index 1ce4f5f..5f460ef 100644
--- a/erpnext/translations/el.csv
+++ b/erpnext/translations/el.csv
@@ -289,7 +289,6 @@
 DocType: Loan,Repay Over Number of Periods,Εξοφλήσει Πάνω αριθμός των περιόδων
 apps/erpnext/erpnext/manufacturing/report/bom_stock_report/bom_stock_report.py,Quantity to Produce can not be less than Zero,Η ποσότητα παραγωγής δεν μπορεί να είναι μικρότερη από μηδέν
 DocType: Stock Entry,Additional Costs,Πρόσθετα έξοδα
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Customer &gt; Customer Group &gt; Territory,Πελάτης&gt; Ομάδα πελατών&gt; Επικράτεια
 apps/erpnext/erpnext/accounts/doctype/account/account.py,Account with existing transaction can not be converted to group.,Ο λογαριασμός με υπάρχουσα συναλλαγή δεν μπορεί να μετατραπεί σε ομάδα.
 DocType: Lead,Product Enquiry,Ερώτηση για προϊόν
 DocType: Education Settings,Validate Batch for Students in Student Group,Επικύρωση παρτίδας για σπουδαστές σε ομάδα σπουδαστών
@@ -586,6 +585,7 @@
 DocType: Healthcare Settings,Create documents for sample collection,Δημιουργήστε έγγραφα για συλλογή δειγμάτων
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py,Payment against {0} {1} cannot be greater than Outstanding Amount {2},"Πληρωμή κατά {0} {1} δεν μπορεί να είναι μεγαλύτερη από ό, τι οφειλόμενο ποσό {2}"
 apps/erpnext/erpnext/patches/v11_0/add_healthcare_service_unit_tree_root.py,All Healthcare Service Units,Όλες οι Μονάδες Υπηρεσιών Υγείας
+apps/erpnext/erpnext/setup/default_energy_point_rules.py,On Converting Opportunity,Σχετικά με τη δυνατότητα μετατροπής
 DocType: Bank Account,Address HTML,Διεύθυνση ΗΤΜΛ
 DocType: Lead,Mobile No.,Αρ. Κινητού
 apps/erpnext/erpnext/selling/doctype/pos_closing_voucher/closing_voucher_details.html,Mode of Payments,Τρόπος Πληρωμών
@@ -650,7 +650,6 @@
 DocType: Accounting Dimension,Dimension Name,Όνομα διάστασης
 apps/erpnext/erpnext/healthcare/setup.py,Resistant,Ανθεκτικός
 apps/erpnext/erpnext/hotels/doctype/hotel_room_reservation/hotel_room_reservation.py,Please set Hotel Room Rate on {},Παρακαλείστε να ορίσετε την τιμή δωματίου στην {}
-apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py,Please setup numbering series for Attendance via Setup &gt; Numbering Series,Ρυθμίστε τη σειρά αρίθμησης για τη συμμετοχή μέσω του προγράμματος Εγκατάστασης&gt; Σειρά αρίθμησης
 DocType: Journal Entry,Multi Currency,Πολλαπλό Νόμισμα
 DocType: Bank Statement Transaction Invoice Item,Invoice Type,Τύπος τιμολογίου
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py,Valid from date must be less than valid upto date,Ισχύει από την ημερομηνία πρέπει να είναι μικρότερη από την ισχύουσα μέχρι σήμερα
@@ -765,6 +764,7 @@
 apps/erpnext/erpnext/accounts/page/pos/pos.js,Create a new Customer,Δημιουργήστε ένα νέο πελάτη
 apps/erpnext/erpnext/non_profit/report/expiring_memberships/expiring_memberships.py,Expiring On,Λήξη ενεργοποιημένη
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,"If multiple Pricing Rules continue to prevail, users are asked to set Priority manually to resolve conflict.","Αν υπάρχουν πολλοί κανόνες τιμολόγησης που συνεχίζουν να επικρατούν, οι χρήστες καλούνται να ορίσουν προτεραιότητα χειρονακτικά για την επίλυση των διενέξεων."
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js,Purchase Return,Επιστροφή αγοράς
 apps/erpnext/erpnext/utilities/activation.py,Create Purchase Orders,Δημιουργία Εντολών Αγοράς
 ,Purchase Register,Ταμείο αγορών
 apps/erpnext/erpnext/healthcare/doctype/patient/patient.py,Patient not found,Ο ασθενής δεν βρέθηκε
@@ -780,7 +780,6 @@
 DocType: Location,Area UOM,Περιοχή UOM
 apps/erpnext/erpnext/manufacturing/doctype/workstation/workstation.py,Workstation is closed on the following dates as per Holiday List: {0},Ο σταθμός εργασίας είναι κλειστός κατά τις ακόλουθες ημερομηνίες σύμφωνα με τη λίστα αργιών: {0}
 apps/erpnext/erpnext/selling/page/sales_funnel/sales_funnel.py,Opportunities,Ευκαιρίες
-apps/erpnext/erpnext/www/all-products/index.html,Clear filters,Καθαρισμός φίλτρων
 DocType: Lab Test Template,Single,Μονό
 DocType: Compensatory Leave Request,Work From Date,Εργασία από την ημερομηνία
 DocType: Salary Slip,Total Loan Repayment,Σύνολο Αποπληρωμή δανείων
@@ -823,6 +822,7 @@
 DocType: Account,Old Parent,Παλαιός γονέας
 apps/erpnext/erpnext/education/doctype/program_enrollment_tool/program_enrollment_tool.py,Mandatory field - Academic Year,Υποχρεωτικό πεδίο - ακαδημαϊκό έτος
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py,{0} {1} is not associated with {2} {3},{0} {1} δεν συσχετίζεται με {2} {3}
+DocType: Opportunity,Converted By,Μετατροπή από
 apps/erpnext/erpnext/public/js/hub/components/ReviewArea.vue,You need to login as a Marketplace User before you can add any reviews.,Πρέπει να συνδεθείτε ως χρήστης του Marketplace για να μπορέσετε να προσθέσετε σχόλια.
 apps/erpnext/erpnext/manufacturing/doctype/job_card/job_card.py,Row {0} : Operation is required against the raw material item {1},Σειρά {0}: Απαιτείται λειτουργία έναντι του στοιχείου πρώτης ύλης {1}
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py,Please set default payable account for the company {0},Ορίστε προεπιλεγμένο πληρωτέο λογαριασμό για την εταιρεία {0}
@@ -848,6 +848,8 @@
 DocType: BOM,Work Order,Παραγγελία εργασίας
 DocType: Sales Invoice,Total Qty,Συνολική ποσότητα
 apps/erpnext/erpnext/education/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py,Guardian2 Email ID,Όνομα ταυτότητας ηλεκτρονικού ταχυδρομείου Guardian2
+apps/erpnext/erpnext/hr/doctype/employee_transfer/employee_transfer.py,"Please delete the Employee <a href=""#Form/Employee/{0}"">{0}</a>\
+					to cancel this document","Διαγράψτε τον υπάλληλο <a href=""#Form/Employee/{0}"">{0}</a> \ για να ακυρώσετε αυτό το έγγραφο"
 DocType: Item,Show in Website (Variant),Εμφάνιση στην ιστοσελίδα (Παραλλαγή)
 DocType: Employee,Health Concerns,Ανησυχίες για την υγεία
 DocType: Payroll Entry,Select Payroll Period,Επιλέξτε Περίοδο Μισθοδοσίας
@@ -907,7 +909,6 @@
 DocType: Codification Table,Codification Table,Πίνακας κωδικοποίησης
 DocType: Timesheet Detail,Hrs,ώρες
 apps/erpnext/erpnext/manufacturing/page/bom_comparison_tool/bom_comparison_tool.js,Changes in {0},Αλλαγές στο {0}
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js,Please select Company,Επιλέξτε Εταιρεία
 DocType: Employee Skill,Employee Skill,Επιδεξιότητα των εργαζομένων
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.js,Difference Account,Λογαριασμός διαφορών
 DocType: Pricing Rule,Discount on Other Item,Έκπτωση σε άλλο στοιχείο
@@ -975,6 +976,7 @@
 DocType: BOM,Operating Cost,Λειτουργικό κόστος
 DocType: Crop,Produced Items,Παραγόμενα στοιχεία
 DocType: Bank Statement Transaction Entry,Match Transaction to Invoices,Αντιστοίχιση συναλλαγής στα τιμολόγια
+apps/erpnext/erpnext/erpnext_integrations/exotel_integration.py,Error in Exotel incoming call,Σφάλμα στην εισερχόμενη κλήση του Exotel
 DocType: Sales Order Item,Gross Profit,Μικτό κέρδος
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js,Unblock Invoice,Αποκλεισμός τιμολογίου
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py,Increment cannot be 0,Προσαύξηση δεν μπορεί να είναι 0
@@ -1188,6 +1190,7 @@
 DocType: Activity Cost,Activity Type,Τύπος δραστηριότητας
 DocType: Request for Quotation,For individual supplier,Για μεμονωμένο προμηθευτή
 DocType: BOM Operation,Base Hour Rate(Company Currency),Βάση ώρα Rate (Εταιρεία νομίσματος)
+,Qty To Be Billed,Ποσότητα που χρεώνεται
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py,Delivered Amount,Ποσό που παραδόθηκε
 apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.js,Reserved Qty for Production: Raw materials quantity to make manufacturing items.,Ποσότητα εφοδιασμού για την παραγωγή: Ποσότητα πρώτων υλών για την κατασκευή ειδών κατασκευής.
 DocType: Loyalty Point Entry Redemption,Redemption Date,Ημερομηνία Εξαγοράς
@@ -1306,7 +1309,7 @@
 DocType: Sales Invoice,Commission Rate (%),Ποσοστό (%) προμήθειας
 apps/erpnext/erpnext/education/doctype/student_group/student_group.py,Please select Program,Επιλέξτε Προγράμματα
 DocType: Project,Estimated Cost,Εκτιμώμενο κόστος
-DocType: Request for Quotation,Link to material requests,Σύνδεσμος για το υλικό των αιτήσεων
+DocType: Supplier Quotation,Link to material requests,Σύνδεσμος για το υλικό των αιτήσεων
 apps/erpnext/erpnext/public/js/hub/pages/Publish.vue,Publish,Δημοσιεύω
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py,Aerospace,Αεροδιάστημα
 ,Fichier des Ecritures Comptables [FEC],Fichier des Ecritures Comptables [FEC]
@@ -1319,6 +1322,7 @@
 apps/erpnext/erpnext/utilities/transaction_base.py,Invalid Posting Time,Μη έγκυρος χρόνος απόσπασης
 DocType: Salary Component,Condition and Formula,Κατάσταση και τύπος
 DocType: Lead,Campaign Name,Όνομα εκστρατείας
+apps/erpnext/erpnext/setup/default_energy_point_rules.py,On Task Completion,Στην ολοκλήρωση της εργασίας
 apps/erpnext/erpnext/hr/doctype/compensatory_leave_request/compensatory_leave_request.py,There is no leave period in between {0} and {1},Δεν υπάρχει περίοδος άδειας μεταξύ {0} και {1}
 DocType: Fee Validity,Healthcare Practitioner,Υγειονομική περίθαλψη
 DocType: Hotel Room,Capacity,Χωρητικότητα
@@ -1682,7 +1686,6 @@
 DocType: Quality Feedback Template,Quality Feedback Template,Πρότυπο σχολιασμού ποιότητας
 apps/erpnext/erpnext/config/education.py,LMS Activity,Δραστηριότητα LMS
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py,Internet Publishing,Δημοσίευση στο διαδίκτυο
-DocType: Prescription Duration,Number,Αριθμός
 apps/erpnext/erpnext/accounts/doctype/opening_invoice_creation_tool/opening_invoice_creation_tool.js,Creating {0} Invoice,Δημιουργία τιμολογίου {0}
 DocType: Medical Code,Medical Code Standard,Πρότυπο Ιατρικού Κώδικα
 DocType: Soil Texture,Clay Composition (%),Σύνθεση πηλού (%)
@@ -1757,6 +1760,7 @@
 DocType: Support Settings,Get Started Sections,Ξεκινήστε τις ενότητες
 DocType: Lead,CRM-LEAD-.YYYY.-,CRM-LEAD-.YYYY.-
 DocType: Invoice Discounting,Sanctioned,Καθιερωμένος
+,Base Amount,Βάση Βάσης
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.js,Total Contribution Amount: {0},Συνολικό ποσό συμβολής: {0}
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py,Row #{0}: Please specify Serial No for Item {1},Γραμμή # {0}: παρακαλώ ορίστε σειριακό αριθμό για το είδος {1}
 DocType: Payroll Entry,Salary Slips Submitted,Υποβολή μισθών
@@ -1974,6 +1978,7 @@
 apps/erpnext/erpnext/utilities/user_progress.py,List a few of your suppliers. They could be organizations or individuals.,Απαριθμήστε μερικούς από τους προμηθευτές σας. Θα μπορούσαν να είναι φορείς ή ιδιώτες.
 DocType: Accounting Dimension,Dimension Defaults,Προεπιλογές διαστάσεων
 apps/erpnext/erpnext/crm/report/prospects_engaged_but_not_converted/prospects_engaged_but_not_converted.js,Minimum Lead Age (Days),Ελάχιστη ηλικία μόλυβδου (ημέρες)
+apps/erpnext/erpnext/assets/report/fixed_asset_register/fixed_asset_register.py,Available For Use Date,Διαθέσιμη για Ημερομηνία Χρήσης
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py,All BOMs,Όλα BOMs
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js,Create Inter Company Journal Entry,Δημιουργία καταχώρησης εισερχόμενου περιοδικού
 DocType: Company,Parent Company,Οικογενειακή επιχείρηση
@@ -2038,6 +2043,7 @@
 ,IRS 1099,IRS 1099
 DocType: Salary Slip,Leave Without Pay,Άδεια άνευ αποδοχών
 DocType: Payment Request,Outward,Προς τα έξω
+apps/erpnext/erpnext/setup/default_energy_point_rules.py,On {0} Creation,Την {0} Δημιουργία
 apps/erpnext/erpnext/regional/doctype/gstr_3b_report/gstr_3b_report.html,State/UT Tax,Κράτος / φόρος UT
 ,Trial Balance for Party,Ισοζύγιο για το Κόμμα
 ,Gross and Net Profit Report,Αναφορά ακαθάριστων κερδών και καθαρών κερδών
@@ -2153,6 +2159,7 @@
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js,Make Stock Entry,Κάντε καταχώρηση αποθέματος
 DocType: Hotel Room Reservation,Hotel Reservation User,Χρήστης κράτησης ξενοδοχείων
 apps/erpnext/erpnext/projects/doctype/project/project.js,Set Status,Ορισμός κατάστασης
+apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py,Please setup numbering series for Attendance via Setup &gt; Numbering Series,Ρυθμίστε τη σειρά αρίθμησης για τη συμμετοχή μέσω του προγράμματος Εγκατάστασης&gt; Σειρά αρίθμησης
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py,Please select prefix first,Παρακαλώ επιλέξτε πρόθεμα πρώτα
 DocType: Contract,Fulfilment Deadline,Προθεσμία εκπλήρωσης
 apps/erpnext/erpnext/public/js/hub/pages/Home.vue,Near you,Κοντά σας
@@ -2168,6 +2175,7 @@
 DocType: Announcement,All Students,Όλοι οι φοιτητές
 apps/erpnext/erpnext/assets/doctype/asset/asset.py,Item {0} must be a non-stock item,Στοιχείο {0} πρέπει να είναι ένα στοιχείο που δεν απόθεμα
 apps/erpnext/erpnext/stock/doctype/batch/batch.js,View Ledger,Προβολή καθολικού
+DocType: Cost Center,Lft,Lft
 DocType: Grading Scale,Intervals,διαστήματα
 DocType: Bank Statement Transaction Entry,Reconciled Transactions,Συγχωνευμένες συναλλαγές
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py,Earliest,Η πιο παλιά
@@ -2283,6 +2291,7 @@
 apps/erpnext/erpnext/hr/doctype/employee_benefit_application/employee_benefit_application.py,As per your assigned Salary Structure you cannot apply for benefits,"Σύμφωνα με τη δομή μισθοδοσίας σας, δεν μπορείτε να υποβάλετε αίτηση για παροχές"
 apps/erpnext/erpnext/stock/doctype/item/item.py,Website Image should be a public file or website URL,Ιστοσελίδα εικόνας θα πρέπει να είναι ένα δημόσιο αρχείο ή URL της ιστοσελίδας
 DocType: Purchase Invoice Item,BOM,BOM
+apps/erpnext/erpnext/stock/doctype/item/item.py,Duplicate entry in Manufacturers table,Διπλότυπη καταχώρηση στον πίνακα κατασκευαστών
 apps/erpnext/erpnext/setup/doctype/item_group/item_group.js,This is a root item group and cannot be edited.,Αυτή είναι μια κύρια ομάδα ειδών και δεν μπορεί να επεξεργαστεί.
 apps/erpnext/erpnext/accounts/doctype/account/account.js,Merge,Συγχώνευση
 DocType: Journal Entry Account,Purchase Order,Παραγγελία αγοράς
@@ -2427,7 +2436,6 @@
 DocType: Asset,Depreciation Schedules,Δρομολόγια αποσβέσεων
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.js,Create Sales Invoice,Δημιουργία τιμολογίου πωλήσεων
 apps/erpnext/erpnext/regional/doctype/gstr_3b_report/gstr_3b_report.html,Ineligible ITC,Μη επιλέξιμα ITC
-apps/erpnext/erpnext/erpnext_integrations/doctype/shopify_settings/shopify_settings.py,"Support for public app is deprecated. Please setup private app, for more details refer user manual","Η υποστήριξη για τη δημόσια εφαρμογή έχει καταργηθεί. Ρυθμίστε την ιδιωτική εφαρμογή, για περισσότερες λεπτομέρειες ανατρέξτε στο εγχειρίδιο χρήσης"
 DocType: Task,Dependent Tasks,Εξαρτημένες εργασίες
 apps/erpnext/erpnext/regional/report/gstr_1/gstr_1.py,Following accounts might be selected in GST Settings:,Μπορούν να επιλεγούν οι ακόλουθοι λογαριασμοί στις ρυθμίσεις GST:
 apps/erpnext/erpnext/manufacturing/report/bom_stock_report/bom_stock_report.js,Quantity to Produce,Ποσότητα προς παραγωγή
@@ -2679,6 +2687,7 @@
 DocType: Water Analysis,Container,Δοχείο
 apps/erpnext/erpnext/regional/report/gstr_1/gstr_1.py,Please set valid GSTIN No. in Company Address,Ορίστε τον έγκυρο αριθμό GSTIN στη διεύθυνση της εταιρείας
 apps/erpnext/erpnext/education/utils.py,Student {0} - {1} appears Multiple times in row {2} & {3},Φοιτητής {0} - {1} εμφανίζεται πολλές φορές στη σειρά {2} &amp; {3}
+apps/erpnext/erpnext/selling/doctype/customer/customer.py,Following fields are mandatory to create address:,Τα ακόλουθα πεδία είναι υποχρεωτικά για τη δημιουργία διεύθυνσης:
 DocType: Item Alternative,Two-way,Αμφίδρομη
 DocType: Item,Manufacturers,Κατασκευαστές
 apps/erpnext/erpnext/accounts/deferred_revenue.py,Error while processing deferred accounting for {0},Σφάλμα κατά την επεξεργασία της αναβαλλόμενης λογιστικής για {0}
@@ -2753,9 +2762,9 @@
 DocType: Employee,HR-EMP-,HR-EMP-
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py,User {0} doesn't have any default POS Profile. Check Default at Row {1} for this User.,Ο χρήστης {0} δεν έχει προεπιλεγμένο προφίλ POS. Έλεγχος προεπιλογής στη γραμμή {1} για αυτόν τον χρήστη.
 DocType: Quality Meeting Minutes,Quality Meeting Minutes,Πρακτικά πρακτικά συνάντησης
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Supplier &gt; Supplier Type,Προμηθευτής&gt; Τύπος προμηθευτή
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py,Employee Referral,Παραπομπής των εργαζομένων
 DocType: Student Group,Set 0 for no limit,Ορίστε 0 για χωρίς όριο
+DocType: Cost Center,rgt,Rgt
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py,The day(s) on which you are applying for leave are holidays. You need not apply for leave.,Η ημέρα (ες) για την οποία υποβάλλετε αίτηση για άδεια είναι αργίες. Δεν χρειάζεται να ζητήσει άδεια.
 DocType: Customer,Primary Address and Contact Detail,Κύρια διεύθυνση και στοιχεία επικοινωνίας
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.js,Resend Payment Email,Επανάληψη αποστολής Πληρωμής Email
@@ -2865,7 +2874,6 @@
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py,Against Supplier Invoice {0} dated {1},Κατά το τιμολόγιο προμηθευτή {0} της {1}
 DocType: Customer,Default Price List,Προεπιλεγμένος τιμοκατάλογος
 apps/erpnext/erpnext/assets/doctype/asset/asset.py,Asset Movement record {0} created,ρεκόρ Κίνηση περιουσιακό στοιχείο {0} δημιουργήθηκε
-apps/erpnext/erpnext/utilities/page/leaderboard/leaderboard.js,No items found.,Δεν βρέθηκαν αντικείμενα.
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py,You cannot delete Fiscal Year {0}. Fiscal Year {0} is set as default in Global Settings,Δεν μπορείτε να διαγράψετε Χρήσεως {0}. Φορολογικό Έτος {0} έχει οριστεί ως προεπιλογή στο Καθολικές ρυθμίσεις
 DocType: Share Transfer,Equity/Liability Account,Λογαριασμός Ιδίων Κεφαλαίων / Υποχρεώσεων
 apps/erpnext/erpnext/setup/doctype/customer_group/customer_group.py,A customer with the same name already exists,Ένας πελάτης με το ίδιο όνομα υπάρχει ήδη
@@ -2881,6 +2889,7 @@
 apps/erpnext/erpnext/selling/doctype/customer/customer.py,Credit limit has been crossed for customer {0} ({1}/{2}),Το πιστωτικό όριο έχει περάσει για τον πελάτη {0} ({1} / {2})
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py,Customer required for 'Customerwise Discount',Για την έκπτωση με βάση πελάτη είναι απαραίτητο να επιλεγεί πελάτης
 apps/erpnext/erpnext/config/accounting.py,Update bank payment dates with journals.,Ενημέρωση ημερομηνιών πληρωμών τραπέζης μέσω ημερολογίου.
+,Billed Qty,Τιμολογημένη ποσότητα
 apps/erpnext/erpnext/stock/doctype/item/item_dashboard.py,Pricing,τιμολόγηση
 DocType: Employee,Attendance Device ID (Biometric/RF tag ID),Αναγνωριστικό συσκευής παρακολούθησης (αναγνωριστικό βιομετρικής ετικέτας / RF)
 DocType: Quotation,Term Details,Λεπτομέρειες όρων
@@ -2902,6 +2911,7 @@
 DocType: Share Transfer,Asset Account,Λογαριασμός Asset
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js,New release date should be in the future,Νέα ημερομηνία κυκλοφορίας θα πρέπει να είναι στο μέλλον
 DocType: Purchase Invoice,End date of current invoice's period,Ημερομηνία λήξης της περιόδου του τρέχοντος τιμολογίου
+apps/erpnext/erpnext/hr/doctype/employee/employee.py,Please setup Employee Naming System in Human Resource &gt; HR Settings,Ρυθμίστε το Σύστημα Ονοματοδοσίας Εργαζομένων σε Ανθρώπινο Δυναμικό&gt; Ρυθμίσεις HR
 DocType: Lab Test,Technician Name,Όνομα τεχνικού
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py,"Cannot ensure delivery by Serial No as \
 					Item {0} is added with and without Ensure Delivery by \
@@ -2909,6 +2919,7 @@
 DocType: Accounts Settings,Unlink Payment on Cancellation of Invoice,Αποσύνδεση Πληρωμή κατά την ακύρωσης της Τιμολόγιο
 DocType: Bank Reconciliation,From Date,Από ημερομηνία
 apps/erpnext/erpnext/hr/doctype/vehicle_log/vehicle_log.py,Current Odometer reading entered should be greater than initial Vehicle Odometer {0},Τρέχουσα ανάγνωση οδομέτρων τέθηκε πρέπει να είναι μεγαλύτερη από την αρχική του χιλιομετρητή του οχήματος {0}
+,Purchase Order Items To Be Received or Billed,Στοιχεία παραγγελίας αγοράς που πρέπει να ληφθούν ή να χρεωθούν
 DocType: Restaurant Reservation,No Show,Δεν δείχνουν
 apps/erpnext/erpnext/regional/india/utils.py,You must be a registered supplier to generate e-Way Bill,Πρέπει να είστε εγγεγραμμένος προμηθευτής για να δημιουργήσετε ηλεκτρονικό νομοσχέδιο
 DocType: Shipping Rule Country,Shipping Rule Country,Αποστολές κανόνα της χώρας
@@ -2951,6 +2962,7 @@
 apps/erpnext/erpnext/templates/generators/item/item_add_to_cart.html,View in Cart,Προβολή Καλάθι
 DocType: Employee Checkin,Shift Actual Start,Μετακίνηση πραγματικής εκκίνησης
 DocType: Tally Migration,Is Day Book Data Imported,Εισάγονται δεδομένα βιβλίου ημέρας
+,Purchase Order Items To Be Received or Billed1,Στοιχεία παραγγελίας αγοράς που πρέπει να ληφθούν ή να χρεωθούν1
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py,Marketing Expenses,Δαπάνες marketing
 apps/erpnext/erpnext/stock/doctype/pick_list/pick_list.py,{0} units of {1} is not available.,{0} μονάδες {1} δεν είναι διαθέσιμες.
 ,Item Shortage Report,Αναφορά έλλειψης είδους
@@ -3175,7 +3187,6 @@
 apps/erpnext/erpnext/public/js/call_popup/call_popup.js,View all issues from {0},Προβολή όλων των θεμάτων από {0}
 DocType: Quality Inspection,MAT-QA-.YYYY.-,MAT-QA-.YYYY.-
 DocType: Quality Meeting Table,Quality Meeting Table,Πίνακας ποιότητας συναντήσεων
-apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,Ορίστε την Ονοματοδοσία για {0} μέσω του Setup&gt; Settings&gt; Naming Series
 apps/erpnext/erpnext/templates/pages/help.html,Visit the forums,Επισκεφθείτε τα φόρουμ
 DocType: Student,Student Mobile Number,Φοιτητής Αριθμός Κινητού
 DocType: Item,Has Variants,Έχει παραλλαγές
@@ -3317,6 +3328,7 @@
 DocType: Homepage Section,Section Cards,Κάρτες Ενότητας
 ,Campaign Efficiency,Αποτελεσματικότητα καμπάνιας
 DocType: Discussion,Discussion,Συζήτηση
+apps/erpnext/erpnext/setup/default_energy_point_rules.py,On Sales Order Submission,Σχετικά με την υποβολή της εντολής πώλησης
 DocType: Bank Transaction,Transaction ID,Ταυτότητα συναλλαγής
 DocType: Payroll Entry,Deduct Tax For Unsubmitted Tax Exemption Proof,Αποκτήστε φόρο για μη αποδεδειγμένη φορολογική απαλλαγή
 DocType: Volunteer,Anytime,Οποτεδήποτε
@@ -3324,7 +3336,6 @@
 DocType: Employee Tax Exemption Proof Submission,Employee Tax Exemption Proof Submission,Υποβολή απόδειξης απαλλαγής από φόρο εργαζομένων
 DocType: Patient,Surgical History,Χειρουργική Ιστορία
 DocType: Bank Statement Settings Item,Mapped Header,Χαρτογραφημένη κεφαλίδα
-apps/erpnext/erpnext/hr/doctype/employee/employee.py,Please setup Employee Naming System in Human Resource &gt; HR Settings,Ρυθμίστε το Σύστημα Ονοματοδοσίας Εργαζομένων σε Ανθρώπινο Δυναμικό&gt; Ρυθμίσεις HR
 DocType: Employee,Resignation Letter Date,Ημερομηνία επιστολής παραίτησης
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Pricing Rules are further filtered based on quantity.,Οι κανόνες τιμολόγησης φιλτράρονται περαιτέρω με βάση την ποσότητα.
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py,Please set the Date Of Joining for employee {0},Ρυθμίστε την Ημερομηνία Σύνδεσης για το {0}
@@ -3338,6 +3349,7 @@
 DocType: Bank Statement Settings,Mapped Items,Χαρτογραφημένα στοιχεία
 DocType: Amazon MWS Settings,IT,ΤΟ
 DocType: Chapter,Chapter,Κεφάλαιο
+,Fixed Asset Register,Μητρώο πάγιων περιουσιακών στοιχείων
 apps/erpnext/erpnext/utilities/user_progress.py,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,Select BOM and Qty for Production,Επιλέξτε BOM και Ποσότητα Παραγωγής
@@ -3473,7 +3485,6 @@
 apps/erpnext/erpnext/templates/emails/reorder_item.html,Following Material Requests have been raised automatically based on Item's re-order level,Μετά από αιτήματα Υλικό έχουν τεθεί αυτόματα ανάλογα με το επίπεδο εκ νέου την τάξη αντικειμένου
 apps/erpnext/erpnext/controllers/accounts_controller.py,Account {0} is invalid. Account Currency must be {1},Ο Λογαριασμός {0} είναι άκυρος. Η Νομισματική Μονάδα πρέπει να είναι {1}
 apps/erpnext/erpnext/hr/doctype/salary_structure_assignment/salary_structure_assignment.py,From Date {0} cannot be after employee's relieving Date {1},Από την ημερομηνία {0} δεν μπορεί να είναι μετά την ημερομηνία ανακούφισης του υπαλλήλου {1}
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py,Debit Note {0} has been created automatically,Η χρεωστική σημείωση {0} δημιουργήθηκε αυτόματα
 apps/erpnext/erpnext/accounts/doctype/payment_order/payment_order.js,Create Payment Entries,Δημιουργία εγγραφών πληρωμής
 DocType: Supplier,Is Internal Supplier,Είναι εσωτερικός προμηθευτής
 DocType: Employee,Create User Permission,Δημιουργία άδειας χρήστη
@@ -4032,7 +4043,6 @@
 DocType: Project User,Project Status,Κατάσταση έργου
 DocType: UOM,Check this to disallow fractions. (for Nos),Επιλέξτε αυτό για να απαγορεύσετε κλάσματα. (Όσον αφορά τους αριθμούς)
 DocType: Student Admission Program,Naming Series (for Student Applicant),Ονοματοδοσία Series (για Student αιτούντα)
-apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.py,UOM Conversion factor ({0} -&gt; {1}) not found for item: {2},UOM Ο συντελεστής μετατροπής ({0} -&gt; {1}) δεν βρέθηκε για το στοιχείο: {2}
 apps/erpnext/erpnext/hr/doctype/retention_bonus/retention_bonus.py,Bonus Payment Date cannot be a past date,Η ημερομηνία πληρωμής μπόνους δεν μπορεί να είναι προηγούμενη
 DocType: Travel Request,Copy of Invitation/Announcement,Αντίγραφο πρόσκλησης / Ανακοίνωσης
 DocType: Practitioner Service Unit Schedule,Practitioner Service Unit Schedule,Πρόγραμμα μονάδας παροχής υπηρεσιών πρακτικής
@@ -4200,6 +4210,7 @@
 apps/erpnext/erpnext/utilities/user_progress.py,Setup Company,Εγκαταστήστε την εταιρεία
 ,Lab Test Report,Αναφορά δοκιμών εργαστηρίου
 DocType: Employee Benefit Application,Employee Benefit Application,Εφαρμογή παροχών προσωπικού
+apps/erpnext/erpnext/accounts/doctype/invoice_discounting/invoice_discounting.py,Row({0}): {1} is already discounted in {2},Η σειρά ({0}): {1} είναι ήδη προεξοφλημένη στο {2}
 apps/erpnext/erpnext/hr/doctype/additional_salary/additional_salary.py,Additional Salary Component Exists.,Υπάρχει πρόσθετο στοιχείο μισθοδοσίας.
 DocType: Purchase Invoice,Unregistered,Αδήλωτος
 DocType: Student Applicant,Application Date,Ημερομηνία αίτησης
@@ -4278,7 +4289,6 @@
 DocType: Journal Entry,Accounting Entries,Λογιστικές εγγραφές
 DocType: Job Card Time Log,Job Card Time Log,Κάρτα χρόνου εργασίας κάρτας εργασίας
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,"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;."
-apps/erpnext/erpnext/education/doctype/instructor/instructor.py,Please setup Instructor Naming System in Education &gt; Education Settings,Ρυθμίστε το Σύστημα Ονοματοδοσίας Εκπαιδευτών στην Εκπαίδευση&gt; Ρυθμίσεις Εκπαίδευσης
 DocType: Journal Entry,Paid Loan,Καταβεβλημένο δάνειο
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py,Duplicate Entry. Please check Authorization Rule {0},Διπλότυπη καταχώρηση. Παρακαλώ ελέγξτε τον κανόνα εξουσιοδότησης {0}
 DocType: Journal Entry Account,Reference Due Date,Ημερομηνία λήξης αναφοράς
@@ -4295,7 +4305,6 @@
 apps/erpnext/erpnext/templates/pages/projects.html,No time sheets,Δεν υπάρχει χρόνος φύλλα
 DocType: GoCardless Mandate,GoCardless Customer,GoCardless Πελάτης
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py,Leave Type {0} cannot be carry-forwarded,"Αφήστε Τύπος {0} δεν μπορεί να μεταφέρει, διαβιβάζεται"
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Item Code &gt; Item Group &gt; Brand,Κωδικός στοιχείου&gt; Ομάδα στοιχείων&gt; Μάρκα
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py,Maintenance Schedule is not generated for all the items. Please click on 'Generate Schedule',Το χρονοδιάγραμμα συντήρησης δεν έχει δημιουργηθεί για όλα τα είδη. Παρακαλώ κάντε κλικ στο δημιουργία χρονοδιαγράμματος
 ,To Produce,Για παραγωγή
 DocType: Leave Encashment,Payroll,Μισθολόγιο
@@ -4410,7 +4419,6 @@
 DocType: Stock Ledger Entry,Actual Qty After Transaction,Πραγματική ποσότητα μετά την συναλλαγή
 ,Pending SO Items For Purchase Request,Εκκρεμή είδη παραγγελίας πωλήσεων για αίτημα αγοράς
 apps/erpnext/erpnext/education/doctype/student_admission/student_admission.py,Student Admissions,Εισαγωγή φοιτητής
-apps/erpnext/erpnext/accounts/party.py,{0} {1} is disabled,{0} {1} είναι απενεργοποιημένη
 DocType: Supplier,Billing Currency,Νόμισμα Τιμολόγησης
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py,Extra Large,Πολύ Μεγάλο
 DocType: Loan,Loan Application,Αίτηση για δάνειο
@@ -4487,7 +4495,6 @@
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py,Only Leave Applications with status 'Approved' and 'Rejected' can be submitted,Αφήστε Εφαρμογές με την ιδιότητα μόνο «Εγκρίθηκε» και «Απορρίπτεται» μπορούν να υποβληθούν
 apps/erpnext/erpnext/accounts/doctype/accounting_dimension/accounting_dimension.py,Creating Dimensions...,Δημιουργία διαστάσεων ...
 apps/erpnext/erpnext/education/doctype/student_group_creation_tool/student_group_creation_tool.py,Student Group Name is mandatory in row {0},Ομάδα Φοιτητών Όνομα είναι υποχρεωτικό στη σειρά {0}
-DocType: Customer Credit Limit,Bypass credit limit_check,Παράκαμψη credit_check
 DocType: Homepage,Products to be shown on website homepage,Προϊόντα που πρέπει να αναγράφονται στην ιστοσελίδα του
 DocType: HR Settings,Password Policy,Πολιτική κωδικού πρόσβασης
 apps/erpnext/erpnext/setup/doctype/customer_group/customer_group.js,This is a root customer group and cannot be edited.,Αυτή είναι μια κύρια ομάδα πελατών ρίζα και δεν μπορεί να επεξεργαστεί.
@@ -4791,6 +4798,7 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py,Row {0}: Advance against Customer must be credit,Σειρά {0}: Προκαταβολή έναντι των πελατών πρέπει να είναι πιστωτικά
 DocType: Quality Meeting,Quality Meeting,Πραγματική συνάντηση
 apps/erpnext/erpnext/accounts/doctype/account/account.js,Non-Group to Group,Μη-ομάδα σε ομάδα
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,Ορίστε την Ονοματοδοσία για {0} μέσω του Setup&gt; Settings&gt; Naming Series
 DocType: Employee,ERPNext User,ERPΕπόμενο χρήστη
 apps/erpnext/erpnext/education/doctype/student_group_creation_tool/student_group_creation_tool.py,Batch is mandatory in row {0},Η παρτίδα είναι υποχρεωτική στη σειρά {0}
 DocType: Company,Default Buying Terms,Προεπιλεγμένοι όροι αγοράς
@@ -5085,6 +5093,7 @@
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py,No {0} found for Inter Company Transactions.,Δεν βρέθηκε {0} για τις συναλλαγές μεταξύ εταιρειών.
 DocType: Travel Itinerary,Rented Car,Νοικιασμένο αυτοκίνητο
 apps/erpnext/erpnext/public/js/hub/components/profile_dialog.js,About your Company,Σχετικά με την εταιρεία σας
+apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.js,Show Stock Ageing Data,Εμφάνιση δεδομένων γήρανσης των αποθεμάτων
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py,Credit To account must be a Balance Sheet account,Πίστωση του λογαριασμού πρέπει να είναι ένα κονδύλι του Ισολογισμού
 DocType: Donor,Donor,Δότης
 DocType: Global Defaults,Disable In Words,Απενεργοποίηση στα λόγια
@@ -5099,8 +5108,10 @@
 DocType: Practitioner Schedule,Schedule Name,Όνομα προγράμματος
 apps/erpnext/erpnext/regional/doctype/gstr_3b_report/gstr_3b_report.py,Please enter GSTIN and state for the Company Address {0},Πληκτρολογήστε GSTIN και δηλώστε την διεύθυνση της εταιρείας {0}
 DocType: Currency Exchange,For Buying,Για την αγορά
+apps/erpnext/erpnext/setup/default_energy_point_rules.py,On Purchase Order Submission,Στην υποβολή της παραγγελίας αγοράς
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js,Add All Suppliers,Προσθήκη όλων των προμηθευτών
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py,Row #{0}: Allocated Amount cannot be greater than outstanding amount.,Σειρά # {0}: Το κατανεμημένο ποσό δεν μπορεί να είναι μεγαλύτερο από το οφειλόμενο ποσό.
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Customer &gt; Customer Group &gt; Territory,Πελάτης&gt; Ομάδα πελατών&gt; Επικράτεια
 DocType: Tally Migration,Parties,Συμβαλλόμενα μέρη
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js,Browse BOM,Αναζήτηση BOM
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py,Secured Loans,Εξασφαλισμένα δάνεια
@@ -5132,6 +5143,7 @@
 apps/erpnext/erpnext/stock/doctype/item_alternative/item_alternative.py,Not allow to set alternative item for the item {0},Δεν επιτρέπεται να ορίσετε εναλλακτικό στοιχείο για το στοιχείο {0}
 apps/erpnext/erpnext/hr/doctype/leave_block_list/leave_block_list.py,Date is repeated,Η ημερομηνία επαναλαμβάνεται
 apps/erpnext/erpnext/accounts/print_format/payment_receipt_voucher/payment_receipt_voucher.html,Authorized Signatory,Εξουσιοδοτημένο υπογράφοντα
+apps/erpnext/erpnext/education/doctype/instructor/instructor.py,Please setup Instructor Naming System in Education &gt; Education Settings,Ρυθμίστε το Σύστημα Ονοματοδοσίας Εκπαιδευτών στην Εκπαίδευση&gt; Ρυθμίσεις Εκπαίδευσης
 apps/erpnext/erpnext/regional/doctype/gstr_3b_report/gstr_3b_report.html,Net ITC Available(A) - (B),Διαθέσιμο διαθέσιμο ITC (A) - (B)
 apps/erpnext/erpnext/education/doctype/fee_schedule/fee_schedule.js,Create Fees,Δημιουργία τελών
 DocType: Project,Total Purchase Cost (via Purchase Invoice),Συνολικό Κόστος Αγοράς (μέσω του τιμολογίου αγοράς)
@@ -5152,6 +5164,7 @@
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.js,Message Sent,Το μήνυμα εστάλη
 apps/erpnext/erpnext/accounts/doctype/account/account.py,Account with child nodes cannot be set as ledger,Ο λογαριασμός με κόμβους παιδί δεν μπορεί να οριστεί ως καθολικό
 DocType: C-Form,II,II
+apps/erpnext/erpnext/assets/report/fixed_asset_register/fixed_asset_register.py,Vendor Name,Ονομα πωλητή
 DocType: Quiz Result,Wrong,Λανθασμένος
 DocType: Sales Invoice,Rate at which Price list currency is converted to customer's base currency,Ισοτιμία με την οποία το νόμισμα τιμοκαταλόγου μετατρέπεται στο βασικό νόμισμα του πελάτη
 DocType: Purchase Invoice Item,Net Amount (Company Currency),Καθαρό Ποσό (Εταιρεία νομίσματος)
@@ -5395,6 +5408,7 @@
 DocType: Stock Settings,Auto Material Request,Αυτόματη αίτηση υλικού
 DocType: Woocommerce Settings,API consumer secret,API καταναλωτικό απόρρητο
 DocType: Delivery Note Item,Available Batch Qty at From Warehouse,Διαθέσιμο παρτίδας Ποσότητα σε από την αποθήκη
+,Received Qty Amount,Έλαβε Ποσό Ποσότητας
 DocType: Salary Slip,Gross Pay - Total Deduction - Loan Repayment,Μεικτές Αποδοχές - Σύνολο Έκπτωση - Αποπληρωμή δανείου
 DocType: Bank Account,Last Integration Date,Τελευταία ημερομηνία ολοκλήρωσης
 DocType: Expense Claim,Expense Taxes and Charges,Φόροι και χρεώσεις εξόδων
@@ -5853,6 +5867,8 @@
 DocType: Drug Prescription,Hour,Ώρα
 DocType: Restaurant Order Entry,Last Sales Invoice,Τελευταίο τιμολόγιο πωλήσεων
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py,Please select Qty against item {0},Παρακαλούμε επιλέξτε Qty έναντι στοιχείου {0}
+apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py,Latest Age,Τελικό στάδιο
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js,Transfer Material to Supplier,Μεταφορά Υλικού Προμηθευτή
 apps/erpnext/erpnext/hr/report/loan_repayment/loan_repayment.py,EMI,ΕΜΙ
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py,New Serial No cannot have Warehouse. Warehouse must be set by Stock Entry or Purchase Receipt,Ένας νέος σειριακός αριθμός δεν μπορεί να έχει αποθήκη. Η αποθήκη πρέπει να ορίζεται από καταχωρήσεις αποθέματος ή από παραλαβές αγορών
 DocType: Lead,Lead Type,Τύπος επαφής
@@ -5876,7 +5892,6 @@
 apps/erpnext/erpnext/hr/doctype/employee_benefit_application/employee_benefit_application.py,"An amount of {0} already claimed for the component {1},\
 						 set the amount equal or greater than {2}","Ένα ποσό {0} που αξιώνεται ήδη για το στοιχείο {1}, \ θέτει το ποσό ίσο ή μεγαλύτερο από {2}"
 DocType: Shipping Rule,Shipping Rule Conditions,Όροι κανόνα αποστολής
-DocType: Purchase Invoice,Export Type,Τύπος εξαγωγής
 DocType: Salary Slip Loan,Salary Slip Loan,Δανείου μισθοδοσίας
 DocType: BOM Update Tool,The new BOM after replacement,Η νέα Λ.Υ. μετά την αντικατάστασή
 ,Point of Sale,Point of sale
@@ -5996,7 +6011,6 @@
 DocType: Purchase Order Item,Blanket Order Rate,Τιμή παραγγελίας σε κουβέρτα
 ,Customer Ledger Summary,Περίληψη Πελατών Πελατών
 apps/erpnext/erpnext/hooks.py,Certification,Πιστοποίηση
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js,Are you sure you want to make debit note?,Είστε βέβαιοι ότι θέλετε να κάνετε χρεωστική σημείωση;
 DocType: Bank Guarantee,Clauses and Conditions,Ρήτρες και προϋποθέσεις
 DocType: Serial No,Creation Document Type,Τύπος εγγράφου δημιουργίας
 DocType: Amazon MWS Settings,ES,ES
@@ -6034,8 +6048,6 @@
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py,Financial Services,Χρηματοοικονομικές υπηρεσίες
 DocType: Student Sibling,Student ID,φοιτητής ID
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.js,For Quantity must be greater than zero,Για την ποσότητα πρέπει να είναι μεγαλύτερη από μηδέν
-apps/erpnext/erpnext/hr/doctype/employee_transfer/employee_transfer.py,"Please delete the Employee <a href=""#Form/Employee/{0}"">{0}</a>\
-					to cancel this document","Διαγράψτε τον υπάλληλο <a href=""#Form/Employee/{0}"">{0}</a> \ για να ακυρώσετε αυτό το έγγραφο"
 apps/erpnext/erpnext/config/projects.py,Types of activities for Time Logs,Τύποι δραστηριοτήτων για την Ώρα των αρχείων καταγραφής
 DocType: Opening Invoice Creation Tool,Sales,Πωλήσεις
 DocType: Stock Entry Detail,Basic Amount,Βασικό Ποσό
@@ -6114,6 +6126,7 @@
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py,Print and Stationery,Εκτύπωση και Χαρτικά
 DocType: Stock Settings,Show Barcode Field,Εμφάνιση Barcode πεδίο
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js,Send Supplier Emails,Αποστολή Emails Προμηθευτής
+DocType: Asset Movement,ACC-ASM-.YYYY.-,ACC-ASM-.YYYY.-
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py,"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,Δημιουργήθηκε αυτόματα
 apps/erpnext/erpnext/hr/doctype/employee_onboarding/employee_onboarding.py,Submit this to create the Employee record,Υποβάλετε αυτό για να δημιουργήσετε την εγγραφή του υπαλλήλου
@@ -6191,7 +6204,6 @@
 DocType: Sales Team,Contact No.,Αριθμός επαφής
 apps/erpnext/erpnext/templates/includes/cart/cart_address.html,Billing Address is same as Shipping Address,Η διεύθυνση χρέωσης είναι ίδια με τη διεύθυνση αποστολής
 DocType: Bank Reconciliation,Payment Entries,Ενδείξεις πληρωμής
-apps/erpnext/erpnext/erpnext_integrations/doctype/shopify_settings/shopify_settings.py,Access token or Shopify URL missing,Το αναγνωριστικό πρόσβασης ή η διεύθυνση ηλεκτρονικού ταχυδρομείου εξαίρεσης λείπουν
 DocType: Location,Latitude,Γεωγραφικό πλάτος
 DocType: Work Order,Scrap Warehouse,Άχρηστα Αποθήκη
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py,"Warehouse required at Row No {0}, please set default warehouse for the item {1} for the company {2}","Απαιτείται αποθήκη στη σειρά αριθ. {0}, ρυθμίστε την προεπιλεγμένη αποθήκη για το στοιχείο {1} για την εταιρεία {2}"
@@ -6234,7 +6246,6 @@
 DocType: Job Offer Term,Value / Description,Αξία / Περιγραφή
 apps/erpnext/erpnext/controllers/accounts_controller.py,"Row #{0}: Asset {1} cannot be submitted, it is already {2}","Σειρά # {0}: Asset {1} δεν μπορεί να υποβληθεί, είναι ήδη {2}"
 DocType: Tax Rule,Billing Country,Χρέωση Χώρα
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js,Are you sure you want to make credit note?,Είστε βέβαιοι ότι θέλετε να κάνετε πιστωτική σημείωση;
 DocType: Purchase Order Item,Expected Delivery Date,Αναμενόμενη ημερομηνία παράδοσης
 DocType: Restaurant Order Entry,Restaurant Order Entry,Είσοδος Παραγγελίας Εστιατορίου
 apps/erpnext/erpnext/accounts/general_ledger.py,Debit and Credit not equal for {0} #{1}. Difference is {2}.,Χρεωστικών και Πιστωτικών δεν είναι ίση για {0} # {1}. Η διαφορά είναι {2}.
@@ -6359,6 +6370,7 @@
 DocType: Purchase Invoice,Taxes and Charges Added,Φόροι και επιβαρύνσεις που προστέθηκαν
 apps/erpnext/erpnext/assets/doctype/asset/asset.py,Depreciation Row {0}: Next Depreciation Date cannot be before Available-for-use Date,Απόσβεση γραμμής {0}: Η επόμενη ημερομηνία απόσβεσης δεν μπορεί να γίνει πριν από την Ημερομηνία διαθέσιμης για χρήση
 ,Sales Funnel,Χοάνη πωλήσεων
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Item Code &gt; Item Group &gt; Brand,Κωδικός στοιχείου&gt; Ομάδα στοιχείων&gt; Μάρκα
 apps/erpnext/erpnext/setup/doctype/company/company.py,Abbreviation is mandatory,Σύντμηση είναι υποχρεωτική
 DocType: Project,Task Progress,Task Progress
 apps/erpnext/erpnext/templates/includes/navbar/navbar_items.html,Cart,Το Καλάθι
@@ -6603,6 +6615,7 @@
 DocType: Employee Grade,Employee Grade,Υπάλληλος βαθμού
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py,Piecework,Εργασία με το κομμάτι
 DocType: GSTR 3B Report,June,Ιούνιος
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Supplier &gt; Supplier Type,Προμηθευτής&gt; Τύπος προμηθευτή
 DocType: Share Balance,From No,Από τον αριθμό
 DocType: Shift Type,Early Exit Grace Period,Πρώτη περίοδος χάριτος εξόδου
 DocType: Task,Actual Time (in Hours),Πραγματικός χρόνος (σε ώρες)
@@ -6887,6 +6900,7 @@
 DocType: Warehouse,Warehouse Name,Όνομα αποθήκης
 DocType: Naming Series,Select Transaction,Επιλέξτε συναλλαγή
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py,Please enter Approving Role or Approving User,Παρακαλώ εισάγετε ρόλο έγκρισης ή χρήστη έγκρισης
+apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.py,UOM Conversion factor ({0} -&gt; {1}) not found for item: {2},UOM Ο συντελεστής μετατροπής ({0} -&gt; {1}) δεν βρέθηκε για το στοιχείο: {2}
 apps/erpnext/erpnext/support/doctype/service_level_agreement/service_level_agreement.py,Service Level Agreement with Entity Type {0} and Entity {1} already exists.,Συμφωνία επιπέδου υπηρεσίας με τον τύπο οντότητας {0} και την οντότητα {1} υπάρχει ήδη.
 DocType: Journal Entry,Write Off Entry,Καταχώρηση διαγραφής
 DocType: BOM,Rate Of Materials Based On,Τιμή υλικών με βάση
@@ -7077,6 +7091,7 @@
 DocType: Quality Inspection Reading,Quality Inspection Reading,Μέτρηση επιθεώρησης ποιότητας
 apps/erpnext/erpnext/stock/doctype/stock_settings/stock_settings.py,`Freeze Stocks Older Than` should be smaller than %d days.,Το `πάγωμα αποθεμάτων παλαιότερα από ` θα πρέπει να είναι μικρότερο από % d ημέρες.
 DocType: Tax Rule,Purchase Tax Template,Αγοράστε Φορολογικά Πρότυπο
+apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py,Earliest Age,Πρώιμη εποχή
 apps/erpnext/erpnext/utilities/user_progress.py,Set a sales goal you'd like to achieve for your company.,Ορίστε έναν στόχο πωλήσεων που θέλετε να επιτύχετε για την εταιρεία σας.
 DocType: Quality Goal,Revision,Αναθεώρηση
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js,Healthcare Services,Υπηρεσίες υγειονομικής περίθαλψης
@@ -7120,6 +7135,7 @@
 apps/erpnext/erpnext/healthcare/doctype/patient_encounter/patient_encounter.js,Schedule Discharge,Πρόγραμμα απαλλαγής
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py,Cheques and Deposits incorrectly cleared,Οι επιταγές και καταθέσεις εκκαθαριστεί ορθά
 DocType: Homepage Section Card,Homepage Section Card,Κάρτα ενότητας αρχικής σελίδας
+,Amount To Be Billed,Ποσό που χρεώνεται
 apps/erpnext/erpnext/accounts/doctype/account/account.py,Account {0}: You can not assign itself as parent account,Ο λογαριασμός {0}: δεν μπορεί να οριστεί ως γονικός λογαριασμός του εαυτού του.
 DocType: Purchase Invoice Item,Price List Rate,Τιμή τιμοκαταλόγου
 apps/erpnext/erpnext/utilities/activation.py,Create customer quotes,Δημιουργία εισαγωγικά πελατών
@@ -7172,6 +7188,7 @@
 DocType: Supplier Scorecard Criteria,Supplier Scorecard Criteria,Κριτήρια καρτών βαθμολογίας προμηθευτών
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py,Please select Start Date and End Date for Item {0},Παρακαλώ επιλέξτε ημερομηνία έναρξης και ημερομηνία λήξης για το είδος {0}
 DocType: Maintenance Schedule,MAT-MSH-.YYYY.-,MAT-MSH-.YYYY.-
+,Amount to Receive,Ποσό προς λήψη
 apps/erpnext/erpnext/education/doctype/student_group_creation_tool/student_group_creation_tool.py,Course is mandatory in row {0},Φυσικά είναι υποχρεωτική στη σειρά {0}
 apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py,From date can not be greater than than To date,"Από την ημερομηνία δεν μπορεί να είναι μεγαλύτερη από ό, τι από Μέχρι σήμερα"
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py,To date cannot be before from date,Το πεδίο έως ημερομηνία δεν μπορεί να είναι προγενέστερο από το πεδίο από ημερομηνία
@@ -7419,7 +7436,6 @@
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js,BOM and Manufacturing Quantity are required,BOM και Βιομηχανία Ποσότητα απαιτούνται
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js,Ageing Range 2,Eύρος γήρανσης 2
 DocType: SG Creation Tool Course,Max Strength,Μέγιστη Αντοχή
-apps/erpnext/erpnext/accounts/doctype/account/account.py,"Account {0} already exists in child company {1}. The following fields have different values, they should be same:<ul><li>{2}</li></ul>","Ο λογαριασμός {0} υπάρχει ήδη σε παιδική εταιρεία {1}. Τα παρακάτω πεδία έχουν διαφορετικές τιμές, θα πρέπει να είναι ίδια: <ul><li> {2} </li></ul>"
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py,Installing presets,Εγκατάσταση προρυθμίσεων
 DocType: Fee Schedule,EDU-FSH-.YYYY.-,EDU-FSH-.YYYY.-
 apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js,No Delivery Note selected for Customer {},Δεν έχει επιλεγεί καμία παραλαβή για τον πελάτη {}
@@ -7627,6 +7643,7 @@
 DocType: Delivery Note,Print Without Amount,Εκτυπώστε χωρίς ποσό
 apps/erpnext/erpnext/accounts/report/asset_depreciation_ledger/asset_depreciation_ledger.py,Depreciation Date,αποσβέσεις Ημερομηνία
 ,Work Orders in Progress,Παραγγελίες εργασίας σε εξέλιξη
+DocType: Customer Credit Limit,Bypass Credit Limit Check,Παράκαμψη πιστωτικού ορίου
 DocType: Issue,Support Team,Ομάδα υποστήριξης
 apps/erpnext/erpnext/stock/report/batch_item_expiry_status/batch_item_expiry_status.py,Expiry (In Days),Λήξη (σε ημέρες)
 DocType: Appraisal,Total Score (Out of 5),Συνολική βαθμολογία (από 5)
@@ -7810,6 +7827,7 @@
 DocType: Sales Invoice,Customer GSTIN,Πελάτης GSTIN
 DocType: Crop Cycle,List of diseases detected on the field. When selected it'll automatically add a list of tasks to deal with the disease ,"Κατάλογος ασθενειών που εντοπίζονται στο πεδίο. Όταν επιλεγεί, θα προστεθεί αυτόματα μια λίστα εργασιών για την αντιμετώπιση της νόσου"
 apps/erpnext/erpnext/manufacturing/page/bom_comparison_tool/bom_comparison_tool.js,BOM 1,BOM 1
+apps/erpnext/erpnext/assets/report/fixed_asset_register/fixed_asset_register.py,Asset Id,Αναγνωριστικό ενεργητικού
 apps/erpnext/erpnext/healthcare/doctype/healthcare_service_unit/healthcare_service_unit.js,This is a root healthcare service unit and cannot be edited.,Αυτή είναι μια μονάδα υπηρεσίας υγειονομικής περίθαλψης και δεν μπορεί να επεξεργαστεί.
 DocType: Asset Repair,Repair Status,Κατάσταση επισκευής
 apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.js,"Requested Qty: Quantity requested for purchase, but not ordered.","Ζητούμενη ποσότητα: ποσότητα που ζητήθηκε για αγορά, αλλά δεν έχει παραγγελθεί."
diff --git a/erpnext/translations/es.csv b/erpnext/translations/es.csv
index 8ca83e5..9de782d 100644
--- a/erpnext/translations/es.csv
+++ b/erpnext/translations/es.csv
@@ -289,7 +289,6 @@
 DocType: Loan,Repay Over Number of Periods,Devolución por cantidad de períodos
 apps/erpnext/erpnext/manufacturing/report/bom_stock_report/bom_stock_report.py,Quantity to Produce can not be less than Zero,Cantidad a Producir no puede ser menor a cero
 DocType: Stock Entry,Additional Costs,Costes adicionales
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Customer &gt; Customer Group &gt; Territory,Cliente&gt; Grupo de clientes&gt; Territorio
 apps/erpnext/erpnext/accounts/doctype/account/account.py,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
@@ -586,6 +585,7 @@
 DocType: Healthcare Settings,Create documents for sample collection,Crear documentos para la recopilación de muestras
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py,Payment against {0} {1} cannot be greater than Outstanding Amount {2},El pago para {0} {1} no puede ser mayor que el pago pendiente {2}
 apps/erpnext/erpnext/patches/v11_0/add_healthcare_service_unit_tree_root.py,All Healthcare Service Units,Todas las Unidades de Servicios de Salud
+apps/erpnext/erpnext/setup/default_energy_point_rules.py,On Converting Opportunity,Sobre la oportunidad de conversión
 DocType: Bank Account,Address HTML,Dirección HTML
 DocType: Lead,Mobile No.,Número móvil
 apps/erpnext/erpnext/selling/doctype/pos_closing_voucher/closing_voucher_details.html,Mode of Payments,Modo de Pago
@@ -650,7 +650,6 @@
 DocType: Accounting Dimension,Dimension Name,Nombre de dimensión
 apps/erpnext/erpnext/healthcare/setup.py,Resistant,Resistente
 apps/erpnext/erpnext/hotels/doctype/hotel_room_reservation/hotel_room_reservation.py,Please set Hotel Room Rate on {},Configura la Tarifa de la Habitación del Hotel el {}
-apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py,Please setup numbering series for Attendance via Setup &gt; Numbering Series,Configure la serie de numeración para la asistencia a través de Configuración&gt; Serie de numeración
 DocType: Journal Entry,Multi Currency,Multi Moneda
 DocType: Bank Statement Transaction Invoice Item,Invoice Type,Tipo de factura
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py,Valid from date must be less than valid upto date,La fecha de validez debe ser inferior a la válida
@@ -765,6 +764,7 @@
 apps/erpnext/erpnext/accounts/page/pos/pos.js,Create a new Customer,Crear un nuevo cliente
 apps/erpnext/erpnext/non_profit/report/expiring_memberships/expiring_memberships.py,Expiring On,Venciendo en
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,"If multiple Pricing Rules continue to prevail, users are asked to set Priority manually to resolve conflict.","Si existen varias reglas de precios, se les pide a los usuarios que establezcan la prioridad manualmente para resolver el conflicto."
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js,Purchase Return,Devolucion de Compra
 apps/erpnext/erpnext/utilities/activation.py,Create Purchase Orders,Crear Órdenes de Compra
 ,Purchase Register,Registro de compras
 apps/erpnext/erpnext/healthcare/doctype/patient/patient.py,Patient not found,Paciente no Encontrado
@@ -780,7 +780,6 @@
 DocType: Location,Area UOM,Área UOM
 apps/erpnext/erpnext/manufacturing/doctype/workstation/workstation.py,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 festividades: {0}
 apps/erpnext/erpnext/selling/page/sales_funnel/sales_funnel.py,Opportunities,Oportunidades
-apps/erpnext/erpnext/www/all-products/index.html,Clear filters,Filtros claros
 DocType: Lab Test Template,Single,Soltero
 DocType: Compensatory Leave Request,Work From Date,Trabajar Desde la Fecha
 DocType: Salary Slip,Total Loan Repayment,Amortización total del préstamo
@@ -823,6 +822,7 @@
 DocType: Account,Old Parent,Antiguo Padre
 apps/erpnext/erpnext/education/doctype/program_enrollment_tool/program_enrollment_tool.py,Mandatory field - Academic Year,Campo obligatorio - Año Académico
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py,{0} {1} is not associated with {2} {3},{0} {1} no está asociado con {2} {3}
+DocType: Opportunity,Converted By,Convertido por
 apps/erpnext/erpnext/public/js/hub/components/ReviewArea.vue,You need to login as a Marketplace User before you can add any reviews.,Debe iniciar sesión como usuario de Marketplace antes de poder agregar comentarios.
 apps/erpnext/erpnext/manufacturing/doctype/job_card/job_card.py,Row {0} : Operation is required against the raw material item {1},Fila {0}: se requiere operación contra el artículo de materia prima {1}
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py,Please set default payable account for the company {0},Establezca la cuenta de pago predeterminada para la empresa {0}
@@ -848,6 +848,8 @@
 DocType: BOM,Work Order,Órden de Trabajo
 DocType: Sales Invoice,Total Qty,Cantidad Total
 apps/erpnext/erpnext/education/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py,Guardian2 Email ID,ID de correo electrónico del Tutor2
+apps/erpnext/erpnext/hr/doctype/employee_transfer/employee_transfer.py,"Please delete the Employee <a href=""#Form/Employee/{0}"">{0}</a>\
+					to cancel this document","Elimine el empleado <a href=""#Form/Employee/{0}"">{0}</a> \ para cancelar este documento"
 DocType: Item,Show in Website (Variant),Mostrar en el sitio web (variante)
 DocType: Employee,Health Concerns,Problemas de salud
 DocType: Payroll Entry,Select Payroll Period,Seleccione el Período de Nómina
@@ -907,7 +909,6 @@
 DocType: Codification Table,Codification Table,Tabla de Codificación
 DocType: Timesheet Detail,Hrs,Horas
 apps/erpnext/erpnext/manufacturing/page/bom_comparison_tool/bom_comparison_tool.js,Changes in {0},Cambios en {0}
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js,Please select Company,"Por favor, seleccione la empresa"
 DocType: Employee Skill,Employee Skill,Habilidad del empleado
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.js,Difference Account,Cuenta para la Diferencia
 DocType: Pricing Rule,Discount on Other Item,Descuento en otro artículo
@@ -975,6 +976,7 @@
 DocType: BOM,Operating Cost,Costo de Operación
 DocType: Crop,Produced Items,Artículos Producidos
 DocType: Bank Statement Transaction Entry,Match Transaction to Invoices,Hacer coincidir la transacción con las facturas
+apps/erpnext/erpnext/erpnext_integrations/exotel_integration.py,Error in Exotel incoming call,Error en llamada entrante de Exotel
 DocType: Sales Order Item,Gross Profit,Beneficio Bruto
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js,Unblock Invoice,Desbloquear Factura
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py,Increment cannot be 0,Incremento no puede ser 0
@@ -1188,6 +1190,7 @@
 DocType: Activity Cost,Activity Type,Tipo de Actividad
 DocType: Request for Quotation,For individual supplier,Por proveedor individual
 DocType: BOM Operation,Base Hour Rate(Company Currency),La tarifa básica de Hora (divisa de la Compañía)
+,Qty To Be Billed,Cantidad a facturar
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py,Delivered Amount,Importe entregado
 apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.js,Reserved Qty for Production: Raw materials quantity to make manufacturing items.,Cantidad reservada para producción: Cantidad de materias primas para fabricar artículos.
 DocType: Loyalty Point Entry Redemption,Redemption Date,Fecha de Redención
@@ -1306,7 +1309,7 @@
 DocType: Sales Invoice,Commission Rate (%),Porcentaje de comisión (%)
 apps/erpnext/erpnext/education/doctype/student_group/student_group.py,Please select Program,Seleccione el programa
 DocType: Project,Estimated Cost,Costo Estimado
-DocType: Request for Quotation,Link to material requests,Enlace a las solicitudes de materiales
+DocType: Supplier Quotation,Link to material requests,Enlace a las solicitudes de materiales
 apps/erpnext/erpnext/public/js/hub/pages/Publish.vue,Publish,Publicar
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py,Aerospace,Aeroespacial
 ,Fichier des Ecritures Comptables [FEC],Fichier des Ecritures Comptables [FEC]
@@ -1319,6 +1322,7 @@
 apps/erpnext/erpnext/utilities/transaction_base.py,Invalid Posting Time,Tiempo de Publicación no Válido
 DocType: Salary Component,Condition and Formula,Condición y Fórmula
 DocType: Lead,Campaign Name,Nombre de la campaña
+apps/erpnext/erpnext/setup/default_energy_point_rules.py,On Task Completion,Al finalizar la tarea
 apps/erpnext/erpnext/hr/doctype/compensatory_leave_request/compensatory_leave_request.py,There is no leave period in between {0} and {1},No hay período de Licencia entre {0} y {1}
 DocType: Fee Validity,Healthcare Practitioner,Profesional de la salud
 DocType: Hotel Room,Capacity,Capacidad
@@ -1663,7 +1667,6 @@
 DocType: Quality Feedback Template,Quality Feedback Template,Plantilla de comentarios de calidad
 apps/erpnext/erpnext/config/education.py,LMS Activity,Actividad de LMS
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py,Internet Publishing,Publicación por internet
-DocType: Prescription Duration,Number,Número
 apps/erpnext/erpnext/accounts/doctype/opening_invoice_creation_tool/opening_invoice_creation_tool.js,Creating {0} Invoice,Creando {0} Factura
 DocType: Medical Code,Medical Code Standard,Norma del Código Médico
 DocType: Soil Texture,Clay Composition (%),Composición de arcilla (%)
@@ -1738,6 +1741,7 @@
 DocType: Support Settings,Get Started Sections,Obtener Secciones Comenzadas
 DocType: Lead,CRM-LEAD-.YYYY.-,CRM-LEAD-.YYYY.-
 DocType: Invoice Discounting,Sanctioned,Sancionada
+,Base Amount,Cantidad base
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.js,Total Contribution Amount: {0},Monto total de la Contribución: {0}
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py,Row #{0}: Please specify Serial No for Item {1},"Fila #{0}: Por favor, especifique el número de serie para el producto {1}"
 DocType: Payroll Entry,Salary Slips Submitted,Nómina Salarial Validada
@@ -1955,6 +1959,7 @@
 apps/erpnext/erpnext/utilities/user_progress.py,List a few of your suppliers. They could be organizations or individuals.,Enumere algunos de sus proveedores. Pueden ser organizaciones o individuos.
 DocType: Accounting Dimension,Dimension Defaults,Valores predeterminados de dimensión
 apps/erpnext/erpnext/crm/report/prospects_engaged_but_not_converted/prospects_engaged_but_not_converted.js,Minimum Lead Age (Days),Edad mínima de Iniciativa (días)
+apps/erpnext/erpnext/assets/report/fixed_asset_register/fixed_asset_register.py,Available For Use Date,Disponible para uso Fecha
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py,All BOMs,Todas las listas de materiales
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js,Create Inter Company Journal Entry,Crear entrada de diario entre empresas
 DocType: Company,Parent Company,Empresa Matriz
@@ -2019,6 +2024,7 @@
 ,IRS 1099,IRS 1099
 DocType: Salary Slip,Leave Without Pay,Permiso / licencia sin goce de salario (LSS)
 DocType: Payment Request,Outward,Exterior
+apps/erpnext/erpnext/setup/default_energy_point_rules.py,On {0} Creation,En {0} Creación
 apps/erpnext/erpnext/regional/doctype/gstr_3b_report/gstr_3b_report.html,State/UT Tax,Impuesto estatal / UT
 ,Trial Balance for Party,Balance de Terceros
 ,Gross and Net Profit Report,Informe de ganancias brutas y netas
@@ -2134,6 +2140,7 @@
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js,Make Stock Entry,Hacer entrada de stock
 DocType: Hotel Room Reservation,Hotel Reservation User,Usuario de Reserva de Hotel
 apps/erpnext/erpnext/projects/doctype/project/project.js,Set Status,Establecer estado
+apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py,Please setup numbering series for Attendance via Setup &gt; Numbering Series,Configure la serie de numeración para la asistencia a través de Configuración&gt; Serie de numeración
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py,Please select prefix first,"Por favor, seleccione primero el prefijo"
 DocType: Contract,Fulfilment Deadline,Fecha límite de Cumplimiento
 apps/erpnext/erpnext/public/js/hub/pages/Home.vue,Near you,Cerca de usted
@@ -2149,6 +2156,7 @@
 DocType: Announcement,All Students,Todos los estudiantes
 apps/erpnext/erpnext/assets/doctype/asset/asset.py,Item {0} must be a non-stock item,Elemento {0} debe ser un elemento de no-stock
 apps/erpnext/erpnext/stock/doctype/batch/batch.js,View Ledger,Mostrar Libro Mayor
+DocType: Cost Center,Lft,Izquierda-
 DocType: Grading Scale,Intervals,intervalos
 DocType: Bank Statement Transaction Entry,Reconciled Transactions,Transacciones Reconciliadas
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py,Earliest,Primeras
@@ -2264,6 +2272,7 @@
 apps/erpnext/erpnext/hr/doctype/employee_benefit_application/employee_benefit_application.py,As per your assigned Salary Structure you cannot apply for benefits,De acuerdo con su estructura salarial asignada no puede solicitar beneficios
 apps/erpnext/erpnext/stock/doctype/item/item.py,Website Image should be a public file or website URL,Sitio web imagen debe ser un archivo público o URL del sitio web
 DocType: Purchase Invoice Item,BOM,BOM
+apps/erpnext/erpnext/stock/doctype/item/item.py,Duplicate entry in Manufacturers table,Entrada duplicada en la tabla de fabricantes
 apps/erpnext/erpnext/setup/doctype/item_group/item_group.js,This is a root item group and cannot be edited.,Este es un grupo principal y no se puede editar.
 apps/erpnext/erpnext/accounts/doctype/account/account.js,Merge,Unir
 DocType: Journal Entry Account,Purchase Order,Orden de compra (OC)
@@ -2408,7 +2417,6 @@
 DocType: Asset,Depreciation Schedules,programas de depreciación
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.js,Create Sales Invoice,Crear factura de ventas
 apps/erpnext/erpnext/regional/doctype/gstr_3b_report/gstr_3b_report.html,Ineligible ITC,ITC no elegible
-apps/erpnext/erpnext/erpnext_integrations/doctype/shopify_settings/shopify_settings.py,"Support for public app is deprecated. Please setup private app, for more details refer user manual","El soporte para la aplicación pública está en desuso. Configure la aplicación privada, para más detalles, consulte el manual del usuario"
 DocType: Task,Dependent Tasks,Tareas dependientes
 apps/erpnext/erpnext/regional/report/gstr_1/gstr_1.py,Following accounts might be selected in GST Settings:,Las siguientes cuentas se pueden seleccionar en Configuración de GST:
 apps/erpnext/erpnext/manufacturing/report/bom_stock_report/bom_stock_report.js,Quantity to Produce,Cantidad a Producir
@@ -2660,6 +2668,7 @@
 DocType: Water Analysis,Container,Envase
 apps/erpnext/erpnext/regional/report/gstr_1/gstr_1.py,Please set valid GSTIN No. in Company Address,Establezca un número GSTIN válido en la dirección de la empresa
 apps/erpnext/erpnext/education/utils.py,Student {0} - {1} appears Multiple times in row {2} & {3},Estudiante {0} - {1} aparece múltiples veces en fila {2} y {3}
+apps/erpnext/erpnext/selling/doctype/customer/customer.py,Following fields are mandatory to create address:,Los siguientes campos son obligatorios para crear una dirección:
 DocType: Item Alternative,Two-way,Bidireccional
 DocType: Item,Manufacturers,Fabricantes
 apps/erpnext/erpnext/accounts/deferred_revenue.py,Error while processing deferred accounting for {0},Error al procesar contabilidad diferida para {0}
@@ -2734,9 +2743,9 @@
 DocType: Employee,HR-EMP-,HR-EMP-
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py,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: Quality Meeting Minutes,Quality Meeting Minutes,Actas de reuniones de calidad
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Supplier &gt; Supplier Type,Proveedor&gt; Tipo de proveedor
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py,Employee Referral,Recomendación de Empleados
 DocType: Student Group,Set 0 for no limit,Ajuste 0 indica sin límite
+DocType: Cost Center,rgt,rgt
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py,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.
 DocType: Customer,Primary Address and Contact Detail,Dirección Principal y Detalle de Contacto
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.js,Resend Payment Email,Vuelva a enviar el pago por correo electrónico
@@ -2846,7 +2855,6 @@
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py,Against Supplier Invoice {0} dated {1},Contra factura de proveedor {0} con fecha{1}
 DocType: Customer,Default Price List,Lista de precios por defecto
 apps/erpnext/erpnext/assets/doctype/asset/asset.py,Asset Movement record {0} created,Movimiento de activo {0} creado
-apps/erpnext/erpnext/utilities/page/leaderboard/leaderboard.js,No items found.,No se Encontraron Artículos.
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py,You cannot delete Fiscal Year {0}. Fiscal Year {0} is set as default in Global Settings,No se puede eliminar el año fiscal {0}. Año fiscal {0} se establece por defecto en la configuración global
 DocType: Share Transfer,Equity/Liability Account,Cuenta de Patrimonio / Pasivo
 apps/erpnext/erpnext/setup/doctype/customer_group/customer_group.py,A customer with the same name already exists,Ya existe un cliente con el mismo nombre
@@ -2862,6 +2870,7 @@
 apps/erpnext/erpnext/selling/doctype/customer/customer.py,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,Customer required for 'Customerwise Discount',Se requiere un cliente para el descuento
 apps/erpnext/erpnext/config/accounting.py,Update bank payment dates with journals.,Actualización de las fechas de pago del banco con los registros.
+,Billed Qty,Cantidad facturada
 apps/erpnext/erpnext/stock/doctype/item/item_dashboard.py,Pricing,Precios
 DocType: Employee,Attendance Device ID (Biometric/RF tag ID),ID de dispositivo de asistencia (ID de etiqueta biométrica / RF)
 DocType: Quotation,Term Details,Detalles de términos y condiciones
@@ -2883,6 +2892,7 @@
 DocType: Share Transfer,Asset Account,Cuenta de Activos
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js,New release date should be in the future,La nueva fecha de lanzamiento debe estar en el futuro
 DocType: Purchase Invoice,End date of current invoice's period,Fecha final del periodo de facturación actual
+apps/erpnext/erpnext/hr/doctype/employee/employee.py,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: Lab Test,Technician Name,Nombre del Técnico
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py,"Cannot ensure delivery by Serial No as \
 					Item {0} is added with and without Ensure Delivery by \
@@ -2890,6 +2900,7 @@
 DocType: Accounts Settings,Unlink Payment on Cancellation of Invoice,Desvinculación de Pago en la cancelación de la factura
 DocType: Bank Reconciliation,From Date,Desde la fecha
 apps/erpnext/erpnext/hr/doctype/vehicle_log/vehicle_log.py,Current Odometer reading entered should be greater than initial Vehicle Odometer {0},Lectura actual del odómetro ingresada debe ser mayor que el cuentakilómetros inicial {0}
+,Purchase Order Items To Be Received or Billed,Artículos de orden de compra que se recibirán o facturarán
 DocType: Restaurant Reservation,No Show,No Mostrar
 apps/erpnext/erpnext/regional/india/utils.py,You must be a registered supplier to generate e-Way Bill,Debe ser un proveedor registrado para generar una factura electrónica
 DocType: Shipping Rule Country,Shipping Rule Country,Regla de envio del país
@@ -2932,6 +2943,7 @@
 apps/erpnext/erpnext/templates/generators/item/item_add_to_cart.html,View in Cart,Ver en Carrito
 DocType: Employee Checkin,Shift Actual Start,Shift Real Start
 DocType: Tally Migration,Is Day Book Data Imported,¿Se importan los datos del libro diario?
+,Purchase Order Items To Be Received or Billed1,Artículos de orden de compra que se recibirán o facturarán1
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py,Marketing Expenses,GASTOS DE PUBLICIDAD
 apps/erpnext/erpnext/stock/doctype/pick_list/pick_list.py,{0} units of {1} is not available.,{0} unidades de {1} no están disponibles.
 ,Item Shortage Report,Reporte de productos con stock bajo
@@ -3156,7 +3168,6 @@
 apps/erpnext/erpnext/public/js/call_popup/call_popup.js,View all issues from {0},Ver todos los problemas de {0}
 DocType: Quality Inspection,MAT-QA-.YYYY.-,MAT-QA-.YYYY.-
 DocType: Quality Meeting Table,Quality Meeting Table,Mesa de reuniones de calidad
-apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,Configure Naming Series para {0} a través de Configuración&gt; Configuración&gt; Naming Series
 apps/erpnext/erpnext/templates/pages/help.html,Visit the forums,Visita los foros
 DocType: Student,Student Mobile Number,Número móvil del Estudiante
 DocType: Item,Has Variants,Posee variantes
@@ -3298,6 +3309,7 @@
 DocType: Homepage Section,Section Cards,Tarjetas de sección
 ,Campaign Efficiency,Eficiencia de la Campaña
 DocType: Discussion,Discussion,Discusión
+apps/erpnext/erpnext/setup/default_energy_point_rules.py,On Sales Order Submission,En el envío de pedidos de ventas
 DocType: Bank Transaction,Transaction ID,ID de transacción
 DocType: Payroll Entry,Deduct Tax For Unsubmitted Tax Exemption Proof,Deducir impuestos por prueba de exención de impuestos sin enviar
 DocType: Volunteer,Anytime,En cualquier momento
@@ -3305,7 +3317,6 @@
 DocType: Employee Tax Exemption Proof Submission,Employee Tax Exemption Proof Submission,Presentación de Prueba de Exención Fiscal del Empleado
 DocType: Patient,Surgical History,Historia Quirúrgica
 DocType: Bank Statement Settings Item,Mapped Header,Encabezado Mapeado
-apps/erpnext/erpnext/hr/doctype/employee/employee.py,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: Employee,Resignation Letter Date,Fecha de carta de renuncia
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Pricing Rules are further filtered based on quantity.,Las 'reglas de precios' se pueden filtrar en base a la cantidad.
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py,Please set the Date Of Joining for employee {0},"Por favor, establezca la fecha de ingreso para el empleado {0}"
@@ -3319,6 +3330,7 @@
 DocType: Bank Statement Settings,Mapped Items,Artículos Mapeados
 DocType: Amazon MWS Settings,IT,IT
 DocType: Chapter,Chapter,Capítulo
+,Fixed Asset Register,Registro de activos fijos
 apps/erpnext/erpnext/utilities/user_progress.py,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,Select BOM and Qty for Production,Seleccione la lista de materiales y Cantidad para Producción
@@ -3454,7 +3466,6 @@
 apps/erpnext/erpnext/templates/emails/reorder_item.html,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
 apps/erpnext/erpnext/controllers/accounts_controller.py,Account {0} is invalid. Account Currency must be {1},La cuenta {0} no es válida. La divisa de la cuenta debe ser {1}
 apps/erpnext/erpnext/hr/doctype/salary_structure_assignment/salary_structure_assignment.py,From Date {0} cannot be after employee's relieving Date {1},Desde la fecha {0} no puede ser posterior a la fecha de liberación del empleado {1}
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py,Debit Note {0} has been created automatically,La nota de débito {0} se ha creado automáticamente
 apps/erpnext/erpnext/accounts/doctype/payment_order/payment_order.js,Create Payment Entries,Crear entradas de pago
 DocType: Supplier,Is Internal Supplier,Es un Proveedor Interno
 DocType: Employee,Create User Permission,Crear Permiso de Usuario
@@ -4013,7 +4024,6 @@
 DocType: Project User,Project Status,Estado del proyecto
 DocType: UOM,Check this to disallow fractions. (for Nos),Marque esta opción para deshabilitar las fracciones.
 DocType: Student Admission Program,Naming Series (for Student Applicant),Serie de nomenclatura (por Estudiante Solicitante)
-apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.py,UOM Conversion factor ({0} -&gt; {1}) not found for item: {2},Factor de conversión de UOM ({0} -&gt; {1}) no encontrado para el elemento: {2}
 apps/erpnext/erpnext/hr/doctype/retention_bonus/retention_bonus.py,Bonus Payment Date cannot be a past date,La fecha de pago de la bonificación no puede ser una fecha pasada
 DocType: Travel Request,Copy of Invitation/Announcement,Copia de Invitación / Anuncio
 DocType: Practitioner Service Unit Schedule,Practitioner Service Unit Schedule,Horario de unidad de servicio de un practicante
@@ -4161,6 +4171,7 @@
 apps/erpnext/erpnext/utilities/user_progress.py,Setup Company,Configuración de la Empresa
 ,Lab Test Report,Informe de Prueba de Laboratorio
 DocType: Employee Benefit Application,Employee Benefit Application,Solicitud de Beneficios para Empleados
+apps/erpnext/erpnext/accounts/doctype/invoice_discounting/invoice_discounting.py,Row({0}): {1} is already discounted in {2},Fila ({0}): {1} ya está descontada en {2}
 apps/erpnext/erpnext/hr/doctype/additional_salary/additional_salary.py,Additional Salary Component Exists.,Componente salarial adicional existe.
 DocType: Purchase Invoice,Unregistered,No registrado
 DocType: Student Applicant,Application Date,Fecha de aplicacion
@@ -4239,7 +4250,6 @@
 DocType: Journal Entry,Accounting Entries,Asientos contables
 DocType: Job Card Time Log,Job Card Time Log,Registro de tiempo de tarjeta de trabajo
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,"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;."
-apps/erpnext/erpnext/education/doctype/instructor/instructor.py,Please setup Instructor Naming System in Education &gt; Education Settings,Configure el Sistema de nombres de instructores en Educación&gt; Configuración de educación
 DocType: Journal Entry,Paid Loan,Préstamo Pagado
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py,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
@@ -4256,7 +4266,6 @@
 apps/erpnext/erpnext/templates/pages/projects.html,No time sheets,No hay hojas de tiempo
 DocType: GoCardless Mandate,GoCardless Customer,Cliente GoCardless
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py,Leave Type {0} cannot be carry-forwarded,No se puede arrastrar el tipo de vacaciones {0}.
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Item Code &gt; Item Group &gt; Brand,Código de artículo&gt; Grupo de artículos&gt; Marca
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py,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
 DocType: Leave Encashment,Payroll,Nómina de sueldos
@@ -4371,7 +4380,6 @@
 DocType: Stock Ledger Entry,Actual Qty After Transaction,Cantidad real después de transacción
 ,Pending SO Items For Purchase Request,A la espera de la orden de compra (OC) para crear solicitud de compra (SC)
 apps/erpnext/erpnext/education/doctype/student_admission/student_admission.py,Student Admissions,Admisión de Estudiantes
-apps/erpnext/erpnext/accounts/party.py,{0} {1} is disabled,{0} {1} está desactivado
 DocType: Supplier,Billing Currency,Moneda de facturación
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py,Extra Large,Extra grande
 DocType: Loan,Loan Application,Solicitud de Préstamo
@@ -4448,7 +4456,6 @@
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py,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/accounts/doctype/accounting_dimension/accounting_dimension.py,Creating Dimensions...,Creando dimensiones ...
 apps/erpnext/erpnext/education/doctype/student_group_creation_tool/student_group_creation_tool.py,Student Group Name is mandatory in row {0},Nombre de Grupo de Estudiantes es obligatorio en la fila {0}
-DocType: Customer Credit Limit,Bypass credit limit_check,Bypass credit limit_check
 DocType: Homepage,Products to be shown on website homepage,Productos que se muestran en la página de inicio de la página web
 DocType: HR Settings,Password Policy,Política de contraseñas
 apps/erpnext/erpnext/setup/doctype/customer_group/customer_group.js,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.
@@ -4752,6 +4759,7 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py,Row {0}: Advance against Customer must be credit,Fila {0}: Avance contra el Cliente debe ser de crédito
 DocType: Quality Meeting,Quality Meeting,Reunión de calidad
 apps/erpnext/erpnext/accounts/doctype/account/account.js,Non-Group to Group,No-Grupo a Grupo
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,Configure Naming Series para {0} a través de Configuración&gt; Configuración&gt; Naming Series
 DocType: Employee,ERPNext User,Usuario ERPNext
 apps/erpnext/erpnext/education/doctype/student_group_creation_tool/student_group_creation_tool.py,Batch is mandatory in row {0},El lote es obligatorio en la fila {0}
 DocType: Company,Default Buying Terms,Términos de compra predeterminados
@@ -5046,6 +5054,7 @@
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py,No {0} found for Inter Company Transactions.,No se ha encontrado {0} para Transacciones entre empresas.
 DocType: Travel Itinerary,Rented Car,Auto Rentado
 apps/erpnext/erpnext/public/js/hub/components/profile_dialog.js,About your Company,Sobre su Compañía
+apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.js,Show Stock Ageing Data,Mostrar datos de envejecimiento de stock
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py,Credit To account must be a Balance Sheet account,La cuenta de crédito debe pertenecer a las cuentas de balance
 DocType: Donor,Donor,Donante
 DocType: Global Defaults,Disable In Words,Desactivar en palabras
@@ -5060,8 +5069,10 @@
 DocType: Practitioner Schedule,Schedule Name,Nombre del Horario
 apps/erpnext/erpnext/regional/doctype/gstr_3b_report/gstr_3b_report.py,Please enter GSTIN and state for the Company Address {0},Ingrese GSTIN e indique la dirección de la empresa {0}
 DocType: Currency Exchange,For Buying,Por Comprar
+apps/erpnext/erpnext/setup/default_energy_point_rules.py,On Purchase Order Submission,En el envío de la orden de compra
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js,Add All Suppliers,Añadir todos los Proveedores
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py,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/accounts/doctype/pricing_rule/pricing_rule.js,Customer &gt; Customer Group &gt; Territory,Cliente&gt; Grupo de clientes&gt; Territorio
 DocType: Tally Migration,Parties,Fiestas
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js,Browse BOM,Explorar la lista de materiales
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py,Secured Loans,Prestamos en garantía
@@ -5093,6 +5104,7 @@
 apps/erpnext/erpnext/stock/doctype/item_alternative/item_alternative.py,Not allow to set alternative item for the item {0},No permitir establecer un elemento alternativo para el Artículo {0}
 apps/erpnext/erpnext/hr/doctype/leave_block_list/leave_block_list.py,Date is repeated,La fecha está repetida
 apps/erpnext/erpnext/accounts/print_format/payment_receipt_voucher/payment_receipt_voucher.html,Authorized Signatory,Firmante Autorizado
+apps/erpnext/erpnext/education/doctype/instructor/instructor.py,Please setup Instructor Naming System in Education &gt; Education Settings,Configure el Sistema de nombres de instructores en Educación&gt; Configuración de educación
 apps/erpnext/erpnext/regional/doctype/gstr_3b_report/gstr_3b_report.html,Net ITC Available(A) - (B),ITC neto disponible (A) - (B)
 apps/erpnext/erpnext/education/doctype/fee_schedule/fee_schedule.js,Create Fees,Crear Tarifas
 DocType: Project,Total Purchase Cost (via Purchase Invoice),Costo total de compra (vía facturas de compra)
@@ -5113,6 +5125,7 @@
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.js,Message Sent,Mensaje Enviado
 apps/erpnext/erpnext/accounts/doctype/account/account.py,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/assets/report/fixed_asset_register/fixed_asset_register.py,Vendor Name,Nombre del vendedor
 DocType: Quiz Result,Wrong,Incorrecto
 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)
@@ -5356,6 +5369,7 @@
 DocType: Stock Settings,Auto Material Request,Requisición de Materiales Automática
 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
+,Received Qty Amount,Cantidad recibida Cantidad
 DocType: Salary Slip,Gross Pay - Total Deduction - Loan Repayment,Pago Bruto - Deducción total - Pago de Préstamos
 DocType: Bank Account,Last Integration Date,Última fecha de integración
 DocType: Expense Claim,Expense Taxes and Charges,Gastos Impuestos y Cargos
@@ -5814,6 +5828,8 @@
 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,Please select Qty against item {0},Seleccione Cant. contra el Elemento {0}
+apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py,Latest Age,Última edad
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js,Transfer Material to Supplier,Transferir material a proveedor
 apps/erpnext/erpnext/hr/report/loan_repayment/loan_repayment.py,EMI,EMI
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py,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
@@ -5837,7 +5853,6 @@
 apps/erpnext/erpnext/hr/doctype/employee_benefit_application/employee_benefit_application.py,"An amount of {0} already claimed for the component {1},\
 						 set the amount equal or greater than {2}","Una cantidad de {0} ya reclamada para el componente {1}, \ establece la cantidad igual o mayor que {2}"
 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
 DocType: BOM Update Tool,The new BOM after replacement,Nueva lista de materiales después de la sustitución
 ,Point of Sale,Punto de Venta
@@ -5957,7 +5972,6 @@
 DocType: Purchase Order Item,Blanket Order Rate,Tasa de orden general
 ,Customer Ledger Summary,Resumen del Libro mayor de clientes
 apps/erpnext/erpnext/hooks.py,Certification,Proceso de dar un título
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js,Are you sure you want to make debit note?,¿Seguro que quieres hacer una nota de débito?
 DocType: Bank Guarantee,Clauses and Conditions,Cláusulas y Condiciones
 DocType: Serial No,Creation Document Type,Creación de documento
 DocType: Amazon MWS Settings,ES,ES
@@ -5995,8 +6009,6 @@
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py,Financial Services,Servicios financieros
 DocType: Student Sibling,Student ID,Identificación del Estudiante
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.js,For Quantity must be greater than zero,Para Cantidad debe ser mayor que cero
-apps/erpnext/erpnext/hr/doctype/employee_transfer/employee_transfer.py,"Please delete the Employee <a href=""#Form/Employee/{0}"">{0}</a>\
-					to cancel this document","Elimine el empleado <a href=""#Form/Employee/{0}"">{0}</a> \ para cancelar este documento"
 apps/erpnext/erpnext/config/projects.py,Types of activities for Time Logs,Tipos de actividades para los registros de tiempo
 DocType: Opening Invoice Creation Tool,Sales,Ventas
 DocType: Stock Entry Detail,Basic Amount,Importe Base
@@ -6075,6 +6087,7 @@
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py,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,Send Supplier Emails,Enviar mensajes de correo electrónico al proveedor
+DocType: Asset Movement,ACC-ASM-.YYYY.-,ACC-ASM-.YYYY.-
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py,"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
 apps/erpnext/erpnext/hr/doctype/employee_onboarding/employee_onboarding.py,Submit this to create the Employee record,Envíe esto para crear el registro del empleado
@@ -6152,7 +6165,6 @@
 DocType: Sales Team,Contact No.,Contacto No.
 apps/erpnext/erpnext/templates/includes/cart/cart_address.html,Billing Address is same as Shipping Address,Dirección de facturación es la misma que la dirección de envío
 DocType: Bank Reconciliation,Payment Entries,Entradas de Pago
-apps/erpnext/erpnext/erpnext_integrations/doctype/shopify_settings/shopify_settings.py,Access token or Shopify URL missing,Falta Token de Acceso o URL de Shopify
 DocType: Location,Latitude,Latitud
 DocType: Work Order,Scrap Warehouse,Almacén de chatarra
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py,"Warehouse required at Row No {0}, please set default warehouse for the item {1} for the company {2}","Se requiere Almacén en la Fila Nro {0}, configure el Almacén Predeterminado para el Artículo {1} para la Empresa {2}"
@@ -6195,7 +6207,6 @@
 DocType: Job Offer Term,Value / Description,Valor / Descripción
 apps/erpnext/erpnext/controllers/accounts_controller.py,"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
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js,Are you sure you want to make credit note?,¿Seguro que quieres hacer una nota de crédito?
 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,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}.
@@ -6320,6 +6331,7 @@
 DocType: Purchase Invoice,Taxes and Charges Added,Impuestos y cargos adicionales
 apps/erpnext/erpnext/assets/doctype/asset/asset.py,Depreciation Row {0}: Next Depreciation Date cannot be before Available-for-use Date,Fila de depreciación {0}: la siguiente fecha de depreciación no puede ser anterior Fecha disponible para usar
 ,Sales Funnel,"""Embudo"" de ventas"
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Item Code &gt; Item Group &gt; Brand,Código de artículo&gt; Grupo de artículos&gt; Marca
 apps/erpnext/erpnext/setup/doctype/company/company.py,Abbreviation is mandatory,La abreviatura es obligatoria
 DocType: Project,Task Progress,Progreso de Tarea
 apps/erpnext/erpnext/templates/includes/navbar/navbar_items.html,Cart,Carrito
@@ -6563,6 +6575,7 @@
 DocType: Employee Grade,Employee Grade,Grado del Empleado
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py,Piecework,Trabajo por obra
 DocType: GSTR 3B Report,June,junio
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Supplier &gt; Supplier Type,Proveedor&gt; Tipo de proveedor
 DocType: Share Balance,From No,Desde Nro
 DocType: Shift Type,Early Exit Grace Period,Período de gracia de salida temprana
 DocType: Task,Actual Time (in Hours),Tiempo real (en horas)
@@ -6847,6 +6860,7 @@
 DocType: Warehouse,Warehouse Name,Nombre del Almacén
 DocType: Naming Series,Select Transaction,Seleccione el tipo de transacción
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py,Please enter Approving Role or Approving User,"Por favor, introduzca 'Función para aprobar' o 'Usuario de aprobación'---"
+apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.py,UOM Conversion factor ({0} -&gt; {1}) not found for item: {2},Factor de conversión de UOM ({0} -&gt; {1}) no encontrado para el elemento: {2}
 apps/erpnext/erpnext/support/doctype/service_level_agreement/service_level_agreement.py,Service Level Agreement with Entity Type {0} and Entity {1} already exists.,El acuerdo de nivel de servicio con el tipo de entidad {0} y la entidad {1} ya existe.
 DocType: Journal Entry,Write Off Entry,Diferencia de desajuste
 DocType: BOM,Rate Of Materials Based On,Valor de materiales basado en
@@ -7037,6 +7051,7 @@
 DocType: Quality Inspection Reading,Quality Inspection Reading,Lecturas de inspección de calidad
 apps/erpnext/erpnext/stock/doctype/stock_settings/stock_settings.py,`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/stock/report/stock_balance/stock_balance.py,Earliest Age,Edad más temprana
 apps/erpnext/erpnext/utilities/user_progress.py,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.
 DocType: Quality Goal,Revision,Revisión
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js,Healthcare Services,Servicios de atención médica
@@ -7080,6 +7095,7 @@
 apps/erpnext/erpnext/healthcare/doctype/patient_encounter/patient_encounter.js,Schedule Discharge,Programar el Alta
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py,Cheques and Deposits incorrectly cleared,Cheques y Depósitos liquidados de forma incorrecta
 DocType: Homepage Section Card,Homepage Section Card,Tarjeta de sección de página de inicio
+,Amount To Be Billed,Cantidad a facturar
 apps/erpnext/erpnext/accounts/doctype/account/account.py,Account {0}: You can not assign itself as parent account,Cuenta {0}: no puede asignarse a sí misma como cuenta padre
 DocType: Purchase Invoice Item,Price List Rate,Tarifa de la lista de precios
 apps/erpnext/erpnext/utilities/activation.py,Create customer quotes,Crear cotizaciones de clientes
@@ -7132,6 +7148,7 @@
 DocType: Supplier Scorecard Criteria,Supplier Scorecard Criteria,Criterios de Calificación del Proveedor
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py,Please select Start Date and End Date for Item {0},"Por favor, seleccione Fecha de inicio y Fecha de finalización para el elemento {0}"
 DocType: Maintenance Schedule,MAT-MSH-.YYYY.-,MAT-MSH-.YYYY.-
+,Amount to Receive,Cantidad a recibir
 apps/erpnext/erpnext/education/doctype/student_group_creation_tool/student_group_creation_tool.py,Course is mandatory in row {0},Curso es obligatorio en la fila {0}
 apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py,From date can not be greater than than To date,Desde la fecha no puede ser mayor que hasta la fecha
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py,To date cannot be before from date,La fecha no puede ser anterior a la fecha actual
@@ -7380,7 +7397,6 @@
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js,BOM and Manufacturing Quantity are required,Se requiere la lista de materiales (LdM) y cantidad a manufacturar.
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js,Ageing Range 2,Rango de antigüedad 2
 DocType: SG Creation Tool Course,Max Strength,Fuerza Máx
-apps/erpnext/erpnext/accounts/doctype/account/account.py,"Account {0} already exists in child company {1}. The following fields have different values, they should be same:<ul><li>{2}</li></ul>","La cuenta {0} ya existe en la empresa secundaria {1}. Los siguientes campos tienen valores diferentes, deben ser los mismos: <ul><li> {2} </li></ul>"
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py,Installing presets,Instalación de Presets
 DocType: Fee Schedule,EDU-FSH-.YYYY.-,EDU-FSH-.YYYY.-
 apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js,No Delivery Note selected for Customer {},No se ha seleccionado ninguna Nota de Entrega para el Cliente {}
@@ -7588,6 +7604,7 @@
 DocType: Delivery Note,Print Without Amount,Imprimir sin importe
 apps/erpnext/erpnext/accounts/report/asset_depreciation_ledger/asset_depreciation_ledger.py,Depreciation Date,Fecha de Depreciación
 ,Work Orders in Progress,Órdenes de Trabajo en progreso
+DocType: Customer Credit Limit,Bypass Credit Limit Check,Omitir verificación de límite de crédito
 DocType: Issue,Support Team,Equipo de soporte
 apps/erpnext/erpnext/stock/report/batch_item_expiry_status/batch_item_expiry_status.py,Expiry (In Days),Caducidad (en días)
 DocType: Appraisal,Total Score (Out of 5),Puntaje Total (de 5)
@@ -7771,6 +7788,7 @@
 DocType: Sales Invoice,Customer GSTIN,GSTIN del Cliente
 DocType: Crop Cycle,List of diseases detected on the field. When selected it'll automatically add a list of tasks to deal with the disease ,"Lista de enfermedades detectadas en el campo. Cuando se selecciona, agregará automáticamente una lista de tareas para lidiar con la enfermedad"
 apps/erpnext/erpnext/manufacturing/page/bom_comparison_tool/bom_comparison_tool.js,BOM 1,BOM 1
+apps/erpnext/erpnext/assets/report/fixed_asset_register/fixed_asset_register.py,Asset Id,ID de activo
 apps/erpnext/erpnext/healthcare/doctype/healthcare_service_unit/healthcare_service_unit.js,This is a root healthcare service unit and cannot be edited.,Esta es una unidad de servicio de atención de salud raíz y no se puede editar.
 DocType: Asset Repair,Repair Status,Estado de Reparación
 apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.js,"Requested Qty: Quantity requested for purchase, but not ordered.","Cantidad Solicitada: Cantidad solicitada para la compra, pero no ordenada."
diff --git a/erpnext/translations/es_pe.csv b/erpnext/translations/es_pe.csv
index e858cfb..970f2d5 100644
--- a/erpnext/translations/es_pe.csv
+++ b/erpnext/translations/es_pe.csv
@@ -696,6 +696,7 @@
 DocType: Authorization Rule,Applicable To (Designation),Aplicables a (Denominación )
 apps/erpnext/erpnext/config/accounting.py,Enable / disable currencies.,Habilitar / Deshabilitar el tipo de monedas
 apps/erpnext/erpnext/controllers/trends.py,Total(Amt),Total (Amt)
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js,Transfer Material to Supplier,Transferencia de material a proveedor
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py,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
 DocType: Shipping Rule,Shipping Rule Conditions,Regla envío Condiciones
 DocType: BOM Update Tool,The new BOM after replacement,La nueva Solicitud de Materiales después de la sustitución
diff --git a/erpnext/translations/et.csv b/erpnext/translations/et.csv
index 325ef96..0e86e1c 100644
--- a/erpnext/translations/et.csv
+++ b/erpnext/translations/et.csv
@@ -286,7 +286,6 @@
 DocType: Loan,Repay Over Number of Periods,Tagastama Üle perioodide arv
 apps/erpnext/erpnext/manufacturing/report/bom_stock_report/bom_stock_report.py,Quantity to Produce can not be less than Zero,Toodetav kogus ei või olla väiksem kui Null
 DocType: Stock Entry,Additional Costs,Lisakulud
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Customer &gt; Customer Group &gt; Territory,Klient&gt; kliendigrupp&gt; territoorium
 apps/erpnext/erpnext/accounts/doctype/account/account.py,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
@@ -583,6 +582,7 @@
 DocType: Healthcare Settings,Create documents for sample collection,Loo dokumendid proovide kogumiseks
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py,Payment against {0} {1} cannot be greater than Outstanding Amount {2},Makse vastu {0} {1} ei saa olla suurem kui tasumata summa {2}
 apps/erpnext/erpnext/patches/v11_0/add_healthcare_service_unit_tree_root.py,All Healthcare Service Units,Kõik tervishoiuteenuse osakonnad
+apps/erpnext/erpnext/setup/default_energy_point_rules.py,On Converting Opportunity,Võimaluse teisendamise kohta
 DocType: Bank Account,Address HTML,Aadress HTML
 DocType: Lead,Mobile No.,Mobiili number.
 apps/erpnext/erpnext/selling/doctype/pos_closing_voucher/closing_voucher_details.html,Mode of Payments,Makseviis
@@ -647,7 +647,6 @@
 DocType: Accounting Dimension,Dimension Name,Mõõtme nimi
 apps/erpnext/erpnext/healthcare/setup.py,Resistant,Vastupidav
 apps/erpnext/erpnext/hotels/doctype/hotel_room_reservation/hotel_room_reservation.py,Please set Hotel Room Rate on {},Palun määrake hotelli hinnatase ()
-apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py,Please setup numbering series for Attendance via Setup &gt; Numbering Series,Palun seadistage kohaloleku jaoks numeratsiooniseeria seadistamise&gt; Numeratsiooniseeria kaudu
 DocType: Journal Entry,Multi Currency,Multi Valuuta
 DocType: Bank Statement Transaction Invoice Item,Invoice Type,Arve Type
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py,Valid from date must be less than valid upto date,Kehtiv alates kuupäevast peab olema väiksem kehtivast kuupäevast
@@ -762,6 +761,7 @@
 apps/erpnext/erpnext/accounts/page/pos/pos.js,Create a new Customer,Loo uus klient
 apps/erpnext/erpnext/non_profit/report/expiring_memberships/expiring_memberships.py,Expiring On,Aegumine on
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,"If multiple Pricing Rules continue to prevail, users are asked to set Priority manually to resolve conflict.","Kui mitu Hinnakujundusreeglid jätkuvalt ülekaalus, kasutajate palutakse määrata prioriteedi käsitsi lahendada konflikte."
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js,Purchase Return,Ostutagastus
 apps/erpnext/erpnext/utilities/activation.py,Create Purchase Orders,Loo Ostutellimuste
 ,Purchase Register,Ostu Registreeri
 apps/erpnext/erpnext/healthcare/doctype/patient/patient.py,Patient not found,Patsient ei leitud
@@ -777,7 +777,6 @@
 DocType: Location,Area UOM,Piirkond UOM
 apps/erpnext/erpnext/manufacturing/doctype/workstation/workstation.py,Workstation is closed on the following dates as per Holiday List: {0},Workstation on suletud järgmistel kuupäevadel kohta Holiday nimekiri: {0}
 apps/erpnext/erpnext/selling/page/sales_funnel/sales_funnel.py,Opportunities,Võimalused
-apps/erpnext/erpnext/www/all-products/index.html,Clear filters,Tühjendage filtrid
 DocType: Lab Test Template,Single,Single
 DocType: Compensatory Leave Request,Work From Date,Töö kuupäevast
 DocType: Salary Slip,Total Loan Repayment,Kokku Laenu tagasimaksmine
@@ -820,6 +819,7 @@
 DocType: Account,Old Parent,Vana Parent
 apps/erpnext/erpnext/education/doctype/program_enrollment_tool/program_enrollment_tool.py,Mandatory field - Academic Year,Kohustuslik väli - Academic Year
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py,{0} {1} is not associated with {2} {3},{0} {1} ei ole seotud {2} {3}
+DocType: Opportunity,Converted By,Teisendanud
 apps/erpnext/erpnext/public/js/hub/components/ReviewArea.vue,You need to login as a Marketplace User before you can add any reviews.,Enne arvustuste lisamist peate turuplatsi kasutajana sisse logima.
 apps/erpnext/erpnext/manufacturing/doctype/job_card/job_card.py,Row {0} : Operation is required against the raw material item {1},Rida {0}: toiming on vajalik toormaterjali elemendi {1}
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py,Please set default payable account for the company {0},Määrake vaikimisi makstakse kontole ettevõtte {0}
@@ -845,6 +845,8 @@
 DocType: BOM,Work Order,Töökäsk
 DocType: Sales Invoice,Total Qty,Kokku Kogus
 apps/erpnext/erpnext/education/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py,Guardian2 Email ID,Guardian2 Saatke ID
+apps/erpnext/erpnext/hr/doctype/employee_transfer/employee_transfer.py,"Please delete the Employee <a href=""#Form/Employee/{0}"">{0}</a>\
+					to cancel this document","Selle dokumendi tühistamiseks kustutage töötaja <a href=""#Form/Employee/{0}"">{0}</a> \"
 DocType: Item,Show in Website (Variant),Näita Veebileht (Variant)
 DocType: Employee,Health Concerns,Terviseprobleemid
 DocType: Payroll Entry,Select Payroll Period,Vali palgaarvestuse Periood
@@ -903,7 +905,6 @@
 DocType: Codification Table,Codification Table,Kooditabel
 DocType: Timesheet Detail,Hrs,tundi
 apps/erpnext/erpnext/manufacturing/page/bom_comparison_tool/bom_comparison_tool.js,Changes in {0},{0} muudatused
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js,Please select Company,Palun valige Company
 DocType: Employee Skill,Employee Skill,Töötaja oskus
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.js,Difference Account,Erinevus konto
 DocType: Pricing Rule,Discount on Other Item,Soodustus muule kaubale
@@ -971,6 +972,7 @@
 DocType: BOM,Operating Cost,Töökulud
 DocType: Crop,Produced Items,Toodetud esemed
 DocType: Bank Statement Transaction Entry,Match Transaction to Invoices,Tehingu sooritamine arvetele
+apps/erpnext/erpnext/erpnext_integrations/exotel_integration.py,Error in Exotel incoming call,Viga Exotel sissetulevas kõnes
 DocType: Sales Order Item,Gross Profit,Brutokasum
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js,Unblock Invoice,Arve tühistamine
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py,Increment cannot be 0,Kasvamine ei saa olla 0
@@ -1184,6 +1186,7 @@
 DocType: Activity Cost,Activity Type,Tegevuse liik
 DocType: Request for Quotation,For individual supplier,Üksikute tarnija
 DocType: BOM Operation,Base Hour Rate(Company Currency),Base Hour Rate (firma Valuuta)
+,Qty To Be Billed,Tühi arve
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py,Delivered Amount,Tarnitakse summa
 apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.js,Reserved Qty for Production: Raw materials quantity to make manufacturing items.,Tootmiseks reserveeritud kogus: toorainekogus toodete valmistamiseks.
 DocType: Loyalty Point Entry Redemption,Redemption Date,Lunastamiskuupäev
@@ -1302,7 +1305,7 @@
 DocType: Sales Invoice,Commission Rate (%),Komisjoni Rate (%)
 apps/erpnext/erpnext/education/doctype/student_group/student_group.py,Please select Program,Palun valige Program
 DocType: Project,Estimated Cost,Hinnanguline maksumus
-DocType: Request for Quotation,Link to material requests,Link materjali taotlusi
+DocType: Supplier Quotation,Link to material requests,Link materjali taotlusi
 apps/erpnext/erpnext/public/js/hub/pages/Publish.vue,Publish,Avalda
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py,Aerospace,Aerospace
 ,Fichier des Ecritures Comptables [FEC],Ficier des Ecritures Comptables [FEC]
@@ -1315,6 +1318,7 @@
 apps/erpnext/erpnext/utilities/transaction_base.py,Invalid Posting Time,Kehtetu postitamise aeg
 DocType: Salary Component,Condition and Formula,Seisund ja valem
 DocType: Lead,Campaign Name,Kampaania nimi
+apps/erpnext/erpnext/setup/default_energy_point_rules.py,On Task Completion,Töö lõpuleviimisel
 apps/erpnext/erpnext/hr/doctype/compensatory_leave_request/compensatory_leave_request.py,There is no leave period in between {0} and {1},Puudub ajavahemik {0} ja {1} vahel
 DocType: Fee Validity,Healthcare Practitioner,Tervishoiutöötaja
 DocType: Hotel Room,Capacity,Võimsus
@@ -1659,7 +1663,6 @@
 DocType: Quality Feedback Template,Quality Feedback Template,Kvaliteetse tagasiside mall
 apps/erpnext/erpnext/config/education.py,LMS Activity,LMS-i tegevus
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py,Internet Publishing,Internet kirjastamine
-DocType: Prescription Duration,Number,Number
 apps/erpnext/erpnext/accounts/doctype/opening_invoice_creation_tool/opening_invoice_creation_tool.js,Creating {0} Invoice,{0} arve koostamine
 DocType: Medical Code,Medical Code Standard,Meditsiinikood standard
 DocType: Soil Texture,Clay Composition (%),Savi koostis (%)
@@ -1734,6 +1737,7 @@
 DocType: Support Settings,Get Started Sections,Alusta sektsioonidega
 DocType: Lead,CRM-LEAD-.YYYY.-,CRM-LEAD-.YYYY.-
 DocType: Invoice Discounting,Sanctioned,sanktsioneeritud
+,Base Amount,Põhisumma
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.js,Total Contribution Amount: {0},Panuse kogusumma: {0}
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py,Row #{0}: Please specify Serial No for Item {1},Row # {0}: Palun täpsustage Serial No Punkt {1}
 DocType: Payroll Entry,Salary Slips Submitted,Esitatud palgasoodustused
@@ -1951,6 +1955,7 @@
 apps/erpnext/erpnext/utilities/user_progress.py,List a few of your suppliers. They could be organizations or individuals.,Nimekiri paar oma tarnijatele. Nad võivad olla organisatsioonid ja üksikisikud.
 DocType: Accounting Dimension,Dimension Defaults,Mõõtme vaikeväärtused
 apps/erpnext/erpnext/crm/report/prospects_engaged_but_not_converted/prospects_engaged_but_not_converted.js,Minimum Lead Age (Days),Minimaalne Lead Vanus (päeva)
+apps/erpnext/erpnext/assets/report/fixed_asset_register/fixed_asset_register.py,Available For Use Date,Saadaval kasutamiseks kuupäev
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py,All BOMs,Kõik BOMs
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js,Create Inter Company Journal Entry,Looge ettevõtetevahelise ajakirja kirje
 DocType: Company,Parent Company,Emaettevõte
@@ -2015,6 +2020,7 @@
 ,IRS 1099,IRS 1099
 DocType: Salary Slip,Leave Without Pay,Palgata puhkust
 DocType: Payment Request,Outward,Väljapoole
+apps/erpnext/erpnext/setup/default_energy_point_rules.py,On {0} Creation,Sisse {0} Loomine
 apps/erpnext/erpnext/regional/doctype/gstr_3b_report/gstr_3b_report.html,State/UT Tax,Riik / TÜ maks
 ,Trial Balance for Party,Trial Balance Party
 ,Gross and Net Profit Report,Bruto - ja puhaskasumi aruanne
@@ -2130,6 +2136,7 @@
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js,Make Stock Entry,Tee aktsiatest kanne
 DocType: Hotel Room Reservation,Hotel Reservation User,Hotelli broneeringu kasutaja
 apps/erpnext/erpnext/projects/doctype/project/project.js,Set Status,Määra olek
+apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py,Please setup numbering series for Attendance via Setup &gt; Numbering Series,Palun seadistage kohaloleku jaoks numeratsiooniseeria seadistamise&gt; Numeratsiooniseeria kaudu
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py,Please select prefix first,Palun valige eesliide esimene
 DocType: Contract,Fulfilment Deadline,Täitmise tähtaeg
 apps/erpnext/erpnext/public/js/hub/pages/Home.vue,Near you,Sinu lähedal
@@ -2145,6 +2152,7 @@
 DocType: Announcement,All Students,Kõik õpilased
 apps/erpnext/erpnext/assets/doctype/asset/asset.py,Item {0} must be a non-stock item,Punkt {0} peab olema mitte-laoartikkel
 apps/erpnext/erpnext/stock/doctype/batch/batch.js,View Ledger,Vaata Ledger
+DocType: Cost Center,Lft,LFT
 DocType: Grading Scale,Intervals,intervallid
 DocType: Bank Statement Transaction Entry,Reconciled Transactions,Kooskõlastatud tehingud
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py,Earliest,Esimesed
@@ -2260,6 +2268,7 @@
 apps/erpnext/erpnext/hr/doctype/employee_benefit_application/employee_benefit_application.py,As per your assigned Salary Structure you cannot apply for benefits,Teie määratud palgakorralduse järgi ei saa te taotleda hüvitisi
 apps/erpnext/erpnext/stock/doctype/item/item.py,Website Image should be a public file or website URL,Koduleht Pilt peaks olema avalik faili või veebilehe URL
 DocType: Purchase Invoice Item,BOM,Bom
+apps/erpnext/erpnext/stock/doctype/item/item.py,Duplicate entry in Manufacturers table,Tootjate tabelis duplikaadi kirje
 apps/erpnext/erpnext/setup/doctype/item_group/item_group.js,This is a root item group and cannot be edited.,See on ülemelemendile rühma ja seda ei saa muuta.
 apps/erpnext/erpnext/accounts/doctype/account/account.js,Merge,Merge
 DocType: Journal Entry Account,Purchase Order,Ostutellimuse
@@ -2404,7 +2413,6 @@
 DocType: Asset,Depreciation Schedules,Kulumi
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.js,Create Sales Invoice,Koosta müügiarve
 apps/erpnext/erpnext/regional/doctype/gstr_3b_report/gstr_3b_report.html,Ineligible ITC,Abikõlbmatu ITC
-apps/erpnext/erpnext/erpnext_integrations/doctype/shopify_settings/shopify_settings.py,"Support for public app is deprecated. Please setup private app, for more details refer user manual","Avaliku rakenduse tugi on aegunud. Palun häälestage privaatrakendus, et saada lisateavet kasutaja kasutusjuhendist"
 DocType: Task,Dependent Tasks,Sõltuvad ülesanded
 apps/erpnext/erpnext/regional/report/gstr_1/gstr_1.py,Following accounts might be selected in GST Settings:,GST seadetes saab valida järgmised kontod:
 apps/erpnext/erpnext/manufacturing/report/bom_stock_report/bom_stock_report.js,Quantity to Produce,Toodetav kogus
@@ -2656,6 +2664,7 @@
 DocType: Water Analysis,Container,Konteiner
 apps/erpnext/erpnext/regional/report/gstr_1/gstr_1.py,Please set valid GSTIN No. in Company Address,Valige ettevõtte aadressis kehtiv GSTIN-number
 apps/erpnext/erpnext/education/utils.py,Student {0} - {1} appears Multiple times in row {2} & {3},Student {0} - {1} esineb mitu korda järjest {2} ja {3}
+apps/erpnext/erpnext/selling/doctype/customer/customer.py,Following fields are mandatory to create address:,Järgmised väljad on aadressi loomiseks kohustuslikud:
 DocType: Item Alternative,Two-way,Kahesuunaline
 DocType: Item,Manufacturers,Tootjad
 apps/erpnext/erpnext/accounts/deferred_revenue.py,Error while processing deferred accounting for {0},Viga {0} edasilükatud raamatupidamise töötlemisel
@@ -2730,9 +2739,9 @@
 DocType: Employee,HR-EMP-,HR-EMP-
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py,User {0} doesn't have any default POS Profile. Check Default at Row {1} for this User.,Kasutajal {0} pole POS-i vaikeprofiili. Kontrollige selle kasutaja vaikeväärtust real {1}.
 DocType: Quality Meeting Minutes,Quality Meeting Minutes,Kvaliteedi koosoleku protokollid
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Supplier &gt; Supplier Type,Tarnija&gt; Tarnija tüüp
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py,Employee Referral,Töötaja suunamine
 DocType: Student Group,Set 0 for no limit,Määra 0 piiranguid pole
+DocType: Cost Center,rgt,rgt
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py,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."
 DocType: Customer,Primary Address and Contact Detail,Peamine aadress ja kontaktandmed
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.js,Resend Payment Email,Saada uuesti Makse Email
@@ -2842,7 +2851,6 @@
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py,Against Supplier Invoice {0} dated {1},Vastu Tarnija Arve {0} dateeritud {1}
 DocType: Customer,Default Price List,Vaikimisi hinnakiri
 apps/erpnext/erpnext/assets/doctype/asset/asset.py,Asset Movement record {0} created,Asset Liikumine rekord {0} loodud
-apps/erpnext/erpnext/utilities/page/leaderboard/leaderboard.js,No items found.,Ühtegi toodet pole leitud.
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py,You cannot delete Fiscal Year {0}. Fiscal Year {0} is set as default in Global Settings,Sa ei saa kustutada eelarveaastal {0}. Eelarveaastal {0} on määratud vaikimisi Global Settings
 DocType: Share Transfer,Equity/Liability Account,Omakapitali / vastutuse konto
 apps/erpnext/erpnext/setup/doctype/customer_group/customer_group.py,A customer with the same name already exists,Sama nimega klient on juba olemas
@@ -2858,6 +2866,7 @@
 apps/erpnext/erpnext/selling/doctype/customer/customer.py,Credit limit has been crossed for customer {0} ({1}/{2}),Krediidilimiit on klientidele {0} ({1} / {2}) ületatud
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py,Customer required for 'Customerwise Discount',Kliendi vaja &quot;Customerwise Discount&quot;
 apps/erpnext/erpnext/config/accounting.py,Update bank payment dates with journals.,Uuenda panga maksepäeva ajakirjadega.
+,Billed Qty,Arvelduskogus
 apps/erpnext/erpnext/stock/doctype/item/item_dashboard.py,Pricing,hinnapoliitika
 DocType: Employee,Attendance Device ID (Biometric/RF tag ID),Osavõtuseadme ID (biomeetrilise / RF-sildi ID)
 DocType: Quotation,Term Details,Term Details
@@ -2879,6 +2888,7 @@
 DocType: Share Transfer,Asset Account,Varakonto
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js,New release date should be in the future,Uus väljalaskekuupäev peaks olema tulevikus
 DocType: Purchase Invoice,End date of current invoice's period,Lõppkuupäev jooksva arve on periood
+apps/erpnext/erpnext/hr/doctype/employee/employee.py,Please setup Employee Naming System in Human Resource &gt; HR Settings,Palun seadistage töötajate nimetamise süsteem personaliressursist&gt; HR-sätted
 DocType: Lab Test,Technician Name,Tehniku nimi
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py,"Cannot ensure delivery by Serial No as \
 					Item {0} is added with and without Ensure Delivery by \
@@ -2886,6 +2896,7 @@
 DocType: Accounts Settings,Unlink Payment on Cancellation of Invoice,Lingi eemaldada Makse tühistamine Arve
 DocType: Bank Reconciliation,From Date,Siit kuupäev
 apps/erpnext/erpnext/hr/doctype/vehicle_log/vehicle_log.py,Current Odometer reading entered should be greater than initial Vehicle Odometer {0},Praegune Läbisõit sisestatud peaks olema suurem kui algne Sõiduki odomeetri {0}
+,Purchase Order Items To Be Received or Billed,"Ostutellimuse üksused, mis tuleb vastu võtta või mille eest arveid esitatakse"
 DocType: Restaurant Reservation,No Show,Ei näita
 apps/erpnext/erpnext/regional/india/utils.py,You must be a registered supplier to generate e-Way Bill,E-Way arve genereerimiseks peate olema registreeritud tarnija
 DocType: Shipping Rule Country,Shipping Rule Country,Kohaletoimetamine Reegel Riik
@@ -2928,6 +2939,7 @@
 apps/erpnext/erpnext/templates/generators/item/item_add_to_cart.html,View in Cart,Vaata Ostukorv
 DocType: Employee Checkin,Shift Actual Start,Tõstuklahvi tegelik algus
 DocType: Tally Migration,Is Day Book Data Imported,Kas päevaraamatu andmeid imporditakse
+,Purchase Order Items To Be Received or Billed1,"Ostutellimuse üksused, mis tuleb vastu võtta või mille eest arve esitatakse1"
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py,Marketing Expenses,Turundus kulud
 apps/erpnext/erpnext/stock/doctype/pick_list/pick_list.py,{0} units of {1} is not available.,{0} ühikut {1} pole saadaval.
 ,Item Shortage Report,Punkt Puuduse aruanne
@@ -3151,7 +3163,6 @@
 apps/erpnext/erpnext/public/js/call_popup/call_popup.js,View all issues from {0},Vaadake kõiki numbreid saidilt {0}
 DocType: Quality Inspection,MAT-QA-.YYYY.-,MAT-QA-.YYYY.-
 DocType: Quality Meeting Table,Quality Meeting Table,Kvaliteedikohtumiste tabel
-apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,"Valige Seadistamise seeria väärtuseks {0}, mis asub seadistuse&gt; Seadistused&gt; Seeriate nimetamine"
 apps/erpnext/erpnext/templates/pages/help.html,Visit the forums,Külasta foorumeid
 DocType: Student,Student Mobile Number,Student Mobile arv
 DocType: Item,Has Variants,Omab variandid
@@ -3293,6 +3304,7 @@
 DocType: Homepage Section,Section Cards,Sektsioonikaardid
 ,Campaign Efficiency,kampaania Efficiency
 DocType: Discussion,Discussion,arutelu
+apps/erpnext/erpnext/setup/default_energy_point_rules.py,On Sales Order Submission,Müügitellimuse esitamisel
 DocType: Bank Transaction,Transaction ID,tehing ID
 DocType: Payroll Entry,Deduct Tax For Unsubmitted Tax Exemption Proof,Maksuvabastuse tõestatud maksu mahaarvamine
 DocType: Volunteer,Anytime,Anytime
@@ -3300,7 +3312,6 @@
 DocType: Employee Tax Exemption Proof Submission,Employee Tax Exemption Proof Submission,Töötaja maksuvabastuse tõendamine
 DocType: Patient,Surgical History,Kirurgiajalugu
 DocType: Bank Statement Settings Item,Mapped Header,Maksepeaga
-apps/erpnext/erpnext/hr/doctype/employee/employee.py,Please setup Employee Naming System in Human Resource &gt; HR Settings,Palun seadistage töötajate nimetamise süsteem personaliressursist&gt; HR-sätted
 DocType: Employee,Resignation Letter Date,Ametist kiri kuupäev
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Pricing Rules are further filtered based on quantity.,Hinnakujundus on reeglid veelgi filtreeritud põhineb kogusest.
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py,Please set the Date Of Joining for employee {0},Määrake Liitumis töötajate {0}
@@ -3314,6 +3325,7 @@
 DocType: Bank Statement Settings,Mapped Items,Kaarditud esemed
 DocType: Amazon MWS Settings,IT,IT
 DocType: Chapter,Chapter,Peatükk
+,Fixed Asset Register,Põhivara register
 apps/erpnext/erpnext/utilities/user_progress.py,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,Select BOM and Qty for Production,Vali Bom ja Kogus Production
@@ -3449,7 +3461,6 @@
 apps/erpnext/erpnext/templates/emails/reorder_item.html,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
 apps/erpnext/erpnext/controllers/accounts_controller.py,Account {0} is invalid. Account Currency must be {1},Konto {0} on kehtetu. Konto Valuuta peab olema {1}
 apps/erpnext/erpnext/hr/doctype/salary_structure_assignment/salary_structure_assignment.py,From Date {0} cannot be after employee's relieving Date {1},Alates kuupäevast {0} ei saa olla pärast töötaja vabastamist Kuupäev {1}
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py,Debit Note {0} has been created automatically,Deebetmärge {0} on loodud automaatselt
 apps/erpnext/erpnext/accounts/doctype/payment_order/payment_order.js,Create Payment Entries,Looge maksekirjeid
 DocType: Supplier,Is Internal Supplier,Kas sisetarnija
 DocType: Employee,Create User Permission,Loo kasutaja luba
@@ -4008,7 +4019,6 @@
 DocType: Project User,Project Status,Projekti staatus
 DocType: UOM,Check this to disallow fractions. (for Nos),Vaata seda keelata fraktsioonid. (NOS)
 DocType: Student Admission Program,Naming Series (for Student Applicant),Nimetamine seeria (Student taotleja)
-apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.py,UOM Conversion factor ({0} -&gt; {1}) not found for item: {2},UOM teisendustegurit ({0} -&gt; {1}) üksusele {2} ei leitud
 apps/erpnext/erpnext/hr/doctype/retention_bonus/retention_bonus.py,Bonus Payment Date cannot be a past date,Boonuse maksmise kuupäev ei saa olla varasem kuupäev
 DocType: Travel Request,Copy of Invitation/Announcement,Kutse / teate koopia
 DocType: Practitioner Service Unit Schedule,Practitioner Service Unit Schedule,Praktikute teenindusüksuse ajakava
@@ -4156,6 +4166,7 @@
 apps/erpnext/erpnext/utilities/user_progress.py,Setup Company,Setup Company
 ,Lab Test Report,Lab katsearuanne
 DocType: Employee Benefit Application,Employee Benefit Application,Töövõtja hüvitise taotlus
+apps/erpnext/erpnext/accounts/doctype/invoice_discounting/invoice_discounting.py,Row({0}): {1} is already discounted in {2},Rida ({0}): {1} on juba allahinnatud {2}
 apps/erpnext/erpnext/hr/doctype/additional_salary/additional_salary.py,Additional Salary Component Exists.,Täiendav palgakomponent on olemas.
 DocType: Purchase Invoice,Unregistered,Registreerimata
 DocType: Student Applicant,Application Date,Esitamise kuupäev
@@ -4232,7 +4243,6 @@
 DocType: Journal Entry,Accounting Entries,Raamatupidamise kanded
 DocType: Job Card Time Log,Job Card Time Log,Töökaardi ajalogi
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,"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;."
-apps/erpnext/erpnext/education/doctype/instructor/instructor.py,Please setup Instructor Naming System in Education &gt; Education Settings,Seadistage juhendaja nimetamise süsteem jaotises Haridus&gt; Hariduse sätted
 DocType: Journal Entry,Paid Loan,Tasuline laen
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py,Duplicate Entry. Please check Authorization Rule {0},Topeltkirje. Palun kontrollige Luba Reegel {0}
 DocType: Journal Entry Account,Reference Due Date,Võrdluskuupäev
@@ -4249,7 +4259,6 @@
 apps/erpnext/erpnext/templates/pages/projects.html,No time sheets,Pole aega lehed
 DocType: GoCardless Mandate,GoCardless Customer,GoCardless klient
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py,Leave Type {0} cannot be carry-forwarded,Jäta tüüp {0} ei saa läbi-edasi
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Item Code &gt; Item Group &gt; Brand,Kauba kood&gt; esemerühm&gt; kaubamärk
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py,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
 DocType: Leave Encashment,Payroll,palgafond
@@ -4364,7 +4373,6 @@
 DocType: Stock Ledger Entry,Actual Qty After Transaction,Tegelik Kogus Pärast Tehing
 ,Pending SO Items For Purchase Request,Kuni SO Kirjed osta taotlusel
 apps/erpnext/erpnext/education/doctype/student_admission/student_admission.py,Student Admissions,Student Sisseastujale
-apps/erpnext/erpnext/accounts/party.py,{0} {1} is disabled,{0} {1} on keelatud
 DocType: Supplier,Billing Currency,Arved Valuuta
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py,Extra Large,Väga suur
 DocType: Loan,Loan Application,Laenu taotlemine
@@ -4441,7 +4449,6 @@
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py,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/accounts/doctype/accounting_dimension/accounting_dimension.py,Creating Dimensions...,Mõõtmete loomine ...
 apps/erpnext/erpnext/education/doctype/student_group_creation_tool/student_group_creation_tool.py,Student Group Name is mandatory in row {0},Student Group Nimi on kohustuslik järjest {0}
-DocType: Customer Credit Limit,Bypass credit limit_check,Krediidilimiidi kontrollist mööda hiilimine
 DocType: Homepage,Products to be shown on website homepage,Tooted näidatavad veebilehel kodulehekülg
 DocType: HR Settings,Password Policy,Paroolipoliitika
 apps/erpnext/erpnext/setup/doctype/customer_group/customer_group.js,This is a root customer group and cannot be edited.,See on just klientide rühma ja seda ei saa muuta.
@@ -4733,6 +4740,7 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py,Row {0}: Advance against Customer must be credit,Row {0}: Advance vastu Klient peab olema krediidi
 DocType: Quality Meeting,Quality Meeting,Kvaliteedikohtumine
 apps/erpnext/erpnext/accounts/doctype/account/account.js,Non-Group to Group,Non-Group Group
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,"Valige Seadistamise seeria väärtuseks {0}, mis asub seadistuse&gt; Seadistused&gt; Seeriate nimetamine"
 DocType: Employee,ERPNext User,ERPNext kasutaja
 apps/erpnext/erpnext/education/doctype/student_group_creation_tool/student_group_creation_tool.py,Batch is mandatory in row {0},Partii on kohustuslik rida {0}
 DocType: Company,Default Buying Terms,Ostmise vaiketingimused
@@ -5027,6 +5035,7 @@
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py,No {0} found for Inter Company Transactions.,Firma Inter-tehingute jaoks ei leitud {0}.
 DocType: Travel Itinerary,Rented Car,Renditud auto
 apps/erpnext/erpnext/public/js/hub/components/profile_dialog.js,About your Company,Teie ettevõtte kohta
+apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.js,Show Stock Ageing Data,Näita varude vananemise andmeid
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py,Credit To account must be a Balance Sheet account,Krediidi konto peab olema bilansis
 DocType: Donor,Donor,Doonor
 DocType: Global Defaults,Disable In Words,Keela sõnades
@@ -5041,8 +5050,10 @@
 DocType: Practitioner Schedule,Schedule Name,Ajakava nimi
 apps/erpnext/erpnext/regional/doctype/gstr_3b_report/gstr_3b_report.py,Please enter GSTIN and state for the Company Address {0},Sisestage GSTIN ja sisestage ettevõtte aadress {0}
 DocType: Currency Exchange,For Buying,Ostmiseks
+apps/erpnext/erpnext/setup/default_energy_point_rules.py,On Purchase Order Submission,Ostutellimuse esitamisel
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js,Add All Suppliers,Lisa kõik pakkujad
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py,Row #{0}: Allocated Amount cannot be greater than outstanding amount.,Row # {0}: Eraldatud summa ei saa olla suurem kui tasumata summa.
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Customer &gt; Customer Group &gt; Territory,Klient&gt; kliendigrupp&gt; territoorium
 DocType: Tally Migration,Parties,Pooled
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js,Browse BOM,Sirvi Bom
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py,Secured Loans,Tagatud laenud
@@ -5074,6 +5085,7 @@
 apps/erpnext/erpnext/stock/doctype/item_alternative/item_alternative.py,Not allow to set alternative item for the item {0},Mitte lubada elemendi {0} jaoks alternatiivset elementi
 apps/erpnext/erpnext/hr/doctype/leave_block_list/leave_block_list.py,Date is repeated,Kuupäev korratakse
 apps/erpnext/erpnext/accounts/print_format/payment_receipt_voucher/payment_receipt_voucher.html,Authorized Signatory,Allkirjaõiguslik
+apps/erpnext/erpnext/education/doctype/instructor/instructor.py,Please setup Instructor Naming System in Education &gt; Education Settings,Seadistage juhendaja nimetamise süsteem jaotises Haridus&gt; Hariduse sätted
 apps/erpnext/erpnext/regional/doctype/gstr_3b_report/gstr_3b_report.html,Net ITC Available(A) - (B),Net ITC saadaval (A) - (B)
 apps/erpnext/erpnext/education/doctype/fee_schedule/fee_schedule.js,Create Fees,Loo lõivu
 DocType: Project,Total Purchase Cost (via Purchase Invoice),Kokku ostukulud (via ostuarve)
@@ -5094,6 +5106,7 @@
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.js,Message Sent,Sõnum saadetud
 apps/erpnext/erpnext/accounts/doctype/account/account.py,Account with child nodes cannot be set as ledger,Konto tütartippu ei saa seada pearaamatu
 DocType: C-Form,II,II
+apps/erpnext/erpnext/assets/report/fixed_asset_register/fixed_asset_register.py,Vendor Name,Müüja nimi
 DocType: Quiz Result,Wrong,Vale
 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)
@@ -5335,6 +5348,7 @@
 DocType: Stock Settings,Auto Material Request,Auto Material taotlus
 DocType: Woocommerce Settings,API consumer secret,API tarbija saladus
 DocType: Delivery Note Item,Available Batch Qty at From Warehouse,Saadaval Partii Kogus kell laost
+,Received Qty Amount,Saadud kogus
 DocType: Salary Slip,Gross Pay - Total Deduction - Loan Repayment,Gross Pay - kokku mahaarvamine - laenu tagasimakse
 DocType: Bank Account,Last Integration Date,Viimane integreerimise kuupäev
 DocType: Expense Claim,Expense Taxes and Charges,Kulumaksud ja muud tasud
@@ -5791,6 +5805,8 @@
 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,Please select Qty against item {0},Palun vali kogus elemendi {0}
+apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py,Latest Age,Viimane vanus
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js,Transfer Material to Supplier,Transfer Materjal Tarnija
 apps/erpnext/erpnext/hr/report/loan_repayment/loan_repayment.py,EMI,EMI
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py,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
@@ -5814,7 +5830,6 @@
 apps/erpnext/erpnext/hr/doctype/employee_benefit_application/employee_benefit_application.py,"An amount of {0} already claimed for the component {1},\
 						 set the amount equal or greater than {2}","Komponendi {1} jaoks juba nõutud {0} summa, \ set summa, mis on võrdne või suurem {2}"
 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
 DocType: BOM Update Tool,The new BOM after replacement,Uus Bom pärast asendamine
 ,Point of Sale,Müügikoht
@@ -5934,7 +5949,6 @@
 DocType: Purchase Order Item,Blanket Order Rate,Teki tellimiskiirus
 ,Customer Ledger Summary,Kliendiraamatu kokkuvõte
 apps/erpnext/erpnext/hooks.py,Certification,Sertifitseerimine
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js,Are you sure you want to make debit note?,Kas soovite kindlasti teha võlateatise?
 DocType: Bank Guarantee,Clauses and Conditions,Tingimused ja tingimused
 DocType: Serial No,Creation Document Type,Loomise Dokumendi liik
 DocType: Amazon MWS Settings,ES,ES
@@ -5972,8 +5986,6 @@
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py,Financial Services,Finantsteenused
 DocType: Student Sibling,Student ID,Õpilase ID
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.js,For Quantity must be greater than zero,Kogus peab olema suurem kui null
-apps/erpnext/erpnext/hr/doctype/employee_transfer/employee_transfer.py,"Please delete the Employee <a href=""#Form/Employee/{0}"">{0}</a>\
-					to cancel this document","Selle dokumendi tühistamiseks kustutage töötaja <a href=""#Form/Employee/{0}"">{0}</a> \"
 apps/erpnext/erpnext/config/projects.py,Types of activities for Time Logs,Tüübid tegevused aeg kajakad
 DocType: Opening Invoice Creation Tool,Sales,Läbimüük
 DocType: Stock Entry Detail,Basic Amount,Põhisummat
@@ -6052,6 +6064,7 @@
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py,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,Send Supplier Emails,Saada Tarnija kirjad
+DocType: Asset Movement,ACC-ASM-.YYYY.-,ACC-ASM-.AAAA.-
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py,"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
 apps/erpnext/erpnext/hr/doctype/employee_onboarding/employee_onboarding.py,Submit this to create the Employee record,"Esitage see, et luua töötaja kirje"
@@ -6129,7 +6142,6 @@
 DocType: Sales Team,Contact No.,Võta No.
 apps/erpnext/erpnext/templates/includes/cart/cart_address.html,Billing Address is same as Shipping Address,Arveldusaadress on sama mis saateaadress
 DocType: Bank Reconciliation,Payment Entries,makse Sissekanded
-apps/erpnext/erpnext/erpnext_integrations/doctype/shopify_settings/shopify_settings.py,Access token or Shopify URL missing,Juurdepääsuotsik või Shopifyi URL puudub
 DocType: Location,Latitude,Laiuskraad
 DocType: Work Order,Scrap Warehouse,Vanametalli Warehouse
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py,"Warehouse required at Row No {0}, please set default warehouse for the item {1} for the company {2}","Rida nr {0} nõutav lao, palun määra ettevõtte {1} jaoks vaikimisi ladu {2}"
@@ -6172,7 +6184,6 @@
 DocType: Job Offer Term,Value / Description,Väärtus / Kirjeldus
 apps/erpnext/erpnext/controllers/accounts_controller.py,"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
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js,Are you sure you want to make credit note?,Kas soovite kindlasti kreeditarvet teha?
 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,Debit and Credit not equal for {0} #{1}. Difference is {2}.,Deebeti ja kreediti ole võrdsed {0} # {1}. Erinevus on {2}.
@@ -6297,6 +6308,7 @@
 DocType: Purchase Invoice,Taxes and Charges Added,Maksude ja tasude lisatud
 apps/erpnext/erpnext/assets/doctype/asset/asset.py,Depreciation Row {0}: Next Depreciation Date cannot be before Available-for-use Date,Amortisatsiooni rea {0}: järgmine amortisatsiooni kuupäev ei saa olla enne kasutatavat kuupäeva
 ,Sales Funnel,Müügi lehtri
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Item Code &gt; Item Group &gt; Brand,Kauba kood&gt; esemerühm&gt; kaubamärk
 apps/erpnext/erpnext/setup/doctype/company/company.py,Abbreviation is mandatory,Lühend on kohustuslik
 DocType: Project,Task Progress,ülesanne Progress
 apps/erpnext/erpnext/templates/includes/navbar/navbar_items.html,Cart,Ostukorvi
@@ -6540,6 +6552,7 @@
 DocType: Employee Grade,Employee Grade,Töötajate hinne
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py,Piecework,Tükitöö
 DocType: GSTR 3B Report,June,Juuni
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Supplier &gt; Supplier Type,Tarnija&gt; Tarnija tüüp
 DocType: Share Balance,From No,Alates nr
 DocType: Shift Type,Early Exit Grace Period,Varajase lahkumise ajapikendus
 DocType: Task,Actual Time (in Hours),Tegelik aeg (tundides)
@@ -6824,6 +6837,7 @@
 DocType: Warehouse,Warehouse Name,Ladu nimi
 DocType: Naming Series,Select Transaction,Vali Tehing
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py,Please enter Approving Role or Approving User,Palun sisestage kinnitamine Role või heaks Kasutaja
+apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.py,UOM Conversion factor ({0} -&gt; {1}) not found for item: {2},UOM teisendustegurit ({0} -&gt; {1}) üksusele {2} ei leitud
 apps/erpnext/erpnext/support/doctype/service_level_agreement/service_level_agreement.py,Service Level Agreement with Entity Type {0} and Entity {1} already exists.,Teenuse taseme leping üksuse tüübiga {0} ja olemiga {1} on juba olemas.
 DocType: Journal Entry,Write Off Entry,Kirjutage Off Entry
 DocType: BOM,Rate Of Materials Based On,Hinda põhinevatest materjalidest
@@ -7014,6 +7028,7 @@
 DocType: Quality Inspection Reading,Quality Inspection Reading,Quality Inspection Reading
 apps/erpnext/erpnext/stock/doctype/stock_settings/stock_settings.py,`Freeze Stocks Older Than` should be smaller than %d days.,`Külmuta varud vanemad kui` peab olema väiksem kui% d päeva.
 DocType: Tax Rule,Purchase Tax Template,Ostumaks Mall
+apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py,Earliest Age,Varasem vanus
 apps/erpnext/erpnext/utilities/user_progress.py,Set a sales goal you'd like to achieve for your company.,"Määrake müügieesmärk, mida soovite oma ettevõtte jaoks saavutada."
 DocType: Quality Goal,Revision,Redaktsioon
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js,Healthcare Services,Tervishoiuteenused
@@ -7057,6 +7072,7 @@
 apps/erpnext/erpnext/healthcare/doctype/patient_encounter/patient_encounter.js,Schedule Discharge,Ajakava tühjendamine
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py,Cheques and Deposits incorrectly cleared,Tšekid ja hoiused valesti puhastatud
 DocType: Homepage Section Card,Homepage Section Card,Kodulehe sektsiooni kaart
+,Amount To Be Billed,Arve summa
 apps/erpnext/erpnext/accounts/doctype/account/account.py,Account {0}: You can not assign itself as parent account,Konto {0} Te ei saa määrata ise vanemakonto
 DocType: Purchase Invoice Item,Price List Rate,Hinnakiri Rate
 apps/erpnext/erpnext/utilities/activation.py,Create customer quotes,Loo klientide hinnapakkumisi
@@ -7109,6 +7125,7 @@
 DocType: Supplier Scorecard Criteria,Supplier Scorecard Criteria,Tarnija tulemuskaardi kriteeriumid
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py,Please select Start Date and End Date for Item {0},Palun valige Start ja lõppkuupäeva eest Punkt {0}
 DocType: Maintenance Schedule,MAT-MSH-.YYYY.-,MAT-MSH-.YYYY.-
+,Amount to Receive,Saadav summa
 apps/erpnext/erpnext/education/doctype/student_group_creation_tool/student_group_creation_tool.py,Course is mandatory in row {0},Muidugi on kohustuslik järjest {0}
 apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py,From date can not be greater than than To date,Alates kuupäevast ei saa olla suurem kui Tänaseks
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py,To date cannot be before from date,Praeguseks ei saa enne kuupäevast alates
@@ -7356,7 +7373,6 @@
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js,BOM and Manufacturing Quantity are required,Bom ja tootmine Kogus on vajalik
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js,Ageing Range 2,Vananemine Range 2
 DocType: SG Creation Tool Course,Max Strength,max Strength
-apps/erpnext/erpnext/accounts/doctype/account/account.py,"Account {0} already exists in child company {1}. The following fields have different values, they should be same:<ul><li>{2}</li></ul>","Konto {0} on juba lapseettevõttes {1} olemas. Järgmistel väljadel on erinevad väärtused, need peaksid olema samad: <ul><li> {2} </li></ul>"
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py,Installing presets,Eelseadistuste installimine
 DocType: Fee Schedule,EDU-FSH-.YYYY.-,EDU-FSH-.YYYY.-
 apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js,No Delivery Note selected for Customer {},Kliendi jaoks pole valitud tarne märkust {}
@@ -7564,6 +7580,7 @@
 DocType: Delivery Note,Print Without Amount,Trüki Ilma summa
 apps/erpnext/erpnext/accounts/report/asset_depreciation_ledger/asset_depreciation_ledger.py,Depreciation Date,Amortisatsioon kuupäev
 ,Work Orders in Progress,Käimasolevad töökorraldused
+DocType: Customer Credit Limit,Bypass Credit Limit Check,Krediidilimiidi ümbersõit mööda
 DocType: Issue,Support Team,Support Team
 apps/erpnext/erpnext/stock/report/batch_item_expiry_status/batch_item_expiry_status.py,Expiry (In Days),Lõppemine (päevades)
 DocType: Appraisal,Total Score (Out of 5),Üldskoor (Out of 5)
@@ -7747,6 +7764,7 @@
 DocType: Sales Invoice,Customer GSTIN,Kliendi GSTIN
 DocType: Crop Cycle,List of diseases detected on the field. When selected it'll automatically add a list of tasks to deal with the disease ,"Valdkonnas tuvastatud haiguste loetelu. Kui see on valitud, lisab see haigusjuhtumite loendisse automaatselt nimekirja"
 apps/erpnext/erpnext/manufacturing/page/bom_comparison_tool/bom_comparison_tool.js,BOM 1,1. pomm
+apps/erpnext/erpnext/assets/report/fixed_asset_register/fixed_asset_register.py,Asset Id,Vara ID
 apps/erpnext/erpnext/healthcare/doctype/healthcare_service_unit/healthcare_service_unit.js,This is a root healthcare service unit and cannot be edited.,See on root-tervishoiuteenuse üksus ja seda ei saa muuta.
 DocType: Asset Repair,Repair Status,Remondi olek
 apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.js,"Requested Qty: Quantity requested for purchase, but not ordered.","Taotletud kogus: ostmiseks taotletud, kuid tellimata kogus."
diff --git a/erpnext/translations/fa.csv b/erpnext/translations/fa.csv
index c64b3fd..15e2430 100644
--- a/erpnext/translations/fa.csv
+++ b/erpnext/translations/fa.csv
@@ -286,7 +286,6 @@
 DocType: Loan,Repay Over Number of Periods,بازپرداخت تعداد بیش از دوره های
 apps/erpnext/erpnext/manufacturing/report/bom_stock_report/bom_stock_report.py,Quantity to Produce can not be less than Zero,مقدار تولید نمی تواند کمتر از صفر باشد
 DocType: Stock Entry,Additional Costs,هزینه های اضافی
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Customer &gt; Customer Group &gt; Territory,مشتری&gt; گروه مشتری&gt; سرزمین
 apps/erpnext/erpnext/accounts/doctype/account/account.py,Account with existing transaction can not be converted to group.,حساب با معامله موجود می تواند به گروه تبدیل نمی کند.
 DocType: Lead,Product Enquiry,پرس و جو محصولات
 DocType: Education Settings,Validate Batch for Students in Student Group,اعتبارسنجی دسته ای برای دانش آموزان در گروه های دانشجویی
@@ -582,6 +581,7 @@
 DocType: Healthcare Settings,Create documents for sample collection,اسناد را برای جمع آوری نمونه ایجاد کنید
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py,Payment against {0} {1} cannot be greater than Outstanding Amount {2},پرداخت در مقابل {0} {1} نمی تواند بیشتر از برجسته مقدار {2}
 apps/erpnext/erpnext/patches/v11_0/add_healthcare_service_unit_tree_root.py,All Healthcare Service Units,همه ی سرویس های بهداشتی
+apps/erpnext/erpnext/setup/default_energy_point_rules.py,On Converting Opportunity,در تبدیل فرصت
 DocType: Bank Account,Address HTML,آدرس HTML
 DocType: Lead,Mobile No.,شماره موبایل
 apps/erpnext/erpnext/selling/doctype/pos_closing_voucher/closing_voucher_details.html,Mode of Payments,حالت پرداخت
@@ -646,7 +646,6 @@
 DocType: Accounting Dimension,Dimension Name,نام ابعاد
 apps/erpnext/erpnext/healthcare/setup.py,Resistant,مقاوم
 apps/erpnext/erpnext/hotels/doctype/hotel_room_reservation/hotel_room_reservation.py,Please set Hotel Room Rate on {},لطفا قیمت اتاق هتل را برای {} تنظیم کنید
-apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py,Please setup numbering series for Attendance via Setup &gt; Numbering Series,لطفاً سریال های شماره گذاری را برای حضور از طریق تنظیم&gt; سری شماره گذاری تنظیم کنید
 DocType: Journal Entry,Multi Currency,چند ارز
 DocType: Bank Statement Transaction Invoice Item,Invoice Type,فاکتور نوع
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py,Valid from date must be less than valid upto date,اعتبار آن از تاریخ باید کمتر از تاریخ معتبر باشد
@@ -758,6 +757,7 @@
 apps/erpnext/erpnext/accounts/page/pos/pos.js,Create a new Customer,ایجاد یک مشتری جدید
 apps/erpnext/erpnext/non_profit/report/expiring_memberships/expiring_memberships.py,Expiring On,در حال پایان است
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,"If multiple Pricing Rules continue to prevail, users are asked to set Priority manually to resolve conflict.",اگر چند در قوانین قیمت گذاری ادامه غالب است، از کاربران خواسته به تنظیم اولویت دستی برای حل و فصل درگیری.
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js,Purchase Return,بازگشت خرید
 apps/erpnext/erpnext/utilities/activation.py,Create Purchase Orders,ایجاد سفارشات خرید
 ,Purchase Register,خرید ثبت نام
 apps/erpnext/erpnext/healthcare/doctype/patient/patient.py,Patient not found,بیمار یافت نشد
@@ -772,7 +772,6 @@
 DocType: Location,Area UOM,منطقه UOM
 apps/erpnext/erpnext/manufacturing/doctype/workstation/workstation.py,Workstation is closed on the following dates as per Holiday List: {0},ایستگاه های کاری در تاریخ زیر را به عنوان در هر فهرست تعطیلات بسته است: {0}
 apps/erpnext/erpnext/selling/page/sales_funnel/sales_funnel.py,Opportunities,فرصت ها
-apps/erpnext/erpnext/www/all-products/index.html,Clear filters,فیلترها را پاک کنید
 DocType: Lab Test Template,Single,تک
 DocType: Compensatory Leave Request,Work From Date,کار از تاریخ
 DocType: Salary Slip,Total Loan Repayment,مجموع بازپرداخت وام
@@ -815,6 +814,7 @@
 DocType: Account,Old Parent,قدیمی مرجع
 apps/erpnext/erpnext/education/doctype/program_enrollment_tool/program_enrollment_tool.py,Mandatory field - Academic Year,فیلد اجباری - سال تحصیلی
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py,{0} {1} is not associated with {2} {3},{0} {1} با {2} {3} ارتباط ندارد
+DocType: Opportunity,Converted By,تبدیل شده توسط
 apps/erpnext/erpnext/public/js/hub/components/ReviewArea.vue,You need to login as a Marketplace User before you can add any reviews.,قبل از هرگونه بررسی ، باید به عنوان کاربر Marketplace وارد شوید.
 apps/erpnext/erpnext/manufacturing/doctype/job_card/job_card.py,Row {0} : Operation is required against the raw material item {1},ردیف {0}: عملیات مورد نیاز علیه مواد خام مورد نیاز است {1}
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py,Please set default payable account for the company {0},لطفا پیش فرض حساب های قابل پرداخت تعیین شده برای شرکت {0}
@@ -839,6 +839,8 @@
 DocType: BOM,Work Order,سفارش کار
 DocType: Sales Invoice,Total Qty,مجموع تعداد
 apps/erpnext/erpnext/education/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py,Guardian2 Email ID,Guardian2 ID ایمیل
+apps/erpnext/erpnext/hr/doctype/employee_transfer/employee_transfer.py,"Please delete the Employee <a href=""#Form/Employee/{0}"">{0}</a>\
+					to cancel this document","لطفاً برای لغو این سند ، <a href=""#Form/Employee/{0}"">{0}</a> \ کارمند را حذف کنید"
 DocType: Item,Show in Website (Variant),نمایش در وب سایت (نوع)
 DocType: Employee,Health Concerns,نگرانی های بهداشتی
 DocType: Payroll Entry,Select Payroll Period,انتخاب کنید حقوق و دستمزد دوره
@@ -895,7 +897,6 @@
 apps/erpnext/erpnext/education/doctype/student_group/student_group.py,Please select Course,لطفا دوره را انتخاب کنید
 DocType: Codification Table,Codification Table,جدول کدگذاری
 DocType: Timesheet Detail,Hrs,ساعت
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js,Please select Company,لطفا انتخاب کنید شرکت
 DocType: Employee Skill,Employee Skill,مهارت کارمندان
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.js,Difference Account,حساب تفاوت
 DocType: Pricing Rule,Discount on Other Item,تخفیف در مورد دیگر
@@ -963,6 +964,7 @@
 DocType: BOM,Operating Cost,هزینه های عملیاتی
 DocType: Crop,Produced Items,آیتم های تولید شده
 DocType: Bank Statement Transaction Entry,Match Transaction to Invoices,معامله معاملات را به صورت حساب
+apps/erpnext/erpnext/erpnext_integrations/exotel_integration.py,Error in Exotel incoming call,خطا در تماس دریافتی Exotel
 DocType: Sales Order Item,Gross Profit,سود ناخالص
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js,Unblock Invoice,انحلال صورتحساب
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py,Increment cannot be 0,افزایش نمی تواند 0
@@ -1171,6 +1173,7 @@
 DocType: Activity Cost,Activity Type,نوع فعالیت
 DocType: Request for Quotation,For individual supplier,عرضه کننده منحصر به فرد
 DocType: BOM Operation,Base Hour Rate(Company Currency),یک ساعت یک نرخ پایه (شرکت ارز)
+,Qty To Be Billed,Qty به صورتحساب است
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py,Delivered Amount,تحویل مبلغ
 apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.js,Reserved Qty for Production: Raw materials quantity to make manufacturing items.,قطعه رزرو شده برای تولید: مقدار مواد اولیه برای ساخت کالاهای تولیدی.
 DocType: Loyalty Point Entry Redemption,Redemption Date,تاریخ رستگاری
@@ -1286,7 +1289,7 @@
 DocType: Sales Invoice,Commission Rate (%),نرخ کمیسیون (٪)
 apps/erpnext/erpnext/education/doctype/student_group/student_group.py,Please select Program,لطفا انتخاب برنامه
 DocType: Project,Estimated Cost,هزینه تخمین زده شده
-DocType: Request for Quotation,Link to material requests,لینک به درخواست مواد
+DocType: Supplier Quotation,Link to material requests,لینک به درخواست مواد
 apps/erpnext/erpnext/public/js/hub/pages/Publish.vue,Publish,انتشار
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py,Aerospace,جو زمین
 ,Fichier des Ecritures Comptables [FEC],Ficier Des Ecritures Comptables [FEC]
@@ -1299,6 +1302,7 @@
 apps/erpnext/erpnext/utilities/transaction_base.py,Invalid Posting Time,زمان ارسال نامعتبر
 DocType: Salary Component,Condition and Formula,شرایط و فرمول
 DocType: Lead,Campaign Name,نام کمپین
+apps/erpnext/erpnext/setup/default_energy_point_rules.py,On Task Completion,در تکمیل کار
 apps/erpnext/erpnext/hr/doctype/compensatory_leave_request/compensatory_leave_request.py,There is no leave period in between {0} and {1},فاصله زمانی بین {0} و {1} وجود ندارد
 DocType: Fee Validity,Healthcare Practitioner,پزشک متخصص
 DocType: Hotel Room,Capacity,ظرفیت
@@ -1642,7 +1646,6 @@
 DocType: Quality Feedback Template,Quality Feedback Template,الگوی بازخورد کیفیت
 apps/erpnext/erpnext/config/education.py,LMS Activity,فعالیت LMS
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py,Internet Publishing,انتشارات اینترنت
-DocType: Prescription Duration,Number,عدد
 apps/erpnext/erpnext/accounts/doctype/opening_invoice_creation_tool/opening_invoice_creation_tool.js,Creating {0} Invoice,ایجاد {0} صورتحساب
 DocType: Medical Code,Medical Code Standard,کد استاندارد پزشکی
 DocType: Soil Texture,Clay Composition (%),ترکیب خشت (٪)
@@ -1717,6 +1720,7 @@
 DocType: Support Settings,Get Started Sections,بخش های شروع کنید
 DocType: Lead,CRM-LEAD-.YYYY.-,CRM-LEAD- .YYYY.-
 DocType: Invoice Discounting,Sanctioned,تحریم
+,Base Amount,مبلغ پایه
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.js,Total Contribution Amount: {0},مجموع کمک مالی: {0}
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py,Row #{0}: Please specify Serial No for Item {1},ردیف # {0}: لطفا سریال مشخص نیست برای مورد {1}
 DocType: Payroll Entry,Salary Slips Submitted,حقوق و دستمزد ارسال شده است
@@ -1934,6 +1938,7 @@
 apps/erpnext/erpnext/utilities/user_progress.py,List a few of your suppliers. They could be organizations or individuals.,لیست چند از تامین کنندگان خود را. آنها می تواند سازمان ها یا افراد.
 DocType: Accounting Dimension,Dimension Defaults,پیش فرض ابعاد
 apps/erpnext/erpnext/crm/report/prospects_engaged_but_not_converted/prospects_engaged_but_not_converted.js,Minimum Lead Age (Days),حداقل سن منجر (روز)
+apps/erpnext/erpnext/assets/report/fixed_asset_register/fixed_asset_register.py,Available For Use Date,در دسترس برای تاریخ استفاده
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py,All BOMs,همه BOM ها
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js,Create Inter Company Journal Entry,ورود مجله شرکت بین المللی را ایجاد کنید
 DocType: Company,Parent Company,شرکت مادر
@@ -1997,6 +2002,7 @@
 ,IRS 1099,IRS 1099
 DocType: Salary Slip,Leave Without Pay,ترک کنی بدون اینکه پرداخت
 DocType: Payment Request,Outward,به سمت خارج
+apps/erpnext/erpnext/setup/default_energy_point_rules.py,On {0} Creation,در {0} ایجاد
 apps/erpnext/erpnext/regional/doctype/gstr_3b_report/gstr_3b_report.html,State/UT Tax,مالیات دولت / UT
 ,Trial Balance for Party,تعادل دادگاه برای حزب
 ,Gross and Net Profit Report,گزارش سود ناخالص و خالص
@@ -2111,6 +2117,7 @@
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js,Make Stock Entry,ورود سهام
 DocType: Hotel Room Reservation,Hotel Reservation User,کاربر رزرو هتل
 apps/erpnext/erpnext/projects/doctype/project/project.js,Set Status,تنظیم وضعیت
+apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py,Please setup numbering series for Attendance via Setup &gt; Numbering Series,لطفاً سریال های شماره گذاری را برای حضور از طریق تنظیم&gt; سری شماره گذاری تنظیم کنید
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py,Please select prefix first,لطفا ابتدا پیشوند انتخاب کنید
 DocType: Contract,Fulfilment Deadline,آخرین مهلت تحویل
 apps/erpnext/erpnext/public/js/hub/pages/Home.vue,Near you,نزدیک تو
@@ -2126,6 +2133,7 @@
 DocType: Announcement,All Students,همه ی دانش آموزان
 apps/erpnext/erpnext/assets/doctype/asset/asset.py,Item {0} must be a non-stock item,مورد {0} باید یک آیتم غیر سهام شود
 apps/erpnext/erpnext/stock/doctype/batch/batch.js,View Ledger,مشخصات لجر
+DocType: Cost Center,Lft,LFT
 DocType: Grading Scale,Intervals,فواصل
 DocType: Bank Statement Transaction Entry,Reconciled Transactions,معاملات متقابل
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py,Earliest,قدیمیترین
@@ -2240,6 +2248,7 @@
 apps/erpnext/erpnext/hr/doctype/employee_benefit_application/employee_benefit_application.py,As per your assigned Salary Structure you cannot apply for benefits,همانطور که در ساختار حقوق شما تعیین شده است، نمی توانید برای مزایا درخواست دهید
 apps/erpnext/erpnext/stock/doctype/item/item.py,Website Image should be a public file or website URL,وب سایت تصویر باید یک فایل عمومی و یا آدرس وب سایت می باشد
 DocType: Purchase Invoice Item,BOM,BOM
+apps/erpnext/erpnext/stock/doctype/item/item.py,Duplicate entry in Manufacturers table,ورود تکراری در جدول تولید کنندگان
 apps/erpnext/erpnext/setup/doctype/item_group/item_group.js,This is a root item group and cannot be edited.,این یک گروه مورد ریشه است و نمی تواند ویرایش شود.
 apps/erpnext/erpnext/accounts/doctype/account/account.js,Merge,ادغام
 DocType: Journal Entry Account,Purchase Order,سفارش خرید
@@ -2381,7 +2390,6 @@
 DocType: Asset,Depreciation Schedules,برنامه استهلاک
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.js,Create Sales Invoice,ایجاد فاکتور فروش
 apps/erpnext/erpnext/regional/doctype/gstr_3b_report/gstr_3b_report.html,Ineligible ITC,ITC واجد شرایط نیست
-apps/erpnext/erpnext/erpnext_integrations/doctype/shopify_settings/shopify_settings.py,"Support for public app is deprecated. Please setup private app, for more details refer user manual",پشتیبانی از برنامه عمومی منسوخ شده است. لطفا برنامه خصوصی را راه اندازی کنید، برای اطلاعات بیشتر، راهنمای کاربر را ببینید
 DocType: Task,Dependent Tasks,وظایف وابسته
 apps/erpnext/erpnext/regional/report/gstr_1/gstr_1.py,Following accounts might be selected in GST Settings:,حسابهای زیر ممکن است در تنظیمات GST انتخاب شوند:
 apps/erpnext/erpnext/manufacturing/report/bom_stock_report/bom_stock_report.js,Quantity to Produce,مقدار تولید
@@ -2628,6 +2636,7 @@
 DocType: Water Analysis,Container,کانتینر
 apps/erpnext/erpnext/regional/report/gstr_1/gstr_1.py,Please set valid GSTIN No. in Company Address,لطفاً شماره معتبر GSTIN را در آدرس شرکت تنظیم کنید
 apps/erpnext/erpnext/education/utils.py,Student {0} - {1} appears Multiple times in row {2} & {3},دانشجو {0} - {1} چند بار در ردیف به نظر می رسد {2} و {3}
+apps/erpnext/erpnext/selling/doctype/customer/customer.py,Following fields are mandatory to create address:,زمینه های زیر برای ایجاد آدرس الزامی است:
 DocType: Item Alternative,Two-way,دو طرفه
 DocType: Item,Manufacturers,تولید کنندگان
 ,Employee Billing Summary,خلاصه صورتحساب کارمندان
@@ -2701,9 +2710,9 @@
 DocType: Employee,HR-EMP-,HR-EMP-
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py,User {0} doesn't have any default POS Profile. Check Default at Row {1} for this User.,کاربر {0} هیچ پروفایل پیش فرض POS ندارد. برای این کاربر پیش فرض در ردیف {1} را بررسی کنید.
 DocType: Quality Meeting Minutes,Quality Meeting Minutes,دقیقه جلسات با کیفیت
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Supplier &gt; Supplier Type,عرضه کننده&gt; نوع عرضه کننده
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py,Employee Referral,ارجاع کارمند
 DocType: Student Group,Set 0 for no limit,تنظیم 0 برای هیچ محدودیتی
+DocType: Cost Center,rgt,RGT
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py,The day(s) on which you are applying for leave are holidays. You need not apply for leave.,روز (بازدید کنندگان) که در آن شما برای مرخصی استفاده از تعطیلات. شما نیاز به درخواست برای ترک نمی کند.
 DocType: Customer,Primary Address and Contact Detail,آدرس اصلی و جزئیات تماس
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.js,Resend Payment Email,ارسال مجدد ایمیل پرداخت
@@ -2812,7 +2821,6 @@
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py,Against Supplier Invoice {0} dated {1},در برابر تامین کننده فاکتور {0} تاریخ {1}
 DocType: Customer,Default Price List,به طور پیش فرض لیست قیمت
 apps/erpnext/erpnext/assets/doctype/asset/asset.py,Asset Movement record {0} created,ضبط حرکت دارایی {0} ایجاد
-apps/erpnext/erpnext/utilities/page/leaderboard/leaderboard.js,No items found.,موردی یافت نشد.
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py,You cannot delete Fiscal Year {0}. Fiscal Year {0} is set as default in Global Settings,شما نمی توانید حذف سال مالی {0}. سال مالی {0} به عنوان پیش فرض در تنظیمات جهانی تنظیم
 DocType: Share Transfer,Equity/Liability Account,حساب سهام و مسئولیت
 apps/erpnext/erpnext/setup/doctype/customer_group/customer_group.py,A customer with the same name already exists,یک مشتری با همین نام قبلا وجود دارد
@@ -2828,6 +2836,7 @@
 apps/erpnext/erpnext/selling/doctype/customer/customer.py,Credit limit has been crossed for customer {0} ({1}/{2}),اعتبار محدود شده است برای مشتری {0} ({1} / {2})
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py,Customer required for 'Customerwise Discount',مشتری مورد نیاز برای &#39;تخفیف Customerwise&#39;
 apps/erpnext/erpnext/config/accounting.py,Update bank payment dates with journals.,به روز رسانی تاریخ های پرداخت بانک با مجلات.
+,Billed Qty,قبض قبض
 apps/erpnext/erpnext/stock/doctype/item/item_dashboard.py,Pricing,قیمت گذاری
 DocType: Employee,Attendance Device ID (Biometric/RF tag ID),شناسه دستگاه حضور و غیاب (شناسه برچسب بیومتریک / RF)
 DocType: Quotation,Term Details,جزییات مدت
@@ -2849,6 +2858,7 @@
 DocType: Share Transfer,Asset Account,حساب دارایی
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js,New release date should be in the future,تاریخ انتشار جدید باید در آینده باشد
 DocType: Purchase Invoice,End date of current invoice's period,تاریخ پایان دوره صورتحساب فعلی
+apps/erpnext/erpnext/hr/doctype/employee/employee.py,Please setup Employee Naming System in Human Resource &gt; HR Settings,لطفاً سیستم نامگذاری کارمندان را در منابع انسانی&gt; تنظیمات HR تنظیم کنید
 DocType: Lab Test,Technician Name,نام تکنسین
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py,"Cannot ensure delivery by Serial No as \
 					Item {0} is added with and without Ensure Delivery by \
@@ -2856,6 +2866,7 @@
 DocType: Accounts Settings,Unlink Payment on Cancellation of Invoice,قطع ارتباط پرداخت در لغو فاکتور
 DocType: Bank Reconciliation,From Date,از تاریخ
 apps/erpnext/erpnext/hr/doctype/vehicle_log/vehicle_log.py,Current Odometer reading entered should be greater than initial Vehicle Odometer {0},خواندن کیلومترشمار فعلی وارد باید بیشتر از اولیه خودرو کیلومترشمار شود {0}
+,Purchase Order Items To Be Received or Billed,موارد سفارش را بخرید یا قبض خریداری کنید
 DocType: Restaurant Reservation,No Show,بدون نمایش
 apps/erpnext/erpnext/regional/india/utils.py,You must be a registered supplier to generate e-Way Bill,شما باید یک تهیه کننده ثبت شده برای تولید قبض راه الکترونیکی باشید
 DocType: Shipping Rule Country,Shipping Rule Country,قانون حمل و نقل کشور
@@ -2896,6 +2907,7 @@
 apps/erpnext/erpnext/templates/generators/item/item_add_to_cart.html,View in Cart,نمایش سبد خرید
 DocType: Employee Checkin,Shift Actual Start,شروع واقعی Shift
 DocType: Tally Migration,Is Day Book Data Imported,آیا اطلاعات روز کتاب وارد شده است
+,Purchase Order Items To Be Received or Billed1,مواردی را که باید دریافت یا قبض شود خریداری کنید
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py,Marketing Expenses,هزینه های بازاریابی
 ,Item Shortage Report,مورد گزارش کمبود
 DocType: Bank Transaction Payments,Bank Transaction Payments,پرداختهای معامله بانکی
@@ -3258,6 +3270,7 @@
 DocType: Homepage Section,Section Cards,کارت های بخش
 ,Campaign Efficiency,بهره وری کمپین
 DocType: Discussion,Discussion,بحث
+apps/erpnext/erpnext/setup/default_energy_point_rules.py,On Sales Order Submission,در ارسال سفارش فروش
 DocType: Bank Transaction,Transaction ID,شناسه تراکنش
 DocType: Payroll Entry,Deduct Tax For Unsubmitted Tax Exemption Proof,تخفیف مالیات برای اثبات تخفیف مالیات غیرقانونی
 DocType: Volunteer,Anytime,هر زمان
@@ -3265,7 +3278,6 @@
 DocType: Employee Tax Exemption Proof Submission,Employee Tax Exemption Proof Submission,ارائه بازپرداخت معاف از مالیات کارمند
 DocType: Patient,Surgical History,تاریخ جراحی
 DocType: Bank Statement Settings Item,Mapped Header,سربرگ مرتب شده
-apps/erpnext/erpnext/hr/doctype/employee/employee.py,Please setup Employee Naming System in Human Resource &gt; HR Settings,لطفاً سیستم نامگذاری کارمندان را در منابع انسانی&gt; تنظیمات HR تنظیم کنید
 DocType: Employee,Resignation Letter Date,استعفای نامه تاریخ
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Pricing Rules are further filtered based on quantity.,مشاهده قوانین قیمت گذاری بیشتر بر اساس مقدار فیلتر شده است.
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py,Please set the Date Of Joining for employee {0},لطفا مجموعه ای از تاریخ پیوستن برای کارمند {0}
@@ -3279,6 +3291,7 @@
 DocType: Bank Statement Settings,Mapped Items,موارد ممتاز
 DocType: Amazon MWS Settings,IT,آی تی
 DocType: Chapter,Chapter,فصل
+,Fixed Asset Register,ثبت نام دارایی های ثابت
 apps/erpnext/erpnext/utilities/user_progress.py,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,Select BOM and Qty for Production,انتخاب کنید BOM و تعداد برای تولید
@@ -3409,7 +3422,6 @@
 apps/erpnext/erpnext/templates/emails/reorder_item.html,Following Material Requests have been raised automatically based on Item's re-order level,پس از درخواست های مواد به طور خودکار بر اساس سطح آیتم سفارش مجدد مطرح شده است
 apps/erpnext/erpnext/controllers/accounts_controller.py,Account {0} is invalid. Account Currency must be {1},حساب {0} نامعتبر است. حساب ارزی باید {1} باشد
 apps/erpnext/erpnext/hr/doctype/salary_structure_assignment/salary_structure_assignment.py,From Date {0} cannot be after employee's relieving Date {1},از تاریخ {0} نمیتواند پس از تخفیف کارمند تاریخ {1}
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py,Debit Note {0} has been created automatically,Debit Note {0} بطور خودکار ایجاد شده است
 apps/erpnext/erpnext/accounts/doctype/payment_order/payment_order.js,Create Payment Entries,ورودی های پرداخت را ایجاد کنید
 DocType: Supplier,Is Internal Supplier,آیا تامین کننده داخلی است
 DocType: Employee,Create User Permission,ایجاد مجوز کاربر
@@ -4182,7 +4194,6 @@
 DocType: Journal Entry,Accounting Entries,ثبت های حسابداری
 DocType: Job Card Time Log,Job Card Time Log,ورود به سیستم زمان کار
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,"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.",اگر قانون قیمت گذاری انتخاب شده برای «نرخ» ساخته شده باشد، لیست قیمت را لغو خواهد کرد. نرخ حق الزحمه نرخ نهایی است، بنابراین هیچ تخفیف اضافی باید اعمال شود. از این رو، در معاملات مانند سفارش فروش، سفارش خرید و غیره، در فیلد «نرخ» جای خواهد گرفت، نه «قیمت نرخ قیمت».
-apps/erpnext/erpnext/education/doctype/instructor/instructor.py,Please setup Instructor Naming System in Education &gt; Education Settings,لطفاً سیستم نامگذاری مربی را در آموزش و پرورش&gt; تنظیمات آموزش تنظیم کنید
 DocType: Journal Entry,Paid Loan,وام پرداخت شده
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py,Duplicate Entry. Please check Authorization Rule {0},تکراری ورودی. لطفا بررسی کنید مجوز قانون {0}
 DocType: Journal Entry Account,Reference Due Date,تاریخ تحویل مرجع
@@ -4199,7 +4210,6 @@
 apps/erpnext/erpnext/templates/pages/projects.html,No time sheets,بدون ورق زمان
 DocType: GoCardless Mandate,GoCardless Customer,مشتری GoCardless
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py,Leave Type {0} cannot be carry-forwarded,نوع ترک {0} نمی تواند حمل فرستاده
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Item Code &gt; Item Group &gt; Brand,کد کالا&gt; گروه مورد&gt; نام تجاری
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py,Maintenance Schedule is not generated for all the items. Please click on 'Generate Schedule',نگهداری و تعمیرات برنامه برای تمام اقلام تولید شده نیست. لطفا بر روی &#39;ایجاد برنامه کلیک کنید
 ,To Produce,به تولید
 DocType: Leave Encashment,Payroll,لیست حقوق
@@ -4312,7 +4322,6 @@
 DocType: Stock Ledger Entry,Actual Qty After Transaction,تعداد واقعی بعد از تراکنش
 ,Pending SO Items For Purchase Request,در انتظار SO آیتم ها برای درخواست خرید
 apps/erpnext/erpnext/education/doctype/student_admission/student_admission.py,Student Admissions,پذیرش دانشجو
-apps/erpnext/erpnext/accounts/party.py,{0} {1} is disabled,{0} {1} غیر فعال است
 DocType: Supplier,Billing Currency,صدور صورت حساب نرخ ارز
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py,Extra Large,خیلی بزرگ
 DocType: Loan,Loan Application,درخواست وام
@@ -4389,7 +4398,6 @@
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py,Only Leave Applications with status 'Approved' and 'Rejected' can be submitted,تنها برنامه های کاربردی با وضعیت ترک &#39;تایید&#39; و &#39;رد&#39; را می توان ارسال
 apps/erpnext/erpnext/accounts/doctype/accounting_dimension/accounting_dimension.py,Creating Dimensions...,ایجاد ابعاد ...
 apps/erpnext/erpnext/education/doctype/student_group_creation_tool/student_group_creation_tool.py,Student Group Name is mandatory in row {0},دانشجو نام گروه را در ردیف الزامی است {0}
-DocType: Customer Credit Limit,Bypass credit limit_check,دور زدن اعتبار limit_check
 DocType: Homepage,Products to be shown on website homepage,محصولات به صفحه اصلی وب سایت نشان داده می شود
 DocType: HR Settings,Password Policy,خط مشی رمز عبور
 apps/erpnext/erpnext/setup/doctype/customer_group/customer_group.js,This is a root customer group and cannot be edited.,این یک گروه مشتری ریشه است و نمی تواند ویرایش شود.
@@ -4969,6 +4977,7 @@
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py,No {0} found for Inter Company Transactions.,هیچ {0} برای معاملات اینترانت یافت نشد.
 DocType: Travel Itinerary,Rented Car,ماشین اجاره ای
 apps/erpnext/erpnext/public/js/hub/components/profile_dialog.js,About your Company,درباره شرکت شما
+apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.js,Show Stock Ageing Data,نمایش داده های پیری سهام
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py,Credit To account must be a Balance Sheet account,اعتباری به حساب باید یک حساب ترازنامه شود
 DocType: Donor,Donor,اهدا کننده
 DocType: Global Defaults,Disable In Words,غیر فعال کردن در کلمات
@@ -4982,8 +4991,10 @@
 DocType: Patient,Patient ID,شناسه بیمار
 DocType: Practitioner Schedule,Schedule Name,نام برنامه
 DocType: Currency Exchange,For Buying,برای خرید
+apps/erpnext/erpnext/setup/default_energy_point_rules.py,On Purchase Order Submission,در ارسال سفارش خرید
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js,Add All Suppliers,اضافه کردن همه تامین کنندگان
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py,Row #{0}: Allocated Amount cannot be greater than outstanding amount.,ردیف # {0}: مقدار اختصاص داده شده نمی تواند بیشتر از مقدار برجسته.
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Customer &gt; Customer Group &gt; Territory,مشتری&gt; گروه مشتری&gt; سرزمین
 DocType: Tally Migration,Parties,مهمانی ها
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js,Browse BOM,مرور BOM
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py,Secured Loans,وام
@@ -5015,6 +5026,7 @@
 apps/erpnext/erpnext/stock/doctype/item_alternative/item_alternative.py,Not allow to set alternative item for the item {0},اجازه نمیدهد که آیتم جایگزین برای آیتم {0}
 apps/erpnext/erpnext/hr/doctype/leave_block_list/leave_block_list.py,Date is repeated,تاریخ تکرار شده است
 apps/erpnext/erpnext/accounts/print_format/payment_receipt_voucher/payment_receipt_voucher.html,Authorized Signatory,امضای مجاز
+apps/erpnext/erpnext/education/doctype/instructor/instructor.py,Please setup Instructor Naming System in Education &gt; Education Settings,لطفاً سیستم نامگذاری مربی را در آموزش و پرورش&gt; تنظیمات آموزش تنظیم کنید
 apps/erpnext/erpnext/regional/doctype/gstr_3b_report/gstr_3b_report.html,Net ITC Available(A) - (B),ITC خالص موجود (A) - (B)
 apps/erpnext/erpnext/education/doctype/fee_schedule/fee_schedule.js,Create Fees,ایجاد هزینه ها
 DocType: Project,Total Purchase Cost (via Purchase Invoice),هزینه خرید مجموع (از طریق فاکتورخرید )
@@ -5034,6 +5046,7 @@
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.js,Message Sent,پیام های ارسال شده
 apps/erpnext/erpnext/accounts/doctype/account/account.py,Account with child nodes cannot be set as ledger,حساب کاربری با گره فرزند می تواند به عنوان دفتر تنظیم شود
 DocType: C-Form,II,II
+apps/erpnext/erpnext/assets/report/fixed_asset_register/fixed_asset_register.py,Vendor Name,نام فروشنده
 DocType: Quiz Result,Wrong,اشتباه
 DocType: Sales Invoice,Rate at which Price list currency is converted to customer's base currency,سرعت که در آن لیست قیمت ارز به ارز پایه مشتری تبدیل
 DocType: Purchase Invoice Item,Net Amount (Company Currency),مبلغ خالص (شرکت ارز)
@@ -5272,6 +5285,7 @@
 DocType: Stock Settings,Auto Material Request,درخواست مواد خودکار
 DocType: Woocommerce Settings,API consumer secret,مخفف API کاربر
 DocType: Delivery Note Item,Available Batch Qty at From Warehouse,در دسترس تعداد دسته ای در از انبار
+,Received Qty Amount,مقدار Qty دریافت کرد
 DocType: Salary Slip,Gross Pay - Total Deduction - Loan Repayment,دستمزد ناخالص - کسر مجموع - بازپرداخت وام
 DocType: Bank Account,Last Integration Date,تاریخ آخرین ادغام
 DocType: Expense Claim,Expense Taxes and Charges,هزینه مالیات و عوارض
@@ -5723,6 +5737,8 @@
 DocType: Drug Prescription,Hour,ساعت
 DocType: Restaurant Order Entry,Last Sales Invoice,آخرین اسکناس فروش
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py,Please select Qty against item {0},لطفا مقدار در مورد item {0} را انتخاب کنید
+apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py,Latest Age,آخرین سن
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js,Transfer Material to Supplier,انتقال مواد به تامین کننده
 apps/erpnext/erpnext/hr/report/loan_repayment/loan_repayment.py,EMI,EMI
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py,New Serial No cannot have Warehouse. Warehouse must be set by Stock Entry or Purchase Receipt,جدید بدون سریال را می انبار ندارد. انبار باید توسط بورس ورود یا رسید خرید مجموعه
 DocType: Lead,Lead Type,سرب نوع
@@ -5745,7 +5761,6 @@
 apps/erpnext/erpnext/hr/doctype/employee_benefit_application/employee_benefit_application.py,"An amount of {0} already claimed for the component {1},\
 						 set the amount equal or greater than {2}",مقدار {0} که قبلا برای کامپوننت {1} داده شده است، مقدار را برابر یا بیشتر از {2}
 DocType: Shipping Rule,Shipping Rule Conditions,حمل و نقل قانون شرایط
-DocType: Purchase Invoice,Export Type,نوع صادرات
 DocType: Salary Slip Loan,Salary Slip Loan,وام وام لغزش
 DocType: BOM Update Tool,The new BOM after replacement,BOM جدید پس از تعویض
 ,Point of Sale,نقطه ای از فروش
@@ -5862,7 +5877,6 @@
 DocType: Purchase Order Item,Blanket Order Rate,نرخ سفارش قالب
 ,Customer Ledger Summary,خلاصه لجر مشتری
 apps/erpnext/erpnext/hooks.py,Certification,صدور گواهینامه
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js,Are you sure you want to make debit note?,آیا مطمئن هستید که می خواهید یادداشت بدهی بگیرید؟
 DocType: Bank Guarantee,Clauses and Conditions,مقررات و شرایط
 DocType: Serial No,Creation Document Type,ایجاد نوع سند
 DocType: Amazon MWS Settings,ES,ES
@@ -5900,8 +5914,6 @@
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py,Financial Services,خدمات مالی
 DocType: Student Sibling,Student ID,ID دانش آموز
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.js,For Quantity must be greater than zero,برای مقدار باید بیشتر از صفر باشد
-apps/erpnext/erpnext/hr/doctype/employee_transfer/employee_transfer.py,"Please delete the Employee <a href=""#Form/Employee/{0}"">{0}</a>\
-					to cancel this document","لطفاً برای لغو این سند ، <a href=""#Form/Employee/{0}"">{0}</a> \ کارمند را حذف کنید"
 apps/erpnext/erpnext/config/projects.py,Types of activities for Time Logs,نوع فعالیت برای سیاهههای مربوط زمان
 DocType: Opening Invoice Creation Tool,Sales,فروش
 DocType: Stock Entry Detail,Basic Amount,مقدار اولیه
@@ -5980,6 +5992,7 @@
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py,Print and Stationery,چاپ و لوازم التحریر
 DocType: Stock Settings,Show Barcode Field,نمایش بارکد درست
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js,Send Supplier Emails,ارسال ایمیل کننده
+DocType: Asset Movement,ACC-ASM-.YYYY.-,ACC-ASM-.YYY.-
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py,"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,خودکار ایجاد شده است
 apps/erpnext/erpnext/hr/doctype/employee_onboarding/employee_onboarding.py,Submit this to create the Employee record,این را برای ایجاد رکورد کارمند ارسال کنید
@@ -6056,7 +6069,6 @@
 DocType: Sales Team,Contact No.,تماس با شماره
 apps/erpnext/erpnext/templates/includes/cart/cart_address.html,Billing Address is same as Shipping Address,آدرس صورتحساب همان آدرس حمل و نقل است
 DocType: Bank Reconciliation,Payment Entries,مطالب پرداخت
-apps/erpnext/erpnext/erpnext_integrations/doctype/shopify_settings/shopify_settings.py,Access token or Shopify URL missing,برچسب دسترسی یا Shopify URL گم شده است
 DocType: Location,Latitude,عرض جغرافیایی
 DocType: Work Order,Scrap Warehouse,انبار ضایعات
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py,"Warehouse required at Row No {0}, please set default warehouse for the item {1} for the company {2}",انبار مورد نیاز در ردیف بدون {0}، لطفا برای انبار {1} برای شرکت {2}
@@ -6099,7 +6111,6 @@
 DocType: Job Offer Term,Value / Description,ارزش / توضیحات
 apps/erpnext/erpnext/controllers/accounts_controller.py,"Row #{0}: Asset {1} cannot be submitted, it is already {2}",ردیف # {0}: دارایی {1} نمی تواند ارائه شود، آن است که در حال حاضر {2}
 DocType: Tax Rule,Billing Country,کشور صدور صورت حساب
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js,Are you sure you want to make credit note?,آیا مطمئن هستید که می خواهید یادداشت کنید؟
 DocType: Purchase Order Item,Expected Delivery Date,انتظار می رود تاریخ تحویل
 DocType: Restaurant Order Entry,Restaurant Order Entry,ورود به رستوران
 apps/erpnext/erpnext/accounts/general_ledger.py,Debit and Credit not equal for {0} #{1}. Difference is {2}.,بدهی و اعتباری برای {0} # برابر نیست {1}. تفاوت در این است {2}.
@@ -6222,6 +6233,7 @@
 DocType: Purchase Invoice,Taxes and Charges Added,مالیات و هزینه اضافه شده
 apps/erpnext/erpnext/assets/doctype/asset/asset.py,Depreciation Row {0}: Next Depreciation Date cannot be before Available-for-use Date,مقدار خسارت ردیف {0}: تاریخ بعد از انهدام بعدی قبل از موجود بودن برای تاریخ استفاده نمی شود
 ,Sales Funnel,قیف فروش
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Item Code &gt; Item Group &gt; Brand,کد کالا&gt; گروه مورد&gt; نام تجاری
 apps/erpnext/erpnext/setup/doctype/company/company.py,Abbreviation is mandatory,مخفف الزامی است
 DocType: Project,Task Progress,وظیفه پیشرفت
 apps/erpnext/erpnext/templates/includes/navbar/navbar_items.html,Cart,گاری
@@ -6462,6 +6474,7 @@
 DocType: Employee Grade,Employee Grade,درجه کارمند
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py,Piecework,کار از روی مقاطعه
 DocType: GSTR 3B Report,June,ژوئن
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Supplier &gt; Supplier Type,عرضه کننده&gt; نوع عرضه کننده
 DocType: Share Balance,From No,از شماره
 DocType: Shift Type,Early Exit Grace Period,زودرس دوره گریس
 DocType: Task,Actual Time (in Hours),زمان واقعی (در ساعت)
@@ -6931,6 +6944,7 @@
 DocType: Quality Inspection Reading,Quality Inspection Reading,خواندن بازرسی کیفیت
 apps/erpnext/erpnext/stock/doctype/stock_settings/stock_settings.py,`Freeze Stocks Older Than` should be smaller than %d days.,`سهام منجمد قدیمی تر از` باید کوچکتر از %d روز باشد.
 DocType: Tax Rule,Purchase Tax Template,خرید قالب مالیات
+apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py,Earliest Age,زودرس ترین سن
 apps/erpnext/erpnext/utilities/user_progress.py,Set a sales goal you'd like to achieve for your company.,یک هدف فروش که میخواهید برای شرکتتان به دست آورید، تنظیم کنید.
 DocType: Quality Goal,Revision,تجدید نظر
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js,Healthcare Services,خدمات بهداشتی
@@ -6974,6 +6988,7 @@
 apps/erpnext/erpnext/healthcare/doctype/patient_encounter/patient_encounter.js,Schedule Discharge,تخلیه برنامه
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py,Cheques and Deposits incorrectly cleared,چک و واریز وجه به اشتباه پاک
 DocType: Homepage Section Card,Homepage Section Card,کارت بخش صفحه
+,Amount To Be Billed,مبلغ صورتحساب
 apps/erpnext/erpnext/accounts/doctype/account/account.py,Account {0}: You can not assign itself as parent account,حساب {0}: شما نمی توانید خود را به عنوان پدر و مادر اختصاص حساب
 DocType: Purchase Invoice Item,Price List Rate,لیست قیمت نرخ
 apps/erpnext/erpnext/utilities/activation.py,Create customer quotes,درست به نقل از مشتری
@@ -7026,6 +7041,7 @@
 DocType: Supplier Scorecard Criteria,Supplier Scorecard Criteria,معیارهای کارت امتیازی تامین کننده
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py,Please select Start Date and End Date for Item {0},لطفا تاریخ شروع و پایان تاریخ برای مورد را انتخاب کنید {0}
 DocType: Maintenance Schedule,MAT-MSH-.YYYY.-,MAT-MSH- .YYYY.-
+,Amount to Receive,مبلغ دریافت
 apps/erpnext/erpnext/education/doctype/student_group_creation_tool/student_group_creation_tool.py,Course is mandatory in row {0},البته در ردیف الزامی است {0}
 apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py,From date can not be greater than than To date,از تاریخ نمی تواند بیشتر از به روز باشد
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py,To date cannot be before from date,تا به امروز نمی تواند قبل از از تاریخ
@@ -7473,6 +7489,7 @@
 DocType: Delivery Note,Print Without Amount,چاپ بدون مقدار
 apps/erpnext/erpnext/accounts/report/asset_depreciation_ledger/asset_depreciation_ledger.py,Depreciation Date,تاریخ استهلاک
 ,Work Orders in Progress,دستور کار در حال پیشرفت است
+DocType: Customer Credit Limit,Bypass Credit Limit Check,بررسی محدودیت اعتبار دور زدن
 DocType: Issue,Support Team,تیم پشتیبانی
 apps/erpnext/erpnext/stock/report/batch_item_expiry_status/batch_item_expiry_status.py,Expiry (In Days),انقضاء (روز)
 DocType: Appraisal,Total Score (Out of 5),نمره کل (از 5)
@@ -7654,6 +7671,7 @@
 DocType: Sales Invoice,Customer GSTIN,GSTIN و ضوابط
 DocType: Crop Cycle,List of diseases detected on the field. When selected it'll automatically add a list of tasks to deal with the disease ,فهرست بیماری های شناسایی شده در زمینه هنگامی که انتخاب می شود، به طور خودکار یک لیست از وظایف برای مقابله با بیماری را اضافه می کند
 apps/erpnext/erpnext/manufacturing/page/bom_comparison_tool/bom_comparison_tool.js,BOM 1,BOM 1
+apps/erpnext/erpnext/assets/report/fixed_asset_register/fixed_asset_register.py,Asset Id,دارایی شناسه
 apps/erpnext/erpnext/healthcare/doctype/healthcare_service_unit/healthcare_service_unit.js,This is a root healthcare service unit and cannot be edited.,این واحد مراقبت های بهداشتی ریشه است و نمی تواند ویرایش شود.
 DocType: Asset Repair,Repair Status,وضعیت تعمیر
 apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.js,"Requested Qty: Quantity requested for purchase, but not ordered.",درخواست مقدار: مقدار درخواست شده برای خرید ، اما سفارش داده نشده است.
diff --git a/erpnext/translations/fi.csv b/erpnext/translations/fi.csv
index af5cae6..44f898e 100644
--- a/erpnext/translations/fi.csv
+++ b/erpnext/translations/fi.csv
@@ -289,7 +289,6 @@
 DocType: Loan,Repay Over Number of Periods,Repay Yli Kausien määrä
 apps/erpnext/erpnext/manufacturing/report/bom_stock_report/bom_stock_report.py,Quantity to Produce can not be less than Zero,Tuotettava määrä ei voi olla pienempi kuin nolla
 DocType: Stock Entry,Additional Costs,Lisäkustannukset
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Customer &gt; Customer Group &gt; Territory,Asiakas&gt; Asiakasryhmä&gt; Alue
 apps/erpnext/erpnext/accounts/doctype/account/account.py,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
@@ -586,6 +585,7 @@
 DocType: Healthcare Settings,Create documents for sample collection,Luo asiakirjat näytteiden keräämiseksi
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py,Payment against {0} {1} cannot be greater than Outstanding Amount {2},Maksu vastaan {0} {1} ei voi olla suurempi kuin jäljellä {2}
 apps/erpnext/erpnext/patches/v11_0/add_healthcare_service_unit_tree_root.py,All Healthcare Service Units,Kaikki terveydenhuollon palveluyksiköt
+apps/erpnext/erpnext/setup/default_energy_point_rules.py,On Converting Opportunity,Mahdollisuuden muuntamisesta
 DocType: Bank Account,Address HTML,osoite HTML
 DocType: Lead,Mobile No.,Matkapuhelin
 apps/erpnext/erpnext/selling/doctype/pos_closing_voucher/closing_voucher_details.html,Mode of Payments,Maksutapa
@@ -650,7 +650,6 @@
 DocType: Accounting Dimension,Dimension Name,Ulottuvuuden nimi
 apps/erpnext/erpnext/healthcare/setup.py,Resistant,kestävä
 apps/erpnext/erpnext/hotels/doctype/hotel_room_reservation/hotel_room_reservation.py,Please set Hotel Room Rate on {},Aseta hotellihuoneen hinta {}
-apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py,Please setup numbering series for Attendance via Setup &gt; Numbering Series,Asenna läsnäolosuhteiden numerointisarjat kohdasta Asetukset&gt; Numerointisarjat
 DocType: Journal Entry,Multi Currency,Multi Valuutta
 DocType: Bank Statement Transaction Invoice Item,Invoice Type,lasku tyyppi
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py,Valid from date must be less than valid upto date,Voimassa päivämäärästä tulee olla vähemmän kuin voimassa oleva päivityspäivä
@@ -765,6 +764,7 @@
 apps/erpnext/erpnext/accounts/page/pos/pos.js,Create a new Customer,Luo uusi asiakas
 apps/erpnext/erpnext/non_profit/report/expiring_memberships/expiring_memberships.py,Expiring On,Vanheneminen
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,"If multiple Pricing Rules continue to prevail, users are asked to set Priority manually to resolve conflict.",mikäli useampi hinnoittelu sääntö jatkaa vaikuttamista käyttäjäjiä pyydetään asettamaan prioriteetti manuaalisesti ristiriidan ratkaisemiseksi
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js,Purchase Return,Osto Return
 apps/erpnext/erpnext/utilities/activation.py,Create Purchase Orders,Luo ostotilaukset
 ,Purchase Register,Osto Rekisteröidy
 apps/erpnext/erpnext/healthcare/doctype/patient/patient.py,Patient not found,Potilasta ei löydy
@@ -780,7 +780,6 @@
 DocType: Location,Area UOM,Alue UOM
 apps/erpnext/erpnext/manufacturing/doctype/workstation/workstation.py,Workstation is closed on the following dates as per Holiday List: {0},Työasema on suljettu seuraavina päivinä lomapäivien {0} mukaan
 apps/erpnext/erpnext/selling/page/sales_funnel/sales_funnel.py,Opportunities,Mahdollisuudet
-apps/erpnext/erpnext/www/all-products/index.html,Clear filters,Tyhjennä suodattimet
 DocType: Lab Test Template,Single,Yksittäinen
 DocType: Compensatory Leave Request,Work From Date,Työskentely päivämäärästä
 DocType: Salary Slip,Total Loan Repayment,Yhteensä Lainan takaisinmaksu
@@ -823,6 +822,7 @@
 DocType: Account,Old Parent,Vanha Parent
 apps/erpnext/erpnext/education/doctype/program_enrollment_tool/program_enrollment_tool.py,Mandatory field - Academic Year,Pakollinen kenttä - Lukuvuosi
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py,{0} {1} is not associated with {2} {3},{0} {1} ei ole liitetty {2} {3}
+DocType: Opportunity,Converted By,Muuntaja
 apps/erpnext/erpnext/public/js/hub/components/ReviewArea.vue,You need to login as a Marketplace User before you can add any reviews.,Sinun on kirjauduttava sisään Marketplace-käyttäjänä ennen kuin voit lisätä arvosteluja.
 apps/erpnext/erpnext/manufacturing/doctype/job_card/job_card.py,Row {0} : Operation is required against the raw material item {1},Rivi {0}: Käyttöä tarvitaan raaka-aineen {1}
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py,Please set default payable account for the company {0},Aseta oletus maksettava osuus yhtiön {0}
@@ -848,6 +848,8 @@
 DocType: BOM,Work Order,Työjärjestys
 DocType: Sales Invoice,Total Qty,yksikkömäärä yhteensä
 apps/erpnext/erpnext/education/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py,Guardian2 Email ID,Guardian2 -sähköpostitunnus
+apps/erpnext/erpnext/hr/doctype/employee_transfer/employee_transfer.py,"Please delete the Employee <a href=""#Form/Employee/{0}"">{0}</a>\
+					to cancel this document","Poista työntekijä <a href=""#Form/Employee/{0}"">{0}</a> \ peruuttaaksesi tämän asiakirjan"
 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
@@ -907,7 +909,6 @@
 DocType: Codification Table,Codification Table,Kodifiointitaulukko
 DocType: Timesheet Detail,Hrs,hrs
 apps/erpnext/erpnext/manufacturing/page/bom_comparison_tool/bom_comparison_tool.js,Changes in {0},Muutokset {0}
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js,Please select Company,Ole hyvä ja valitse Company
 DocType: Employee Skill,Employee Skill,Työntekijän taito
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.js,Difference Account,Erotuksen tili
 DocType: Pricing Rule,Discount on Other Item,Alennus muista tuotteista
@@ -975,6 +976,7 @@
 DocType: BOM,Operating Cost,Käyttökustannus
 DocType: Crop,Produced Items,Tuotteita
 DocType: Bank Statement Transaction Entry,Match Transaction to Invoices,Sovita tapahtumia laskuihin
+apps/erpnext/erpnext/erpnext_integrations/exotel_integration.py,Error in Exotel incoming call,Virhe Exotel-puhelun yhteydessä
 DocType: Sales Order Item,Gross Profit,bruttovoitto
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js,Unblock Invoice,Poista lasku
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py,Increment cannot be 0,Lisäys voi olla 0
@@ -1188,6 +1190,7 @@
 DocType: Activity Cost,Activity Type,työtehtävä
 DocType: Request for Quotation,For individual supplier,Yksittäisten toimittaja
 DocType: BOM Operation,Base Hour Rate(Company Currency),Base Hour Rate (Company valuutta)
+,Qty To Be Billed,Määrä laskutettavaksi
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py,Delivered Amount,toimitettu
 apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.js,Reserved Qty for Production: Raw materials quantity to make manufacturing items.,Varattu tuotantomäärä: Raaka-aineiden määrä valmistustuotteiden valmistamiseksi.
 DocType: Loyalty Point Entry Redemption,Redemption Date,Lunastuspäivä
@@ -1306,7 +1309,7 @@
 DocType: Sales Invoice,Commission Rate (%),provisio (%)
 apps/erpnext/erpnext/education/doctype/student_group/student_group.py,Please select Program,Valitse ohjelma
 DocType: Project,Estimated Cost,Kustannusarvio
-DocType: Request for Quotation,Link to material requests,Kohdista hankintapyyntöön
+DocType: Supplier Quotation,Link to material requests,Kohdista hankintapyyntöön
 apps/erpnext/erpnext/public/js/hub/pages/Publish.vue,Publish,Julkaista
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py,Aerospace,ilmakehä
 ,Fichier des Ecritures Comptables [FEC],Fichier des Ecritures Comptables [FEC]
@@ -1319,6 +1322,7 @@
 apps/erpnext/erpnext/utilities/transaction_base.py,Invalid Posting Time,Virheellinen lähetysaika
 DocType: Salary Component,Condition and Formula,Ehto ja kaava
 DocType: Lead,Campaign Name,Kampanjan nimi
+apps/erpnext/erpnext/setup/default_energy_point_rules.py,On Task Completion,Tehtävän suorittamisessa
 apps/erpnext/erpnext/hr/doctype/compensatory_leave_request/compensatory_leave_request.py,There is no leave period in between {0} and {1},Ei jätäjaksoa välillä {0} ja {1}
 DocType: Fee Validity,Healthcare Practitioner,Terveydenhuollon harjoittaja
 DocType: Hotel Room,Capacity,kapasiteetti
@@ -1663,7 +1667,6 @@
 DocType: Quality Feedback Template,Quality Feedback Template,Laadun palautteen malli
 apps/erpnext/erpnext/config/education.py,LMS Activity,LMS-toiminta
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py,Internet Publishing,internet julkaisu
-DocType: Prescription Duration,Number,Määrä
 apps/erpnext/erpnext/accounts/doctype/opening_invoice_creation_tool/opening_invoice_creation_tool.js,Creating {0} Invoice,Luo {0} lasku
 DocType: Medical Code,Medical Code Standard,Medical Code Standard
 DocType: Soil Texture,Clay Composition (%),Savi koostumus (%)
@@ -1738,6 +1741,7 @@
 DocType: Support Settings,Get Started Sections,Aloita osia
 DocType: Lead,CRM-LEAD-.YYYY.-,CRM-lyijy-.YYYY.-
 DocType: Invoice Discounting,Sanctioned,seuraamuksia
+,Base Amount,Perusmäärä
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.js,Total Contribution Amount: {0},Osuuden kokonaismäärä: {0}
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py,Row #{0}: Please specify Serial No for Item {1},Rivi # {0}: Ilmoittakaa Sarjanumero alamomentin {1}
 DocType: Payroll Entry,Salary Slips Submitted,Palkkionsiirto lähetetty
@@ -1955,6 +1959,7 @@
 apps/erpnext/erpnext/utilities/user_progress.py,List a few of your suppliers. They could be organizations or individuals.,Luettele joitain toimittajiasi. Ne voivat olla organisaatioita tai yksilöitä.
 DocType: Accounting Dimension,Dimension Defaults,Mitat oletusarvot
 apps/erpnext/erpnext/crm/report/prospects_engaged_but_not_converted/prospects_engaged_but_not_converted.js,Minimum Lead Age (Days),Pienin Lyijy ikä (päivää)
+apps/erpnext/erpnext/assets/report/fixed_asset_register/fixed_asset_register.py,Available For Use Date,Käytettävissä päivämäärä
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py,All BOMs,kaikki BOMs
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js,Create Inter Company Journal Entry,Luo yrityksen välinen päiväkirjakirjaus
 DocType: Company,Parent Company,Emoyhtiö
@@ -2019,6 +2024,7 @@
 ,IRS 1099,IRS 1099
 DocType: Salary Slip,Leave Without Pay,Palkaton vapaa
 DocType: Payment Request,Outward,Ulospäin
+apps/erpnext/erpnext/setup/default_energy_point_rules.py,On {0} Creation,Luonnissa {0}
 apps/erpnext/erpnext/regional/doctype/gstr_3b_report/gstr_3b_report.html,State/UT Tax,Valtion / UT vero
 ,Trial Balance for Party,Alustava tase osapuolelle
 ,Gross and Net Profit Report,Brutto- ja nettotulosraportti
@@ -2134,6 +2140,7 @@
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js,Make Stock Entry,Tee osakemerkintä
 DocType: Hotel Room Reservation,Hotel Reservation User,Hotellin varaus käyttäjä
 apps/erpnext/erpnext/projects/doctype/project/project.js,Set Status,Aseta tila
+apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py,Please setup numbering series for Attendance via Setup &gt; Numbering Series,Asenna läsnäolosuhteiden numerointisarjat kohdasta Asetukset&gt; Numerointisarjat
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py,Please select prefix first,Ole hyvä ja valitse etuliite ensin
 DocType: Contract,Fulfilment Deadline,Täytäntöönpanon määräaika
 apps/erpnext/erpnext/public/js/hub/pages/Home.vue,Near you,Lähellä sinua
@@ -2149,6 +2156,7 @@
 DocType: Announcement,All Students,kaikki opiskelijat
 apps/erpnext/erpnext/assets/doctype/asset/asset.py,Item {0} must be a non-stock item,Nimike {0} ei saa olla varastonimike
 apps/erpnext/erpnext/stock/doctype/batch/batch.js,View Ledger,Näytä tilikirja
+DocType: Cost Center,Lft,Lft
 DocType: Grading Scale,Intervals,väliajoin
 DocType: Bank Statement Transaction Entry,Reconciled Transactions,Yhdistetyt tapahtumat
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py,Earliest,aikaisintaan
@@ -2264,6 +2272,7 @@
 apps/erpnext/erpnext/hr/doctype/employee_benefit_application/employee_benefit_application.py,As per your assigned Salary Structure you cannot apply for benefits,Etkä voi hakea etuja palkkaneuvon mukaan
 apps/erpnext/erpnext/stock/doctype/item/item.py,Website Image should be a public file or website URL,Sivuston kuvan tulee olla kuvatiedosto tai kuvan URL-osoite
 DocType: Purchase Invoice Item,BOM,BOM
+apps/erpnext/erpnext/stock/doctype/item/item.py,Duplicate entry in Manufacturers table,Päällekkäinen merkintä Valmistajat-taulukossa
 apps/erpnext/erpnext/setup/doctype/item_group/item_group.js,This is a root item group and cannot be edited.,Tämä on kantatuoteryhmä eikä sitä voi muokata
 apps/erpnext/erpnext/accounts/doctype/account/account.js,Merge,Yhdistää
 DocType: Journal Entry Account,Purchase Order,Ostotilaus
@@ -2408,7 +2417,6 @@
 DocType: Asset,Depreciation Schedules,Poistot aikataulut
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.js,Create Sales Invoice,Luo myyntilasku
 apps/erpnext/erpnext/regional/doctype/gstr_3b_report/gstr_3b_report.html,Ineligible ITC,Kelpaamaton ITC
-apps/erpnext/erpnext/erpnext_integrations/doctype/shopify_settings/shopify_settings.py,"Support for public app is deprecated. Please setup private app, for more details refer user manual","Julkisen sovelluksen tuki on vanhentunut. Aseta yksityinen sovellus, lisätietoja saat käyttöoppaasta"
 DocType: Task,Dependent Tasks,Riippuvat tehtävät
 apps/erpnext/erpnext/regional/report/gstr_1/gstr_1.py,Following accounts might be selected in GST Settings:,Seuraavat tilit voidaan valita GST-asetuksissa:
 apps/erpnext/erpnext/manufacturing/report/bom_stock_report/bom_stock_report.js,Quantity to Produce,Tuotettava määrä
@@ -2660,6 +2668,7 @@
 DocType: Water Analysis,Container,kontti
 apps/erpnext/erpnext/regional/report/gstr_1/gstr_1.py,Please set valid GSTIN No. in Company Address,Aseta voimassa oleva GSTIN-numero yrityksen osoitteeseen
 apps/erpnext/erpnext/education/utils.py,Student {0} - {1} appears Multiple times in row {2} & {3},Opiskelija {0} - {1} näkyy Useita kertoja peräkkäin {2} ja {3}
+apps/erpnext/erpnext/selling/doctype/customer/customer.py,Following fields are mandatory to create address:,Seuraavat kentät ovat pakollisia osoitteen luomiseen:
 DocType: Item Alternative,Two-way,Kaksisuuntainen
 DocType: Item,Manufacturers,valmistajat
 apps/erpnext/erpnext/accounts/deferred_revenue.py,Error while processing deferred accounting for {0},Virhe {0} laskennallisen kirjanpidon käsittelyssä
@@ -2734,9 +2743,9 @@
 DocType: Employee,HR-EMP-,HR-EMP
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py,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: Quality Meeting Minutes,Quality Meeting Minutes,Laatukokouksen pöytäkirjat
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Supplier &gt; Supplier Type,Toimittaja&gt; Toimittajan tyyppi
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py,Employee Referral,Työntekijäviittaus
 DocType: Student Group,Set 0 for no limit,Aseta 0 ei rajaa
+DocType: Cost Center,rgt,Rgt
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py,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."
 DocType: Customer,Primary Address and Contact Detail,Ensisijainen osoite ja yhteystiedot
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.js,Resend Payment Email,Lähettää maksu Sähköposti
@@ -2846,7 +2855,6 @@
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py,Against Supplier Invoice {0} dated {1},toimittajan ostolaskun kohdistus {0} päiväys {1}
 DocType: Customer,Default Price List,oletus hinnasto
 apps/erpnext/erpnext/assets/doctype/asset/asset.py,Asset Movement record {0} created,Asset Movement record {0} luotu
-apps/erpnext/erpnext/utilities/page/leaderboard/leaderboard.js,No items found.,Kohteita ei löytynyt.
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py,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.
 DocType: Share Transfer,Equity/Liability Account,Oma pääoma / vastuu
 apps/erpnext/erpnext/setup/doctype/customer_group/customer_group.py,A customer with the same name already exists,Samanniminen asiakas on jo olemassa
@@ -2862,6 +2870,7 @@
 apps/erpnext/erpnext/selling/doctype/customer/customer.py,Credit limit has been crossed for customer {0} ({1}/{2}),Luottoraja on ylitetty asiakkaalle {0} ({1} / {2})
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py,Customer required for 'Customerwise Discount',asiakkaalla tulee olla 'asiakaskohtainen alennus'
 apps/erpnext/erpnext/config/accounting.py,Update bank payment dates with journals.,Päivitä pankin maksupäivät päiväkirjojen kanssa
+,Billed Qty,Laskutettu määrä
 apps/erpnext/erpnext/stock/doctype/item/item_dashboard.py,Pricing,Hinnoittelu
 DocType: Employee,Attendance Device ID (Biometric/RF tag ID),Läsnäololaitetunnus (Biometrinen / RF-tunniste)
 DocType: Quotation,Term Details,Ehdon lisätiedot
@@ -2883,6 +2892,7 @@
 DocType: Share Transfer,Asset Account,Omaisuuden tili
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js,New release date should be in the future,Uuden julkaisupäivän pitäisi olla tulevaisuudessa
 DocType: Purchase Invoice,End date of current invoice's period,nykyisen laskukauden päättymispäivä
+apps/erpnext/erpnext/hr/doctype/employee/employee.py,Please setup Employee Naming System in Human Resource &gt; HR Settings,Asenna Työntekijöiden nimeämisjärjestelmä kohtaan Henkilöstöresurssit&gt; HR-asetukset
 DocType: Lab Test,Technician Name,Tekniikan nimi
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py,"Cannot ensure delivery by Serial No as \
 					Item {0} is added with and without Ensure Delivery by \
@@ -2890,6 +2900,7 @@
 DocType: Accounts Settings,Unlink Payment on Cancellation of Invoice,Linkityksen Maksu mitätöinti Lasku
 DocType: Bank Reconciliation,From Date,Päivästä
 apps/erpnext/erpnext/hr/doctype/vehicle_log/vehicle_log.py,Current Odometer reading entered should be greater than initial Vehicle Odometer {0},Matkamittarin lukema merkitään pitäisi olla suurempi kuin alkuperäisen ajoneuvon matkamittarin {0}
+,Purchase Order Items To Be Received or Billed,"Ostotilaustuotteet, jotka vastaanotetaan tai laskutetaan"
 DocType: Restaurant Reservation,No Show,Ei näytä
 apps/erpnext/erpnext/regional/india/utils.py,You must be a registered supplier to generate e-Way Bill,Sinun on oltava rekisteröity toimittaja luodaksesi e-Way Bill
 DocType: Shipping Rule Country,Shipping Rule Country,Toimitustavan maa
@@ -2932,6 +2943,7 @@
 apps/erpnext/erpnext/templates/generators/item/item_add_to_cart.html,View in Cart,View Cart
 DocType: Employee Checkin,Shift Actual Start,Vaihto todellinen aloitus
 DocType: Tally Migration,Is Day Book Data Imported,Onko päiväkirjan tietoja tuotu
+,Purchase Order Items To Be Received or Billed1,"Ostotilaustuotteet, jotka vastaanotetaan tai laskutetaan1"
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py,Marketing Expenses,Markkinointikustannukset
 apps/erpnext/erpnext/stock/doctype/pick_list/pick_list.py,{0} units of {1} is not available.,{0} yksikköä {1} ei ole käytettävissä.
 ,Item Shortage Report,Tuotevajausraportti
@@ -3156,7 +3168,6 @@
 apps/erpnext/erpnext/public/js/call_popup/call_popup.js,View all issues from {0},Näytä kaikki aiheen {0} aiheet
 DocType: Quality Inspection,MAT-QA-.YYYY.-,MAT-QA-.YYYY.-
 DocType: Quality Meeting Table,Quality Meeting Table,Laadukas kokouspöytä
-apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,Aseta Naming-sarjan asetukseksi {0} Asetukset&gt; Asetukset&gt; Sarjojen nimeäminen -kohdassa
 apps/erpnext/erpnext/templates/pages/help.html,Visit the forums,Käy foorumeilla
 DocType: Student,Student Mobile Number,Student Mobile Number
 DocType: Item,Has Variants,useita tuotemalleja
@@ -3298,6 +3309,7 @@
 DocType: Homepage Section,Section Cards,Leikkauskortit
 ,Campaign Efficiency,Kampanjan tehokkuus
 DocType: Discussion,Discussion,keskustelu
+apps/erpnext/erpnext/setup/default_energy_point_rules.py,On Sales Order Submission,Myyntitilausten toimittaminen
 DocType: Bank Transaction,Transaction ID,Transaction ID
 DocType: Payroll Entry,Deduct Tax For Unsubmitted Tax Exemption Proof,"Vähennettävä vero, joka ei ole lähetetty verovapautustodistukseksi"
 DocType: Volunteer,Anytime,Milloin tahansa
@@ -3305,7 +3317,6 @@
 DocType: Employee Tax Exemption Proof Submission,Employee Tax Exemption Proof Submission,Työntekijöiden verovapautusta koskeva todistus
 DocType: Patient,Surgical History,Kirurginen historia
 DocType: Bank Statement Settings Item,Mapped Header,Mapped Header
-apps/erpnext/erpnext/hr/doctype/employee/employee.py,Please setup Employee Naming System in Human Resource &gt; HR Settings,Asenna Työntekijöiden nimeämisjärjestelmä kohtaan Henkilöstöresurssit&gt; HR-asetukset
 DocType: Employee,Resignation Letter Date,Eropyynnön päivämäärä
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Pricing Rules are further filtered based on quantity.,Hinnoittelusäännöt on suodatettu määrän mukaan
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py,Please set the Date Of Joining for employee {0},Aseta jolloin se liittyy työntekijöiden {0}
@@ -3319,6 +3330,7 @@
 DocType: Bank Statement Settings,Mapped Items,Karttuneet kohteet
 DocType: Amazon MWS Settings,IT,SE
 DocType: Chapter,Chapter,luku
+,Fixed Asset Register,Kiinteän omaisuuden rekisteri
 apps/erpnext/erpnext/utilities/user_progress.py,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,Select BOM and Qty for Production,Valitse BOM ja Määrä Tuotannon
@@ -3454,7 +3466,6 @@
 apps/erpnext/erpnext/templates/emails/reorder_item.html,Following Material Requests have been raised automatically based on Item's re-order level,Seuraavat hankintapyynnöt luotu tilauspisteen mukaisesti
 apps/erpnext/erpnext/controllers/accounts_controller.py,Account {0} is invalid. Account Currency must be {1},Tili {0} ei kelpaa. Tilin valuutan on oltava {1}
 apps/erpnext/erpnext/hr/doctype/salary_structure_assignment/salary_structure_assignment.py,From Date {0} cannot be after employee's relieving Date {1},"Päivämäärästä {0} ei voi olla, kun työntekijän vapauttaminen päivämäärä {1}"
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py,Debit Note {0} has been created automatically,Veloitushuomautus {0} on luotu automaattisesti
 apps/erpnext/erpnext/accounts/doctype/payment_order/payment_order.js,Create Payment Entries,Luo maksumerkinnät
 DocType: Supplier,Is Internal Supplier,Onko sisäinen toimittaja
 DocType: Employee,Create User Permission,Luo käyttöoikeus
@@ -4013,7 +4024,6 @@
 DocType: Project User,Project Status,Projektin tila
 DocType: UOM,Check this to disallow fractions. (for Nos),täppää ellet halua murtolukuja (Nos:iin)
 DocType: Student Admission Program,Naming Series (for Student Applicant),Nimeäminen Series (opiskelija Hakija)
-apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.py,UOM Conversion factor ({0} -&gt; {1}) not found for item: {2},UOM-muuntokerrointa ({0} -&gt; {1}) ei löydy tuotteelle: {2}
 apps/erpnext/erpnext/hr/doctype/retention_bonus/retention_bonus.py,Bonus Payment Date cannot be a past date,Bonuspalkkioaika ei voi olla aikaisempi päivämäärä
 DocType: Travel Request,Copy of Invitation/Announcement,Kopio kutsusta / ilmoituksesta
 DocType: Practitioner Service Unit Schedule,Practitioner Service Unit Schedule,Harjoittelijan yksikön aikataulu
@@ -4161,6 +4171,7 @@
 apps/erpnext/erpnext/utilities/user_progress.py,Setup Company,Setup Company
 ,Lab Test Report,Lab Test Report
 DocType: Employee Benefit Application,Employee Benefit Application,Työntekijän etuuskohtelu
+apps/erpnext/erpnext/accounts/doctype/invoice_discounting/invoice_discounting.py,Row({0}): {1} is already discounted in {2},Rivi ({0}): {1} on jo alennettu hintaan {2}
 apps/erpnext/erpnext/hr/doctype/additional_salary/additional_salary.py,Additional Salary Component Exists.,Lisäpalkkakomponentti on olemassa.
 DocType: Purchase Invoice,Unregistered,rekisteröimätön
 DocType: Student Applicant,Application Date,Hakupäivämäärä
@@ -4239,7 +4250,6 @@
 DocType: Journal Entry,Accounting Entries,"kirjanpito, kirjaukset"
 DocType: Job Card Time Log,Job Card Time Log,Työkortin aikaloki
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,"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."
-apps/erpnext/erpnext/education/doctype/instructor/instructor.py,Please setup Instructor Naming System in Education &gt; Education Settings,Asenna ohjaajien nimeämisjärjestelmä kohtaan Koulutus&gt; Koulutusasetukset
 DocType: Journal Entry,Paid Loan,Maksettu laina
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py,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ä
@@ -4256,7 +4266,6 @@
 apps/erpnext/erpnext/templates/pages/projects.html,No time sheets,Ei aikaa arkkia
 DocType: GoCardless Mandate,GoCardless Customer,GoCardless-asiakas
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py,Leave Type {0} cannot be carry-forwarded,{0} -tyyppistä vapaata ei voi siirtää eteenpäin
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Item Code &gt; Item Group &gt; Brand,Tuotekoodi&gt; Tuoteryhmä&gt; Tuotemerkki
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py,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
 DocType: Leave Encashment,Payroll,Palkanmaksu
@@ -4371,7 +4380,6 @@
 DocType: Stock Ledger Entry,Actual Qty After Transaction,todellinen yksikkömäärä tapahtuman jälkeen
 ,Pending SO Items For Purchase Request,"Ostettavat pyyntö, odottavat myyntitilaukset"
 apps/erpnext/erpnext/education/doctype/student_admission/student_admission.py,Student Admissions,Opiskelijavalinta
-apps/erpnext/erpnext/accounts/party.py,{0} {1} is disabled,{0} {1} on poistettu käytöstä
 DocType: Supplier,Billing Currency,Laskutus Valuutta
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py,Extra Large,erittäin suuri
 DocType: Loan,Loan Application,Lainahakemus
@@ -4448,7 +4456,6 @@
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py,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/accounts/doctype/accounting_dimension/accounting_dimension.py,Creating Dimensions...,Luodaan ulottuvuuksia ...
 apps/erpnext/erpnext/education/doctype/student_group_creation_tool/student_group_creation_tool.py,Student Group Name is mandatory in row {0},Opiskelija Ryhmän nimi on pakollinen rivin {0}
-DocType: Customer Credit Limit,Bypass credit limit_check,Ohita luottolimiitti
 DocType: Homepage,Products to be shown on website homepage,Verkkosivuston etusivulla näytettävät tuotteet
 DocType: HR Settings,Password Policy,Salasanakäytäntö
 apps/erpnext/erpnext/setup/doctype/customer_group/customer_group.js,This is a root customer group and cannot be edited.,Tämä on perusasiakasryhmä joka ei ole muokattavissa.
@@ -4740,6 +4747,7 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py,Row {0}: Advance against Customer must be credit,Rivi {0}: Advance vastaan asiakkaan on luotto
 DocType: Quality Meeting,Quality Meeting,Laatukokous
 apps/erpnext/erpnext/accounts/doctype/account/account.js,Non-Group to Group,Non-ryhmän Group
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,Aseta Naming-sarjan asetukseksi {0} Asetukset&gt; Asetukset&gt; Sarjojen nimeäminen -kohdassa
 DocType: Employee,ERPNext User,ERP-lisäkäyttäjä
 apps/erpnext/erpnext/education/doctype/student_group_creation_tool/student_group_creation_tool.py,Batch is mandatory in row {0},Erä on pakollinen rivillä {0}
 DocType: Company,Default Buying Terms,Oletusostoehdot
@@ -5034,6 +5042,7 @@
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py,No {0} found for Inter Company Transactions.,Ei {0} löytyi Inter Company -tapahtumista.
 DocType: Travel Itinerary,Rented Car,Vuokra-auto
 apps/erpnext/erpnext/public/js/hub/components/profile_dialog.js,About your Company,Tietoja yrityksestänne
+apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.js,Show Stock Ageing Data,Näytä osakekannan ikääntötiedot
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py,Credit To account must be a Balance Sheet account,Kredit tilin on oltava tase tili
 DocType: Donor,Donor,luovuttaja
 DocType: Global Defaults,Disable In Words,Poista In Sanat
@@ -5048,8 +5057,10 @@
 DocType: Practitioner Schedule,Schedule Name,Aikataulun nimi
 apps/erpnext/erpnext/regional/doctype/gstr_3b_report/gstr_3b_report.py,Please enter GSTIN and state for the Company Address {0},Anna GSTIN ja ilmoita yrityksen osoite {0}
 DocType: Currency Exchange,For Buying,Ostaminen
+apps/erpnext/erpnext/setup/default_energy_point_rules.py,On Purchase Order Submission,Ostotilausten toimittaminen
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js,Add All Suppliers,Lisää kaikki toimittajat
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py,Row #{0}: Allocated Amount cannot be greater than outstanding amount.,Rivi # {0}: osuutensa ei voi olla suurempi kuin lainamäärä.
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Customer &gt; Customer Group &gt; Territory,Asiakas&gt; Asiakasryhmä&gt; Alue
 DocType: Tally Migration,Parties,osapuolet
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js,Browse BOM,selaa BOM:a
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py,Secured Loans,Taatut lainat
@@ -5081,6 +5092,7 @@
 apps/erpnext/erpnext/stock/doctype/item_alternative/item_alternative.py,Not allow to set alternative item for the item {0},Älä anna asettaa vaihtoehtoista kohdetta {0}
 apps/erpnext/erpnext/hr/doctype/leave_block_list/leave_block_list.py,Date is repeated,Päivä toistetaan
 apps/erpnext/erpnext/accounts/print_format/payment_receipt_voucher/payment_receipt_voucher.html,Authorized Signatory,Valtuutettu allekirjoitus
+apps/erpnext/erpnext/education/doctype/instructor/instructor.py,Please setup Instructor Naming System in Education &gt; Education Settings,Asenna ohjaajien nimeämisjärjestelmä kohtaan Koulutus&gt; Koulutusasetukset
 apps/erpnext/erpnext/regional/doctype/gstr_3b_report/gstr_3b_report.html,Net ITC Available(A) - (B),Net ITC käytettävissä (A) - (B)
 apps/erpnext/erpnext/education/doctype/fee_schedule/fee_schedule.js,Create Fees,Luo palkkioita
 DocType: Project,Total Purchase Cost (via Purchase Invoice),hankintakustannusten kokonaismäärä (ostolaskuista)
@@ -5101,6 +5113,7 @@
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.js,Message Sent,Viesti lähetetty
 apps/erpnext/erpnext/accounts/doctype/account/account.py,Account with child nodes cannot be set as ledger,Huomioon lapsen solmuja ei voida asettaa Ledger
 DocType: C-Form,II,II
+apps/erpnext/erpnext/assets/report/fixed_asset_register/fixed_asset_register.py,Vendor Name,Toimittajan nimi
 DocType: Quiz Result,Wrong,Väärä
 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)
@@ -5344,6 +5357,7 @@
 DocType: Stock Settings,Auto Material Request,Automaattinen hankintapyyntö
 DocType: Woocommerce Settings,API consumer secret,API-kuluttajasala
 DocType: Delivery Note Item,Available Batch Qty at From Warehouse,Saatavilla Erä Kpl osoitteessa varastosta
+,Received Qty Amount,Vastaanotettu määrä
 DocType: Salary Slip,Gross Pay - Total Deduction - Loan Repayment,Gross Pay - Yhteensä vähentäminen - Lainan takaisinmaksu
 DocType: Bank Account,Last Integration Date,Viimeinen integrointipäivämäärä
 DocType: Expense Claim,Expense Taxes and Charges,Kulut verot ja maksut
@@ -5802,6 +5816,8 @@
 DocType: Drug Prescription,Hour,tunti
 DocType: Restaurant Order Entry,Last Sales Invoice,Viimeinen ostolasku
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py,Please select Qty against item {0},Valitse Qty {0}
+apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py,Latest Age,Viimeisin ikä
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js,Transfer Material to Supplier,materiaalisiirto toimittajalle
 apps/erpnext/erpnext/hr/report/loan_repayment/loan_repayment.py,EMI,EMI
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py,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
@@ -5825,7 +5841,6 @@
 apps/erpnext/erpnext/hr/doctype/employee_benefit_application/employee_benefit_application.py,"An amount of {0} already claimed for the component {1},\
 						 set the amount equal or greater than {2}","{0}, joka on jo vaadittu komponentin {1} osalta, asettaa summan, joka on yhtä suuri tai suurempi kuin {2}"
 DocType: Shipping Rule,Shipping Rule Conditions,Toimitustavan ehdot
-DocType: Purchase Invoice,Export Type,Vientityyppi
 DocType: Salary Slip Loan,Salary Slip Loan,Palkkavelkakirjalaina
 DocType: BOM Update Tool,The new BOM after replacement,Uusi osaluettelo korvauksen jälkeen
 ,Point of Sale,Myyntipiste
@@ -5945,7 +5960,6 @@
 DocType: Purchase Order Item,Blanket Order Rate,Peittojärjestysnopeus
 ,Customer Ledger Summary,Asiakaskirjan yhteenveto
 apps/erpnext/erpnext/hooks.py,Certification,sertifiointi
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js,Are you sure you want to make debit note?,Haluatko varmasti tehdä veloitusilmoituksen?
 DocType: Bank Guarantee,Clauses and Conditions,Säännöt ja ehdot
 DocType: Serial No,Creation Document Type,Dokumenttityypin luonti
 DocType: Amazon MWS Settings,ES,ES
@@ -5983,8 +5997,6 @@
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py,Financial Services,Talouspalvelu
 DocType: Student Sibling,Student ID,opiskelijanumero
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.js,For Quantity must be greater than zero,Määrän on oltava suurempi kuin nolla
-apps/erpnext/erpnext/hr/doctype/employee_transfer/employee_transfer.py,"Please delete the Employee <a href=""#Form/Employee/{0}"">{0}</a>\
-					to cancel this document","Poista työntekijä <a href=""#Form/Employee/{0}"">{0}</a> \ peruuttaaksesi tämän asiakirjan"
 apps/erpnext/erpnext/config/projects.py,Types of activities for Time Logs,Toimintamuodot Aika Lokit
 DocType: Opening Invoice Creation Tool,Sales,Myynti
 DocType: Stock Entry Detail,Basic Amount,Perusmäärät
@@ -6063,6 +6075,7 @@
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py,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,Send Supplier Emails,Lähetä toimittaja Sähköpostit
+DocType: Asset Movement,ACC-ASM-.YYYY.-,ACC-ASM-.YYYY.-
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py,"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
 apps/erpnext/erpnext/hr/doctype/employee_onboarding/employee_onboarding.py,Submit this to create the Employee record,"Lähetä tämä, jos haluat luoda työntekijän tietueen"
@@ -6140,7 +6153,6 @@
 DocType: Sales Team,Contact No.,yhteystiedot nro
 apps/erpnext/erpnext/templates/includes/cart/cart_address.html,Billing Address is same as Shipping Address,Laskutusosoite on sama kuin toimitusosoite
 DocType: Bank Reconciliation,Payment Entries,Maksu merkinnät
-apps/erpnext/erpnext/erpnext_integrations/doctype/shopify_settings/shopify_settings.py,Access token or Shopify URL missing,Access token tai Shopify URL puuttuu
 DocType: Location,Latitude,leveysaste
 DocType: Work Order,Scrap Warehouse,romu Varasto
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py,"Warehouse required at Row No {0}, please set default warehouse for the item {1} for the company {2}","Varastossa {0} vaadittava varasto, aseta oletusvarasto {1} yritykselle {2}"
@@ -6183,7 +6195,6 @@
 DocType: Job Offer Term,Value / Description,Arvo / Kuvaus
 apps/erpnext/erpnext/controllers/accounts_controller.py,"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
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js,Are you sure you want to make credit note?,Haluatko varmasti tehdä hyvityslaskun?
 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,Debit and Credit not equal for {0} #{1}. Difference is {2}.,debet ja kredit eivät täsmää {0} # {1}. ero on {2}
@@ -6308,6 +6319,7 @@
 DocType: Purchase Invoice,Taxes and Charges Added,Lisätyt verot ja maksut
 apps/erpnext/erpnext/assets/doctype/asset/asset.py,Depreciation Row {0}: Next Depreciation Date cannot be before Available-for-use Date,Poistojauhe {0}: Seuraava Poistoaika ei voi olla ennen Käytettävissä olevaa päivämäärää
 ,Sales Funnel,Myyntihankekantaan
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Item Code &gt; Item Group &gt; Brand,Tuotekoodi&gt; Tuoteryhmä&gt; Tuotemerkki
 apps/erpnext/erpnext/setup/doctype/company/company.py,Abbreviation is mandatory,Lyhenne on pakollinen
 DocType: Project,Task Progress,tehtävä Progress
 apps/erpnext/erpnext/templates/includes/navbar/navbar_items.html,Cart,kori
@@ -6551,6 +6563,7 @@
 DocType: Employee Grade,Employee Grade,Työntekijäluokka
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py,Piecework,Urakkatyö
 DocType: GSTR 3B Report,June,kesäkuu
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Supplier &gt; Supplier Type,Toimittaja&gt; Toimittajan tyyppi
 DocType: Share Balance,From No,Nro
 DocType: Shift Type,Early Exit Grace Period,Varhaisvaroitusaika
 DocType: Task,Actual Time (in Hours),todellinen aika (tunneissa)
@@ -6841,6 +6854,7 @@
 DocType: Warehouse,Warehouse Name,Varaston nimi
 DocType: Naming Series,Select Transaction,Valitse tapahtuma
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py,Please enter Approving Role or Approving User,Anna hyväksyminen rooli tai hyväksyminen Käyttäjä
+apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.py,UOM Conversion factor ({0} -&gt; {1}) not found for item: {2},UOM-muuntokerrointa ({0} -&gt; {1}) ei löydy tuotteelle: {2}
 apps/erpnext/erpnext/support/doctype/service_level_agreement/service_level_agreement.py,Service Level Agreement with Entity Type {0} and Entity {1} already exists.,Palvelutasosopimus entiteettityypin {0} ja kokonaisuuden {1} kanssa on jo olemassa.
 DocType: Journal Entry,Write Off Entry,Poiston kirjaus
 DocType: BOM,Rate Of Materials Based On,Materiaalilaskenta perustuen
@@ -7031,6 +7045,7 @@
 DocType: Quality Inspection Reading,Quality Inspection Reading,Laarutarkistuksen luku
 apps/erpnext/erpnext/stock/doctype/stock_settings/stock_settings.py,`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/stock/report/stock_balance/stock_balance.py,Earliest Age,Varhaisin ikä
 apps/erpnext/erpnext/utilities/user_progress.py,Set a sales goal you'd like to achieve for your company.,"Aseta myyntitavoite, jonka haluat saavuttaa yrityksellesi."
 DocType: Quality Goal,Revision,tarkistus
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js,Healthcare Services,Terveydenhuollon palvelut
@@ -7074,6 +7089,7 @@
 apps/erpnext/erpnext/healthcare/doctype/patient_encounter/patient_encounter.js,Schedule Discharge,Aikataulupaikka
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py,Cheques and Deposits incorrectly cleared,Sekkejä ja Talletukset virheellisesti selvitetty
 DocType: Homepage Section Card,Homepage Section Card,Kotisivun osinkortti
+,Amount To Be Billed,Laskutettava summa
 apps/erpnext/erpnext/accounts/doctype/account/account.py,Account {0}: You can not assign itself as parent account,tili {0}: et voi nimetä tätä tiliä emotiliksi
 DocType: Purchase Invoice Item,Price List Rate,hinta
 apps/erpnext/erpnext/utilities/activation.py,Create customer quotes,Luoda asiakkaalle lainausmerkit
@@ -7126,6 +7142,7 @@
 DocType: Supplier Scorecard Criteria,Supplier Scorecard Criteria,Toimittajan tuloskortin kriteerit
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py,Please select Start Date and End Date for Item {0},Ole hyvä ja valitse alkamispäivä ja päättymispäivä Kohta {0}
 DocType: Maintenance Schedule,MAT-MSH-.YYYY.-,MAT-MSH-.YYYY.-
+,Amount to Receive,Vastaanotettava määrä
 apps/erpnext/erpnext/education/doctype/student_group_creation_tool/student_group_creation_tool.py,Course is mandatory in row {0},Kurssi on pakollinen rivi {0}
 apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py,From date can not be greater than than To date,Alkaen päiväys ei voi olla suurempi kuin Tähän mennessä
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py,To date cannot be before from date,Päivään ei voi olla ennen aloituspäivää
@@ -7373,7 +7390,6 @@
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js,BOM and Manufacturing Quantity are required,BOM ja valmistusmäärä tarvitaan
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js,Ageing Range 2,vanhentumisen skaala 2
 DocType: SG Creation Tool Course,Max Strength,max Strength
-apps/erpnext/erpnext/accounts/doctype/account/account.py,"Account {0} already exists in child company {1}. The following fields have different values, they should be same:<ul><li>{2}</li></ul>","Tili {0} on jo olemassa lapsiyrityksessä {1}. Seuraavilla kentillä on erilaisia arvoja, niiden tulisi olla samat: <ul><li> {2} </li></ul>"
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py,Installing presets,Esiasetusten asennus
 DocType: Fee Schedule,EDU-FSH-.YYYY.-,EDU-FSH-.YYYY.-
 apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js,No Delivery Note selected for Customer {},Ei toimitustiedostoa valittu asiakkaalle {}
@@ -7581,6 +7597,7 @@
 DocType: Delivery Note,Print Without Amount,Tulosta ilman arvomäärää
 apps/erpnext/erpnext/accounts/report/asset_depreciation_ledger/asset_depreciation_ledger.py,Depreciation Date,Poistot Date
 ,Work Orders in Progress,Työjärjestykset ovat käynnissä
+DocType: Customer Credit Limit,Bypass Credit Limit Check,Ohita luottorajan tarkistus
 DocType: Issue,Support Team,Tukitiimi
 apps/erpnext/erpnext/stock/report/batch_item_expiry_status/batch_item_expiry_status.py,Expiry (In Days),Päättymisestä (päivinä)
 DocType: Appraisal,Total Score (Out of 5),osumat (5:stä) yhteensä
@@ -7764,6 +7781,7 @@
 DocType: Sales Invoice,Customer GSTIN,Asiakas GSTIN
 DocType: Crop Cycle,List of diseases detected on the field. When selected it'll automatically add a list of tasks to deal with the disease ,"Luettelo kentällä havaituista taudeista. Kun se valitaan, se lisää automaattisesti tehtäväluettelon taudin hoitamiseksi"
 apps/erpnext/erpnext/manufacturing/page/bom_comparison_tool/bom_comparison_tool.js,BOM 1,BOM 1
+apps/erpnext/erpnext/assets/report/fixed_asset_register/fixed_asset_register.py,Asset Id,Omaisuuden tunnus
 apps/erpnext/erpnext/healthcare/doctype/healthcare_service_unit/healthcare_service_unit.js,This is a root healthcare service unit and cannot be edited.,Tämä on juuri terveydenhuollon palveluyksikkö ja sitä ei voi muokata.
 DocType: Asset Repair,Repair Status,Korjaustila
 apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.js,"Requested Qty: Quantity requested for purchase, but not ordered.","Pyydetty määrä: Ostettava määrä, jota ei ole tilattu."
diff --git a/erpnext/translations/fr.csv b/erpnext/translations/fr.csv
index f1d10fc..346765f 100644
--- a/erpnext/translations/fr.csv
+++ b/erpnext/translations/fr.csv
@@ -289,7 +289,6 @@
 DocType: Loan,Repay Over Number of Periods,Rembourser Sur le Nombre de Périodes
 apps/erpnext/erpnext/manufacturing/report/bom_stock_report/bom_stock_report.py,Quantity to Produce can not be less than Zero,La quantité à produire ne peut être inférieure à zéro
 DocType: Stock Entry,Additional Costs,Frais Supplémentaires
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Customer &gt; Customer Group &gt; Territory,Client&gt; Groupe de clients&gt; Territoire
 apps/erpnext/erpnext/accounts/doctype/account/account.py,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
@@ -586,6 +585,7 @@
 DocType: Healthcare Settings,Create documents for sample collection,Créer des documents pour la collecte d&#39;échantillons
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py,Payment against {0} {1} cannot be greater than Outstanding Amount {2},Paiement pour {0} {1} ne peut pas être supérieur à Encours {2}
 apps/erpnext/erpnext/patches/v11_0/add_healthcare_service_unit_tree_root.py,All Healthcare Service Units,Tous les services de soins de santé
+apps/erpnext/erpnext/setup/default_energy_point_rules.py,On Converting Opportunity,Sur l&#39;opportunité de conversion
 DocType: Bank Account,Address HTML,Adresse HTML
 DocType: Lead,Mobile No.,N° Mobile.
 apps/erpnext/erpnext/selling/doctype/pos_closing_voucher/closing_voucher_details.html,Mode of Payments,Mode de paiement
@@ -650,7 +650,6 @@
 DocType: Accounting Dimension,Dimension Name,Nom de la dimension
 apps/erpnext/erpnext/healthcare/setup.py,Resistant,Résistant
 apps/erpnext/erpnext/hotels/doctype/hotel_room_reservation/hotel_room_reservation.py,Please set Hotel Room Rate on {},Veuillez définir le tarif de la chambre d'hôtel le {}
-apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py,Please setup numbering series for Attendance via Setup &gt; Numbering Series,Veuillez configurer les séries de numérotation pour la participation via Configuration&gt; Série de numérotation
 DocType: Journal Entry,Multi Currency,Multi-Devise
 DocType: Bank Statement Transaction Invoice Item,Invoice Type,Type de Facture
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py,Valid from date must be less than valid upto date,La date de début de validité doit être inférieure à la date de validité
@@ -765,6 +764,7 @@
 apps/erpnext/erpnext/accounts/page/pos/pos.js,Create a new Customer,Créer un nouveau Client
 apps/erpnext/erpnext/non_profit/report/expiring_memberships/expiring_memberships.py,Expiring On,Expirera le
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,"If multiple Pricing Rules continue to prevail, users are asked to set Priority manually to resolve conflict.","Si plusieurs Règles de Prix continuent de prévaloir, les utilisateurs sont invités à définir manuellement la priorité pour résoudre les conflits."
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js,Purchase Return,Retour d'Achat
 apps/erpnext/erpnext/utilities/activation.py,Create Purchase Orders,Créer des Commandes d'Achat
 ,Purchase Register,Registre des Achats
 apps/erpnext/erpnext/healthcare/doctype/patient/patient.py,Patient not found,Patient non trouvé
@@ -780,7 +780,6 @@
 DocType: Location,Area UOM,Unité de mesure de la surface
 apps/erpnext/erpnext/manufacturing/doctype/workstation/workstation.py,Workstation is closed on the following dates as per Holiday List: {0},La station de travail est fermée aux dates suivantes d'après la liste de vacances : {0}
 apps/erpnext/erpnext/selling/page/sales_funnel/sales_funnel.py,Opportunities,Opportunités
-apps/erpnext/erpnext/www/all-products/index.html,Clear filters,Effacer les filtres
 DocType: Lab Test Template,Single,Unique
 DocType: Compensatory Leave Request,Work From Date,Date de début du travail
 DocType: Salary Slip,Total Loan Repayment,Total de Remboursement du Prêt
@@ -823,6 +822,7 @@
 DocType: Account,Old Parent,Grand Parent
 apps/erpnext/erpnext/education/doctype/program_enrollment_tool/program_enrollment_tool.py,Mandatory field - Academic Year,Champ Obligatoire - Année Académique
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py,{0} {1} is not associated with {2} {3},{0} {1} n&#39;est pas associé à {2} {3}
+DocType: Opportunity,Converted By,Converti par
 apps/erpnext/erpnext/public/js/hub/components/ReviewArea.vue,You need to login as a Marketplace User before you can add any reviews.,Vous devez vous connecter en tant qu&#39;utilisateur de la Marketplace avant de pouvoir ajouter des critiques.
 apps/erpnext/erpnext/manufacturing/doctype/job_card/job_card.py,Row {0} : Operation is required against the raw material item {1},Ligne {0}: l&#39;opération est requise pour l&#39;article de matière première {1}
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py,Please set default payable account for the company {0},Veuillez définir le compte créditeur par défaut pour la société {0}
@@ -848,6 +848,8 @@
 DocType: BOM,Work Order,Ordre de Travail
 DocType: Sales Invoice,Total Qty,Qté Totale
 apps/erpnext/erpnext/education/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py,Guardian2 Email ID,ID Email du Tuteur2
+apps/erpnext/erpnext/hr/doctype/employee_transfer/employee_transfer.py,"Please delete the Employee <a href=""#Form/Employee/{0}"">{0}</a>\
+					to cancel this document","Supprimez l&#39;employé <a href=""#Form/Employee/{0}"">{0}</a> \ pour annuler ce document."
 DocType: Item,Show in Website (Variant),Afficher dans le Website (Variant)
 DocType: Employee,Health Concerns,Problèmes de Santé
 DocType: Payroll Entry,Select Payroll Period,Sélectionner la Période de Paie
@@ -908,7 +910,6 @@
 DocType: Codification Table,Codification Table,Tableau de Codifications
 DocType: Timesheet Detail,Hrs,Hrs
 apps/erpnext/erpnext/manufacturing/page/bom_comparison_tool/bom_comparison_tool.js,Changes in {0},Changements dans {0}
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js,Please select Company,Veuillez sélectionner une Société
 DocType: Employee Skill,Employee Skill,Compétence de l&#39;employé
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.js,Difference Account,Compte d’Écart
 DocType: Pricing Rule,Discount on Other Item,Remise sur un autre article
@@ -976,6 +977,7 @@
 DocType: BOM,Operating Cost,Coût d'Exploitation
 DocType: Crop,Produced Items,Articles produits
 DocType: Bank Statement Transaction Entry,Match Transaction to Invoices,Faire correspondre la transaction aux factures
+apps/erpnext/erpnext/erpnext_integrations/exotel_integration.py,Error in Exotel incoming call,Erreur dans un appel entrant Exotel
 DocType: Sales Order Item,Gross Profit,Bénéfice Brut
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js,Unblock Invoice,Débloquer la facture
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py,Increment cannot be 0,Incrément ne peut pas être 0
@@ -1189,6 +1191,7 @@
 DocType: Activity Cost,Activity Type,Type d&#39;activité
 DocType: Request for Quotation,For individual supplier,Pour un fournisseur individuel
 DocType: BOM Operation,Base Hour Rate(Company Currency),Taux Horaire de Base (Devise de la Société)
+,Qty To Be Billed,Qté à facturer
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py,Delivered Amount,Montant Livré
 apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.js,Reserved Qty for Production: Raw materials quantity to make manufacturing items.,Qté réservée à la production: quantité de matières premières permettant de fabriquer des articles de fabrication.
 DocType: Loyalty Point Entry Redemption,Redemption Date,Date de l'échange
@@ -1307,7 +1310,7 @@
 DocType: Sales Invoice,Commission Rate (%),Taux de Commission (%)
 apps/erpnext/erpnext/education/doctype/student_group/student_group.py,Please select Program,Veuillez sélectionner un Programme
 DocType: Project,Estimated Cost,Coût Estimé
-DocType: Request for Quotation,Link to material requests,Lien vers les demandes de matériaux
+DocType: Supplier Quotation,Link to material requests,Lien vers les demandes de matériaux
 apps/erpnext/erpnext/public/js/hub/pages/Publish.vue,Publish,Publier
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py,Aerospace,Aérospatial
 ,Fichier des Ecritures Comptables [FEC],Fichier des Ecritures Comptables [FEC]
@@ -1320,6 +1323,7 @@
 apps/erpnext/erpnext/utilities/transaction_base.py,Invalid Posting Time,Heure de publication non valide
 DocType: Salary Component,Condition and Formula,Condition et formule
 DocType: Lead,Campaign Name,Nom de la Campagne
+apps/erpnext/erpnext/setup/default_energy_point_rules.py,On Task Completion,En fin de tâche
 apps/erpnext/erpnext/hr/doctype/compensatory_leave_request/compensatory_leave_request.py,There is no leave period in between {0} and {1},Il n&#39;y a pas de période de congé entre {0} et {1}
 DocType: Fee Validity,Healthcare Practitioner,Praticien de la santé
 DocType: Hotel Room,Capacity,Capacité
@@ -1684,7 +1688,6 @@
 DocType: Quality Feedback Template,Quality Feedback Template,Modèle de commentaires sur la qualité
 apps/erpnext/erpnext/config/education.py,LMS Activity,Activité LMS
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py,Internet Publishing,Publication Internet
-DocType: Prescription Duration,Number,Nombre
 apps/erpnext/erpnext/accounts/doctype/opening_invoice_creation_tool/opening_invoice_creation_tool.js,Creating {0} Invoice,Création de {0} facture
 DocType: Medical Code,Medical Code Standard,Standard du code médical
 DocType: Soil Texture,Clay Composition (%),Composition d&#39;argile (%)
@@ -1759,6 +1762,7 @@
 DocType: Support Settings,Get Started Sections,Sections d'aide
 DocType: Lead,CRM-LEAD-.YYYY.-,CRM-LEAD-.YYYY.-
 DocType: Invoice Discounting,Sanctioned,Sanctionné
+,Base Amount,Montant de base
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.js,Total Contribution Amount: {0},Montant total de la contribution: {0}
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py,Row #{0}: Please specify Serial No for Item {1},Ligne # {0} : Veuillez Indiquer le N° de série pour l'article {1}
 DocType: Payroll Entry,Salary Slips Submitted,Slips Slips Soumis
@@ -1976,6 +1980,7 @@
 apps/erpnext/erpnext/utilities/user_progress.py,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.
 DocType: Accounting Dimension,Dimension Defaults,Valeurs par défaut de la dimension
 apps/erpnext/erpnext/crm/report/prospects_engaged_but_not_converted/prospects_engaged_but_not_converted.js,Minimum Lead Age (Days),Âge Minimum du Prospect (Jours)
+apps/erpnext/erpnext/assets/report/fixed_asset_register/fixed_asset_register.py,Available For Use Date,Date d&#39;utilisation disponible
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py,All BOMs,Toutes les LDM
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js,Create Inter Company Journal Entry,Créer une entrée de journal inter-entreprises
 DocType: Company,Parent Company,Maison mère
@@ -2040,6 +2045,7 @@
 ,IRS 1099,IRS 1099
 DocType: Salary Slip,Leave Without Pay,Congé Sans Solde
 DocType: Payment Request,Outward,À l&#39;extérieur
+apps/erpnext/erpnext/setup/default_energy_point_rules.py,On {0} Creation,Sur {0} Creation
 apps/erpnext/erpnext/regional/doctype/gstr_3b_report/gstr_3b_report.html,State/UT Tax,Taxe Etat / UT
 ,Trial Balance for Party,Balance Auxiliaire
 ,Gross and Net Profit Report,Rapport de bénéfice brut et net
@@ -2155,6 +2161,7 @@
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js,Make Stock Entry,Faire une entrée de stock
 DocType: Hotel Room Reservation,Hotel Reservation User,Utilisateur chargé des réservations d'hôtel
 apps/erpnext/erpnext/projects/doctype/project/project.js,Set Status,Définir le statut
+apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py,Please setup numbering series for Attendance via Setup &gt; Numbering Series,Veuillez configurer les séries de numérotation pour la participation via Configuration&gt; Série de numérotation
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py,Please select prefix first,Veuillez d’abord sélectionner un préfixe
 DocType: Contract,Fulfilment Deadline,Délai d&#39;exécution
 apps/erpnext/erpnext/public/js/hub/pages/Home.vue,Near you,Près de toi
@@ -2170,6 +2177,7 @@
 DocType: Announcement,All Students,Tous les Etudiants
 apps/erpnext/erpnext/assets/doctype/asset/asset.py,Item {0} must be a non-stock item,L'article {0} doit être un article hors stock
 apps/erpnext/erpnext/stock/doctype/batch/batch.js,View Ledger,Voir le Livre
+DocType: Cost Center,Lft,Lft
 DocType: Grading Scale,Intervals,Intervalles
 DocType: Bank Statement Transaction Entry,Reconciled Transactions,Transactions rapprochées
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py,Earliest,Au plus tôt
@@ -2285,6 +2293,7 @@
 apps/erpnext/erpnext/hr/doctype/employee_benefit_application/employee_benefit_application.py,As per your assigned Salary Structure you cannot apply for benefits,La struture salariale qui vous a été assignée ne vous permet pas de demander des avantages sociaux
 apps/erpnext/erpnext/stock/doctype/item/item.py,Website Image should be a public file or website URL,L'Image du Site Web doit être un fichier public ou l'URL d'un site web
 DocType: Purchase Invoice Item,BOM,LDM (Liste de Matériaux)
+apps/erpnext/erpnext/stock/doctype/item/item.py,Duplicate entry in Manufacturers table,Dupliquer une entrée dans la table Fabricants
 apps/erpnext/erpnext/setup/doctype/item_group/item_group.js,This is a root item group and cannot be edited.,Il s’agit d’un groupe d'élément racine qui ne peut être modifié.
 apps/erpnext/erpnext/accounts/doctype/account/account.js,Merge,Fusionner
 DocType: Journal Entry Account,Purchase Order,Bon de Commande
@@ -2429,7 +2438,6 @@
 DocType: Asset,Depreciation Schedules,Calendriers d'Amortissement
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.js,Create Sales Invoice,Créer une facture de vente
 apps/erpnext/erpnext/regional/doctype/gstr_3b_report/gstr_3b_report.html,Ineligible ITC,CTI non éligible
-apps/erpnext/erpnext/erpnext_integrations/doctype/shopify_settings/shopify_settings.py,"Support for public app is deprecated. Please setup private app, for more details refer user manual","La prise en charge de l&#39;application publique est obsolète. S&#39;il vous plaît configurer l&#39;application privée, pour plus de détails se référer au manuel de l&#39;utilisateur"
 DocType: Task,Dependent Tasks,Tâches dépendantes
 apps/erpnext/erpnext/regional/report/gstr_1/gstr_1.py,Following accounts might be selected in GST Settings:,Les comptes suivants peuvent être sélectionnés dans les paramètres GST:
 apps/erpnext/erpnext/manufacturing/report/bom_stock_report/bom_stock_report.js,Quantity to Produce,Quantité à produire
@@ -2681,6 +2689,7 @@
 DocType: Water Analysis,Container,Récipient
 apps/erpnext/erpnext/regional/report/gstr_1/gstr_1.py,Please set valid GSTIN No. in Company Address,Veuillez indiquer un numéro GSTIN valide dans l&#39;adresse de la société.
 apps/erpnext/erpnext/education/utils.py,Student {0} - {1} appears Multiple times in row {2} & {3},Étudiant {0} - {1} apparaît Plusieurs fois dans la ligne {2} & {3}
+apps/erpnext/erpnext/selling/doctype/customer/customer.py,Following fields are mandatory to create address:,Les champs suivants sont obligatoires pour créer une adresse:
 DocType: Item Alternative,Two-way,A double-sens
 DocType: Item,Manufacturers,Les fabricants
 apps/erpnext/erpnext/accounts/deferred_revenue.py,Error while processing deferred accounting for {0},Erreur lors du traitement de la comptabilisation différée pour {0}
@@ -2755,9 +2764,9 @@
 DocType: Employee,HR-EMP-,HR-EMP-
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py,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: Quality Meeting Minutes,Quality Meeting Minutes,Compte rendu de réunion de qualité
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Supplier &gt; Supplier Type,Fournisseur&gt; Type de fournisseur
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py,Employee Referral,Recommandations
 DocType: Student Group,Set 0 for no limit,Définir à 0 pour aucune limite
+DocType: Cost Center,rgt,rgt
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py,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.
 DocType: Customer,Primary Address and Contact Detail,Adresse principale et coordonnées du contact
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.js,Resend Payment Email,Renvoyer Email de Paiement
@@ -2867,7 +2876,6 @@
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py,Against Supplier Invoice {0} dated {1},Pour la Facture Fournisseur {0} datée {1}
 DocType: Customer,Default Price List,Liste des Prix par Défaut
 apps/erpnext/erpnext/assets/doctype/asset/asset.py,Asset Movement record {0} created,Registre de Mouvement de l'Actif {0} créé
-apps/erpnext/erpnext/utilities/page/leaderboard/leaderboard.js,No items found.,Aucun article trouvé.
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py,You cannot delete Fiscal Year {0}. Fiscal Year {0} is set as default in Global Settings,Vous ne pouvez pas supprimer l'exercice fiscal {0}. L'exercice fiscal {0} est défini par défaut dans les Paramètres Globaux
 DocType: Share Transfer,Equity/Liability Account,Compte de capitaux propres / passif
 apps/erpnext/erpnext/setup/doctype/customer_group/customer_group.py,A customer with the same name already exists,Un client avec un nom identique existe déjà
@@ -2883,6 +2891,7 @@
 apps/erpnext/erpnext/selling/doctype/customer/customer.py,Credit limit has been crossed for customer {0} ({1}/{2}),La limite de crédit a été dépassée pour le client {0} ({1} / {2})
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py,Customer required for 'Customerwise Discount',Client requis pour appliquer une 'Remise en fonction du Client'
 apps/erpnext/erpnext/config/accounting.py,Update bank payment dates with journals.,Mettre à jour les dates de paiement bancaires avec les journaux.
+,Billed Qty,Quantité facturée
 apps/erpnext/erpnext/stock/doctype/item/item_dashboard.py,Pricing,Tarification
 DocType: Employee,Attendance Device ID (Biometric/RF tag ID),Périphérique d&#39;assistance (identifiant d&#39;étiquette biométrique / RF)
 DocType: Quotation,Term Details,Détails du Terme
@@ -2904,6 +2913,7 @@
 DocType: Share Transfer,Asset Account,Compte d&#39;actif
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js,New release date should be in the future,La nouvelle date de sortie devrait être dans le futur
 DocType: Purchase Invoice,End date of current invoice's period,Date de fin de la période de facturation en cours
+apps/erpnext/erpnext/hr/doctype/employee/employee.py,Please setup Employee Naming System in Human Resource &gt; HR Settings,Veuillez configurer le système de nommage des employés dans Ressources humaines&gt; Paramètres RH
 DocType: Lab Test,Technician Name,Nom du Technicien
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py,"Cannot ensure delivery by Serial No as \
 					Item {0} is added with and without Ensure Delivery by \
@@ -2911,6 +2921,7 @@
 DocType: Accounts Settings,Unlink Payment on Cancellation of Invoice,Délier Paiement à l'Annulation de la Facture
 DocType: Bank Reconciliation,From Date,A partir du
 apps/erpnext/erpnext/hr/doctype/vehicle_log/vehicle_log.py,Current Odometer reading entered should be greater than initial Vehicle Odometer {0},Le Compteur(kms) Actuel entré devrait être plus grand que le Compteur(kms) initial du Véhicule {0}
+,Purchase Order Items To Be Received or Billed,Postes de commande à recevoir ou à facturer
 DocType: Restaurant Reservation,No Show,Non Présenté
 apps/erpnext/erpnext/regional/india/utils.py,You must be a registered supplier to generate e-Way Bill,Vous devez être un fournisseur enregistré pour générer une facture électronique
 DocType: Shipping Rule Country,Shipping Rule Country,Pays de la Règle de Livraison
@@ -2953,6 +2964,7 @@
 apps/erpnext/erpnext/templates/generators/item/item_add_to_cart.html,View in Cart,Voir Panier
 DocType: Employee Checkin,Shift Actual Start,Décalage début effectif
 DocType: Tally Migration,Is Day Book Data Imported,Les données du carnet de jour sont-elles importées?
+,Purchase Order Items To Be Received or Billed1,Postes de commande à recevoir ou à facturer1
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py,Marketing Expenses,Frais de Marketing
 apps/erpnext/erpnext/stock/doctype/pick_list/pick_list.py,{0} units of {1} is not available.,{0} unités de {1} ne sont pas disponibles.
 ,Item Shortage Report,Rapport de Rupture de Stock d'Article
@@ -3177,7 +3189,6 @@
 apps/erpnext/erpnext/public/js/call_popup/call_popup.js,View all issues from {0},Afficher tous les problèmes de {0}
 DocType: Quality Inspection,MAT-QA-.YYYY.-,MAT-QA-YYYY.-
 DocType: Quality Meeting Table,Quality Meeting Table,Table de réunion de qualité
-apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,Définissez la série de noms pour {0} via Configuration&gt; Paramètres&gt; Série de noms.
 apps/erpnext/erpnext/templates/pages/help.html,Visit the forums,Visitez les forums
 DocType: Student,Student Mobile Number,Numéro de Mobile de l'Étudiant
 DocType: Item,Has Variants,A Variantes
@@ -3320,6 +3331,7 @@
 DocType: Homepage Section,Section Cards,Cartes de section
 ,Campaign Efficiency,Efficacité des Campagnes
 DocType: Discussion,Discussion,Discussion
+apps/erpnext/erpnext/setup/default_energy_point_rules.py,On Sales Order Submission,Envoi de commande client
 DocType: Bank Transaction,Transaction ID,Identifiant de Transaction
 DocType: Payroll Entry,Deduct Tax For Unsubmitted Tax Exemption Proof,Déduire la taxe pour toute preuve d'exemption de taxe non soumise
 DocType: Volunteer,Anytime,À tout moment
@@ -3327,7 +3339,6 @@
 DocType: Employee Tax Exemption Proof Submission,Employee Tax Exemption Proof Submission,Soumission d'une preuve d'exemption de taxe
 DocType: Patient,Surgical History,Antécédents Chirurgicaux
 DocType: Bank Statement Settings Item,Mapped Header,En-tête mappé
-apps/erpnext/erpnext/hr/doctype/employee/employee.py,Please setup Employee Naming System in Human Resource &gt; HR Settings,Veuillez configurer le système de nommage des employés dans Ressources humaines&gt; Paramètres RH
 DocType: Employee,Resignation Letter Date,Date de la Lettre de Démission
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Pricing Rules are further filtered based on quantity.,Les Règles de Tarification sont d'avantage filtrés en fonction de la quantité.
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py,Please set the Date Of Joining for employee {0},Veuillez définir la Date d'Embauche pour l'employé {0}
@@ -3341,6 +3352,7 @@
 DocType: Bank Statement Settings,Mapped Items,Articles mappés
 DocType: Amazon MWS Settings,IT,IL
 DocType: Chapter,Chapter,Chapitre
+,Fixed Asset Register,Registre des immobilisations
 apps/erpnext/erpnext/utilities/user_progress.py,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,Select BOM and Qty for Production,Sélectionner la LDM et la Qté pour la Production
@@ -3476,7 +3488,6 @@
 apps/erpnext/erpnext/templates/emails/reorder_item.html,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
 apps/erpnext/erpnext/controllers/accounts_controller.py,Account {0} is invalid. Account Currency must be {1},Le compte {0} est invalide. La Devise du Compte doit être {1}
 apps/erpnext/erpnext/hr/doctype/salary_structure_assignment/salary_structure_assignment.py,From Date {0} cannot be after employee's relieving Date {1},La date de début {0} ne peut pas être après la date de départ de l'employé {1}
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py,Debit Note {0} has been created automatically,La note de débit {0} a été créée automatiquement.
 apps/erpnext/erpnext/accounts/doctype/payment_order/payment_order.js,Create Payment Entries,Créer des entrées de paiement
 DocType: Supplier,Is Internal Supplier,Est un fournisseur interne
 DocType: Employee,Create User Permission,Créer une autorisation utilisateur
@@ -4035,7 +4046,6 @@
 DocType: Project User,Project Status,Statut du Projet
 DocType: UOM,Check this to disallow fractions. (for Nos),Cochez cette case pour interdire les fractions. (Pour les numéros)
 DocType: Student Admission Program,Naming Series (for Student Applicant),Nom de série (pour un candidat étudiant)
-apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.py,UOM Conversion factor ({0} -&gt; {1}) not found for item: {2},Facteur de conversion UOM ({0} -&gt; {1}) introuvable pour l&#39;élément: {2}
 apps/erpnext/erpnext/hr/doctype/retention_bonus/retention_bonus.py,Bonus Payment Date cannot be a past date,La date de paiement du bonus ne peut pas être une date passée
 DocType: Travel Request,Copy of Invitation/Announcement,Copie de l&#39;invitation / annonce
 DocType: Practitioner Service Unit Schedule,Practitioner Service Unit Schedule,Horaire de l&#39;unité de service du praticien
@@ -4203,6 +4213,7 @@
 apps/erpnext/erpnext/utilities/user_progress.py,Setup Company,Configurer la Société
 ,Lab Test Report,Rapport de test de laboratoire
 DocType: Employee Benefit Application,Employee Benefit Application,Demande d'avantages sociaux
+apps/erpnext/erpnext/accounts/doctype/invoice_discounting/invoice_discounting.py,Row({0}): {1} is already discounted in {2},Ligne ({0}): {1} est déjà réduit dans {2}.
 apps/erpnext/erpnext/hr/doctype/additional_salary/additional_salary.py,Additional Salary Component Exists.,La composante salariale supplémentaire existe.
 DocType: Purchase Invoice,Unregistered,Non enregistré
 DocType: Student Applicant,Application Date,Date de la Candidature
@@ -4281,7 +4292,6 @@
 DocType: Journal Entry,Accounting Entries,Écritures Comptables
 DocType: Job Card Time Log,Job Card Time Log,Journal de temps de la carte de travail
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,"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 le «Prix Unitaire», elle écrase la liste de prix. Le prix unitaire de la règle de tarification est le prix unitaire final, donc aucune autre réduction supplémentaire ne doit être appliquée. Par conséquent, dans les transactions telles que la commande client, la commande d'achat, etc., elle sera récupérée dans le champ ""Prix Unitaire"", plutôt que dans le champ ""Tarif de la liste de prix""."
-apps/erpnext/erpnext/education/doctype/instructor/instructor.py,Please setup Instructor Naming System in Education &gt; Education Settings,Veuillez configurer le système de nommage des instructeurs dans Education&gt; Paramètres de formation
 DocType: Journal Entry,Paid Loan,Prêt payé
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py,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
@@ -4298,7 +4308,6 @@
 apps/erpnext/erpnext/templates/pages/projects.html,No time sheets,Aucunes feuilles de temps
 DocType: GoCardless Mandate,GoCardless Customer,Client GoCardless
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py,Leave Type {0} cannot be carry-forwarded,Le Type de Congé {0} ne peut pas être reporté
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Item Code &gt; Item Group &gt; Brand,Code d&#39;article&gt; Groupe d&#39;articles&gt; Marque
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py,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
 DocType: Leave Encashment,Payroll,Paie
@@ -4413,7 +4422,6 @@
 DocType: Stock Ledger Entry,Actual Qty After Transaction,Qté Réelle Après Transaction
 ,Pending SO Items For Purchase Request,Articles de Commande Client en Attente Pour la Demande d'Achat
 apps/erpnext/erpnext/education/doctype/student_admission/student_admission.py,Student Admissions,Admissions des Étudiants
-apps/erpnext/erpnext/accounts/party.py,{0} {1} is disabled,{0} {1} est désactivé
 DocType: Supplier,Billing Currency,Devise de Facturation
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py,Extra Large,Extra Large
 DocType: Loan,Loan Application,Demande de prêt
@@ -4490,7 +4498,6 @@
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py,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/accounts/doctype/accounting_dimension/accounting_dimension.py,Creating Dimensions...,Créer des dimensions ...
 apps/erpnext/erpnext/education/doctype/student_group_creation_tool/student_group_creation_tool.py,Student Group Name is mandatory in row {0},Nom du Groupe d'Étudiant est obligatoire dans la ligne {0}
-DocType: Customer Credit Limit,Bypass credit limit_check,Contourner la limite de crédit_check
 DocType: Homepage,Products to be shown on website homepage,Produits destinés à être affichés sur la page d’accueil du site web
 DocType: HR Settings,Password Policy,Politique de mot de passe
 apps/erpnext/erpnext/setup/doctype/customer_group/customer_group.js,This is a root customer group and cannot be edited.,C’est un groupe de clients racine qui ne peut être modifié.
@@ -4794,6 +4801,7 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py,Row {0}: Advance against Customer must be credit,Ligne {0} : L’Avance du Client doit être un crédit
 DocType: Quality Meeting,Quality Meeting,Réunion de qualité
 apps/erpnext/erpnext/accounts/doctype/account/account.js,Non-Group to Group,Non-Groupe à Groupe
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,Définissez la série de noms pour {0} via Configuration&gt; Paramètres&gt; Série de noms.
 DocType: Employee,ERPNext User,Utilisateur ERPNext
 apps/erpnext/erpnext/education/doctype/student_group_creation_tool/student_group_creation_tool.py,Batch is mandatory in row {0},Le lot est obligatoire dans la ligne {0}
 DocType: Company,Default Buying Terms,Conditions d&#39;achat par défaut
@@ -5088,6 +5096,7 @@
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py,No {0} found for Inter Company Transactions.,Aucun {0} n&#39;a été trouvé pour les transactions inter-sociétés.
 DocType: Travel Itinerary,Rented Car,Voiture de location
 apps/erpnext/erpnext/public/js/hub/components/profile_dialog.js,About your Company,À propos de votre entreprise
+apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.js,Show Stock Ageing Data,Afficher les données sur le vieillissement des stocks
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py,Credit To account must be a Balance Sheet account,Le compte À Créditer doit être un compte de Bilan
 DocType: Donor,Donor,Donneur
 DocType: Global Defaults,Disable In Words,"Désactiver ""En Lettres"""
@@ -5102,8 +5111,10 @@
 DocType: Practitioner Schedule,Schedule Name,Nom du calendrier
 apps/erpnext/erpnext/regional/doctype/gstr_3b_report/gstr_3b_report.py,Please enter GSTIN and state for the Company Address {0},Veuillez saisir GSTIN et indiquer l&#39;adresse de la société {0}.
 DocType: Currency Exchange,For Buying,A l'achat
+apps/erpnext/erpnext/setup/default_energy_point_rules.py,On Purchase Order Submission,Sur soumission de commande
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js,Add All Suppliers,Ajouter tous les Fournisseurs
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py,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/accounts/doctype/pricing_rule/pricing_rule.js,Customer &gt; Customer Group &gt; Territory,Client&gt; Groupe de clients&gt; Territoire
 DocType: Tally Migration,Parties,Des soirées
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js,Browse BOM,Parcourir la LDM
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py,Secured Loans,Prêts Garantis
@@ -5135,6 +5146,7 @@
 apps/erpnext/erpnext/stock/doctype/item_alternative/item_alternative.py,Not allow to set alternative item for the item {0},Ne permet pas de définir un autre article pour l'article {0}
 apps/erpnext/erpnext/hr/doctype/leave_block_list/leave_block_list.py,Date is repeated,La Date est répétée
 apps/erpnext/erpnext/accounts/print_format/payment_receipt_voucher/payment_receipt_voucher.html,Authorized Signatory,Signataire Autorisé
+apps/erpnext/erpnext/education/doctype/instructor/instructor.py,Please setup Instructor Naming System in Education &gt; Education Settings,Veuillez configurer le système de nommage des instructeurs dans Education&gt; Paramètres de formation
 apps/erpnext/erpnext/regional/doctype/gstr_3b_report/gstr_3b_report.html,Net ITC Available(A) - (B),CTI net disponible (A) - (B)
 apps/erpnext/erpnext/education/doctype/fee_schedule/fee_schedule.js,Create Fees,Créer des Honoraires
 DocType: Project,Total Purchase Cost (via Purchase Invoice),Coût d'Achat Total (via Facture d'Achat)
@@ -5155,6 +5167,7 @@
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.js,Message Sent,Message Envoyé
 apps/erpnext/erpnext/accounts/doctype/account/account.py,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/assets/report/fixed_asset_register/fixed_asset_register.py,Vendor Name,Nom du vendeur
 DocType: Quiz Result,Wrong,Faux
 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é)
@@ -5398,6 +5411,7 @@
 DocType: Stock Settings,Auto Material Request,Demande de Matériel Automatique
 DocType: Woocommerce Settings,API consumer secret,Secret de consommateur API
 DocType: Delivery Note Item,Available Batch Qty at From Warehouse,Qté de Lot Disponible Depuis l'Entrepôt
+,Received Qty Amount,Quantité reçue Quantité
 DocType: Salary Slip,Gross Pay - Total Deduction - Loan Repayment,Salaire Brut - Déductions Totales - Remboursement de Prêt
 DocType: Bank Account,Last Integration Date,Dernière date d&#39;intégration
 DocType: Expense Claim,Expense Taxes and Charges,Frais et taxes
@@ -5856,6 +5870,8 @@
 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,Please select Qty against item {0},Veuillez sélectionner Qté par rapport à l&#39;élément {0}
+apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py,Latest Age,Dernier âge
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js,Transfer Material to Supplier,Transfert de matériel au fournisseur
 apps/erpnext/erpnext/hr/report/loan_repayment/loan_repayment.py,EMI,EMI
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py,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
@@ -5879,7 +5895,6 @@
 apps/erpnext/erpnext/hr/doctype/employee_benefit_application/employee_benefit_application.py,"An amount of {0} already claimed for the component {1},\
 						 set the amount equal or greater than {2}","Un montant de {0} a déjà été demandé pour le composant {1}, \ définir un montant égal ou supérieur à {2}"
 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,Avance sur salaire
 DocType: BOM Update Tool,The new BOM after replacement,La nouvelle LDM après remplacement
 ,Point of Sale,Point de Vente
@@ -5999,7 +6014,6 @@
 DocType: Purchase Order Item,Blanket Order Rate,Prix unitaire de commande avec limites
 ,Customer Ledger Summary,Récapitulatif client
 apps/erpnext/erpnext/hooks.py,Certification,Certification
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js,Are you sure you want to make debit note?,Êtes-vous sûr de vouloir établir une note de débit?
 DocType: Bank Guarantee,Clauses and Conditions,Clauses et conditions
 DocType: Serial No,Creation Document Type,Type de Document de Création
 DocType: Amazon MWS Settings,ES,ES
@@ -6037,8 +6051,6 @@
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py,Financial Services,Services Financiers
 DocType: Student Sibling,Student ID,Carte d'Étudiant
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.js,For Quantity must be greater than zero,Pour que la quantité soit supérieure à zéro
-apps/erpnext/erpnext/hr/doctype/employee_transfer/employee_transfer.py,"Please delete the Employee <a href=""#Form/Employee/{0}"">{0}</a>\
-					to cancel this document","Supprimez l&#39;employé <a href=""#Form/Employee/{0}"">{0}</a> \ pour annuler ce document."
 apps/erpnext/erpnext/config/projects.py,Types of activities for Time Logs,Types d'activités pour Journaux de Temps
 DocType: Opening Invoice Creation Tool,Sales,Ventes
 DocType: Stock Entry Detail,Basic Amount,Montant de Base
@@ -6117,6 +6129,7 @@
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py,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,Send Supplier Emails,Envoyer des Emails au Fournisseur
+DocType: Asset Movement,ACC-ASM-.YYYY.-,ACC-ASM-.YYYY.-
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py,"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
 apps/erpnext/erpnext/hr/doctype/employee_onboarding/employee_onboarding.py,Submit this to create the Employee record,Soumettre pour créer la fiche employé
@@ -6194,7 +6207,6 @@
 DocType: Sales Team,Contact No.,N° du Contact
 apps/erpnext/erpnext/templates/includes/cart/cart_address.html,Billing Address is same as Shipping Address,L&#39;adresse de facturation est identique à l&#39;adresse de livraison
 DocType: Bank Reconciliation,Payment Entries,Écritures de Paiement
-apps/erpnext/erpnext/erpnext_integrations/doctype/shopify_settings/shopify_settings.py,Access token or Shopify URL missing,Jeton d'accès ou URL Shopify manquants
 DocType: Location,Latitude,Latitude
 DocType: Work Order,Scrap Warehouse,Entrepôt de Rebut
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py,"Warehouse required at Row No {0}, please set default warehouse for the item {1} for the company {2}",Entrepôt requis à la ligne n ° {0}. Veuillez définir un entrepôt par défaut pour l'article {1} et la société {2}
@@ -6237,7 +6249,6 @@
 DocType: Job Offer Term,Value / Description,Valeur / Description
 apps/erpnext/erpnext/controllers/accounts_controller.py,"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
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js,Are you sure you want to make credit note?,Êtes-vous sûr de vouloir faire une note de crédit?
 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,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}.
@@ -6362,6 +6373,7 @@
 DocType: Purchase Invoice,Taxes and Charges Added,Taxes et Frais Additionnels
 apps/erpnext/erpnext/assets/doctype/asset/asset.py,Depreciation Row {0}: Next Depreciation Date cannot be before Available-for-use Date,Ligne d'amortissement {0}: La date d'amortissement suivante ne peut pas être antérieure à la date de mise en service
 ,Sales Funnel,Entonnoir de Vente
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Item Code &gt; Item Group &gt; Brand,Code d&#39;article&gt; Groupe d&#39;articles&gt; Marque
 apps/erpnext/erpnext/setup/doctype/company/company.py,Abbreviation is mandatory,Abréviation est obligatoire
 DocType: Project,Task Progress,Progression de la Tâche
 apps/erpnext/erpnext/templates/includes/navbar/navbar_items.html,Cart,Panier
@@ -6605,6 +6617,7 @@
 DocType: Employee Grade,Employee Grade,Echelon des employés
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py,Piecework,Travail à la Pièce
 DocType: GSTR 3B Report,June,juin
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Supplier &gt; Supplier Type,Fournisseur&gt; Type de fournisseur
 DocType: Share Balance,From No,Du No
 DocType: Shift Type,Early Exit Grace Period,Période de grâce de sortie anticipée
 DocType: Task,Actual Time (in Hours),Temps Réel (en Heures)
@@ -6890,6 +6903,7 @@
 DocType: Warehouse,Warehouse Name,Nom de l'Entrepôt
 DocType: Naming Series,Select Transaction,Sélectionner la Transaction
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py,Please enter Approving Role or Approving User,Veuillez entrer un Rôle Approbateur ou un Rôle Utilisateur
+apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.py,UOM Conversion factor ({0} -&gt; {1}) not found for item: {2},Facteur de conversion UOM ({0} -&gt; {1}) introuvable pour l&#39;élément: {2}
 apps/erpnext/erpnext/support/doctype/service_level_agreement/service_level_agreement.py,Service Level Agreement with Entity Type {0} and Entity {1} already exists.,L&#39;accord de niveau de service avec le type d&#39;entité {0} et l&#39;entité {1} existe déjà.
 DocType: Journal Entry,Write Off Entry,Écriture de Reprise
 DocType: BOM,Rate Of Materials Based On,Prix des Matériaux Basé sur
@@ -7080,6 +7094,7 @@
 DocType: Quality Inspection Reading,Quality Inspection Reading,Libellé du Contrôle de Qualité
 apps/erpnext/erpnext/stock/doctype/stock_settings/stock_settings.py,`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/stock/report/stock_balance/stock_balance.py,Earliest Age,Âge le plus précoce
 apps/erpnext/erpnext/utilities/user_progress.py,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.
 DocType: Quality Goal,Revision,Révision
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js,Healthcare Services,Services de santé
@@ -7122,6 +7137,7 @@
 apps/erpnext/erpnext/healthcare/doctype/patient_encounter/patient_encounter.js,Schedule Discharge,Décharge horaire
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py,Cheques and Deposits incorrectly cleared,Chèques et Dépôts incorrectement compensés
 DocType: Homepage Section Card,Homepage Section Card,Carte de section
+,Amount To Be Billed,Montant à facturer
 apps/erpnext/erpnext/accounts/doctype/account/account.py,Account {0}: You can not assign itself as parent account,Compte {0}: Vous ne pouvez pas assigner un compte comme son propre parent
 DocType: Purchase Invoice Item,Price List Rate,Taux de la Liste des Prix
 apps/erpnext/erpnext/utilities/activation.py,Create customer quotes,Créer les devis client
@@ -7174,6 +7190,7 @@
 DocType: Supplier Scorecard Criteria,Supplier Scorecard Criteria,Critères de Fiche d'Évaluation Fournisseur
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py,Please select Start Date and End Date for Item {0},Veuillez sélectionner la Date de Début et Date de Fin pour l'Article {0}
 DocType: Maintenance Schedule,MAT-MSH-.YYYY.-,MAT-MSH-YYYY.-
+,Amount to Receive,Montant à recevoir
 apps/erpnext/erpnext/education/doctype/student_group_creation_tool/student_group_creation_tool.py,Course is mandatory in row {0},Cours est obligatoire à la ligne {0}
 apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py,From date can not be greater than than To date,La date de début ne peut être supérieure à la date de fin
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py,To date cannot be before from date,La date de fin ne peut être antérieure à la date de début
@@ -7421,7 +7438,6 @@
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js,BOM and Manufacturing Quantity are required,LDM et quantité de production sont nécessaires
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js,Ageing Range 2,Balance Agée 2
 DocType: SG Creation Tool Course,Max Strength,Force Max
-apps/erpnext/erpnext/accounts/doctype/account/account.py,"Account {0} already exists in child company {1}. The following fields have different values, they should be same:<ul><li>{2}</li></ul>","Le compte {0} existe déjà dans la société enfant {1}. Les champs suivants ont des valeurs différentes, ils doivent être identiques: <ul><li> {2} </li></ul>"
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py,Installing presets,Installation des réglages
 DocType: Fee Schedule,EDU-FSH-.YYYY.-,EDU-FSH-.AAAA.-
 apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js,No Delivery Note selected for Customer {},Aucun bon de livraison sélectionné pour le client {}
@@ -7629,6 +7645,7 @@
 DocType: Delivery Note,Print Without Amount,Imprimer Sans Montant
 apps/erpnext/erpnext/accounts/report/asset_depreciation_ledger/asset_depreciation_ledger.py,Depreciation Date,Date d’Amortissement
 ,Work Orders in Progress,Ordres de travail en cours
+DocType: Customer Credit Limit,Bypass Credit Limit Check,Contourner la vérification de la limite de crédit
 DocType: Issue,Support Team,Équipe de Support
 apps/erpnext/erpnext/stock/report/batch_item_expiry_status/batch_item_expiry_status.py,Expiry (In Days),Expiration (En Jours)
 DocType: Appraisal,Total Score (Out of 5),Score Total (sur 5)
@@ -7812,6 +7829,7 @@
 DocType: Sales Invoice,Customer GSTIN,GSTIN Client
 DocType: Crop Cycle,List of diseases detected on the field. When selected it'll automatically add a list of tasks to deal with the disease ,"Liste des maladies détectées sur le terrain. Une fois sélectionné, il ajoutera automatiquement une liste de tâches pour faire face à la maladie"
 apps/erpnext/erpnext/manufacturing/page/bom_comparison_tool/bom_comparison_tool.js,BOM 1,BOM 1
+apps/erpnext/erpnext/assets/report/fixed_asset_register/fixed_asset_register.py,Asset Id,ID d&#39;actif
 apps/erpnext/erpnext/healthcare/doctype/healthcare_service_unit/healthcare_service_unit.js,This is a root healthcare service unit and cannot be edited.,Ceci est une unité de service de soins de santé racine et ne peut pas être édité.
 DocType: Asset Repair,Repair Status,État de réparation
 apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.js,"Requested Qty: Quantity requested for purchase, but not ordered.","Demandé Quantité: Quantité demandée pour l'achat , mais pas ordonné ."
diff --git a/erpnext/translations/gu.csv b/erpnext/translations/gu.csv
index 6c39590..d1d98ac 100644
--- a/erpnext/translations/gu.csv
+++ b/erpnext/translations/gu.csv
@@ -285,7 +285,6 @@
 DocType: Loan,Repay Over Number of Periods,ચુકવણી બોલ કાળ સંખ્યા
 apps/erpnext/erpnext/manufacturing/report/bom_stock_report/bom_stock_report.py,Quantity to Produce can not be less than Zero,નિર્માણની માત્રા શૂન્યથી ઓછી હોઈ શકે નહીં
 DocType: Stock Entry,Additional Costs,વધારાના ખર્ચ
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Customer &gt; Customer Group &gt; Territory,ગ્રાહક&gt; ગ્રાહક જૂથ&gt; ક્ષેત્ર
 apps/erpnext/erpnext/accounts/doctype/account/account.py,Account with existing transaction can not be converted to group.,હાલની વ્યવહાર સાથે એકાઉન્ટ જૂથ રૂપાંતરિત કરી શકતા નથી.
 DocType: Lead,Product Enquiry,ઉત્પાદન ઇન્કવાયરી
 DocType: Education Settings,Validate Batch for Students in Student Group,વિદ્યાર્થી જૂથમાં વિદ્યાર્થીઓ માટે બેચ માન્ય
@@ -580,6 +579,7 @@
 DocType: Healthcare Settings,Create documents for sample collection,નમૂના સંગ્રહ માટે દસ્તાવેજો બનાવો
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py,Payment against {0} {1} cannot be greater than Outstanding Amount {2},સામે ચુકવણી {0} {1} બાકી રકમ કરતાં વધારે ન હોઈ શકે {2}
 apps/erpnext/erpnext/patches/v11_0/add_healthcare_service_unit_tree_root.py,All Healthcare Service Units,બધા હેલ્થકેર સેવા એકમો
+apps/erpnext/erpnext/setup/default_energy_point_rules.py,On Converting Opportunity,પરિવર્તનશીલ તકો પર
 DocType: Bank Account,Address HTML,સરનામું HTML
 DocType: Lead,Mobile No.,મોબાઇલ નંબર
 apps/erpnext/erpnext/selling/doctype/pos_closing_voucher/closing_voucher_details.html,Mode of Payments,ચૂકવણીની પદ્ધતિ
@@ -644,7 +644,6 @@
 DocType: Accounting Dimension,Dimension Name,પરિમાણ નામ
 apps/erpnext/erpnext/healthcare/setup.py,Resistant,રેઝિસ્ટન્ટ
 apps/erpnext/erpnext/hotels/doctype/hotel_room_reservation/hotel_room_reservation.py,Please set Hotel Room Rate on {},{} પર હોટેલ રૂમ રેટ સેટ કરો
-apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py,Please setup numbering series for Attendance via Setup &gt; Numbering Series,કૃપા કરીને સેટઅપ&gt; નંબરિંગ સિરીઝ દ્વારા હાજરી માટે નંબરિંગ શ્રેણી સેટ કરો
 DocType: Journal Entry,Multi Currency,મલ્ટી કરન્સી
 DocType: Bank Statement Transaction Invoice Item,Invoice Type,ભરતિયું પ્રકાર
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py,Valid from date must be less than valid upto date,તારીખથી માન્ય માન્ય તારીખથી ઓછી હોવી જોઈએ
@@ -755,6 +754,7 @@
 apps/erpnext/erpnext/accounts/page/pos/pos.js,Create a new Customer,નવી ગ્રાહક બનાવવા
 apps/erpnext/erpnext/non_profit/report/expiring_memberships/expiring_memberships.py,Expiring On,સમાપ્તિ પર
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,"If multiple Pricing Rules continue to prevail, users are asked to set Priority manually to resolve conflict.","બહુવિધ કિંમતના નિયમોમાં જીતવું ચાલુ હોય, વપરાશકર્તાઓ તકરાર ઉકેલવા માટે જાતે અગ્રતા સુયોજિત કરવા માટે કહેવામાં આવે છે."
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js,Purchase Return,ખરીદી પરત
 apps/erpnext/erpnext/utilities/activation.py,Create Purchase Orders,ખરીદી ઓર્ડર બનાવો
 ,Purchase Register,ખરીદી રજીસ્ટર
 apps/erpnext/erpnext/healthcare/doctype/patient/patient.py,Patient not found,પેશન્ટ મળ્યું નથી
@@ -769,7 +769,6 @@
 DocType: Location,Area UOM,વિસ્તાર UOM
 apps/erpnext/erpnext/manufacturing/doctype/workstation/workstation.py,Workstation is closed on the following dates as per Holiday List: {0},વર્કસ્ટેશન રજા યાદી મુજબ નીચેની તારીખો પર બંધ છે: {0}
 apps/erpnext/erpnext/selling/page/sales_funnel/sales_funnel.py,Opportunities,તકો
-apps/erpnext/erpnext/www/all-products/index.html,Clear filters,ગાળકો સાફ કરો
 DocType: Lab Test Template,Single,એક
 DocType: Compensatory Leave Request,Work From Date,તારીખથી કામ
 DocType: Salary Slip,Total Loan Repayment,કુલ લોન ચુકવણી
@@ -812,6 +811,7 @@
 DocType: Account,Old Parent,ઓલ્ડ પિતૃ
 apps/erpnext/erpnext/education/doctype/program_enrollment_tool/program_enrollment_tool.py,Mandatory field - Academic Year,ફરજિયાત ફીલ્ડ - શૈક્ષણિક વર્ષ
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py,{0} {1} is not associated with {2} {3},{0} {1} {2} {3} સાથે સંકળાયેલ નથી
+DocType: Opportunity,Converted By,દ્વારા રૂપાંતરિત
 apps/erpnext/erpnext/public/js/hub/components/ReviewArea.vue,You need to login as a Marketplace User before you can add any reviews.,તમે કોઈપણ સમીક્ષાઓ ઉમેરી શકો તે પહેલાં તમારે માર્કેટપ્લેસ વપરાશકર્તા તરીકે લ loginગિન કરવાની જરૂર છે.
 apps/erpnext/erpnext/manufacturing/doctype/job_card/job_card.py,Row {0} : Operation is required against the raw material item {1},રો {0}: કાચો સામગ્રી આઇટમ {1} સામે ઓપરેશન જરૂરી છે
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py,Please set default payable account for the company {0},કંપની માટે મૂળભૂત ચૂકવવાપાત્ર એકાઉન્ટ સેટ કરો {0}
@@ -837,6 +837,8 @@
 DocType: BOM,Work Order,વર્ક ઓર્ડર
 DocType: Sales Invoice,Total Qty,કુલ Qty
 apps/erpnext/erpnext/education/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py,Guardian2 Email ID,Guardian2 ઇમેઇલ આઈડી
+apps/erpnext/erpnext/hr/doctype/employee_transfer/employee_transfer.py,"Please delete the Employee <a href=""#Form/Employee/{0}"">{0}</a>\
+					to cancel this document","કૃપા કરીને આ દસ્તાવેજ રદ કરવા માટે કર્મચારી <a href=""#Form/Employee/{0}"">{0}</a> delete કા deleteી નાખો"
 DocType: Item,Show in Website (Variant),વેબસાઇટ બતાવો (variant)
 DocType: Employee,Health Concerns,આરોગ્ય ચિંતા
 DocType: Payroll Entry,Select Payroll Period,પગારપત્રક અવધિ પસંદ
@@ -895,7 +897,6 @@
 DocType: Codification Table,Codification Table,કોડીકરણ કોષ્ટક
 DocType: Timesheet Detail,Hrs,કલાકે
 apps/erpnext/erpnext/manufacturing/page/bom_comparison_tool/bom_comparison_tool.js,Changes in {0},{0} માં ફેરફાર
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js,Please select Company,કંપની પસંદ કરો
 DocType: Employee Skill,Employee Skill,કર્મચારી કૌશલ્ય
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.js,Difference Account,તફાવત એકાઉન્ટ
 DocType: Pricing Rule,Discount on Other Item,અન્ય વસ્તુ પર ડિસ્કાઉન્ટ
@@ -962,6 +963,7 @@
 DocType: BOM,Operating Cost,સંચાલન ખર્ચ
 DocType: Crop,Produced Items,ઉત્પાદિત આઈટમ્સ
 DocType: Bank Statement Transaction Entry,Match Transaction to Invoices,ઇનવોઇસ માટે ટ્રાન્ઝેક્શન મેચ કરો
+apps/erpnext/erpnext/erpnext_integrations/exotel_integration.py,Error in Exotel incoming call,એક્સ્ટેલ ઇનકમિંગ ક callલમાં ભૂલ
 DocType: Sales Order Item,Gross Profit,કુલ નફો
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js,Unblock Invoice,ઇન્વોઇસને અનાવરોધિત કરો
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py,Increment cannot be 0,વૃદ્ધિ 0 ન હોઈ શકે
@@ -1171,6 +1173,7 @@
 DocType: Activity Cost,Activity Type,પ્રવૃત્તિ પ્રકાર
 DocType: Request for Quotation,For individual supplier,વ્યક્તિગત સપ્લાયર માટે
 DocType: BOM Operation,Base Hour Rate(Company Currency),આધાર કલાક રેટ (કંપની ચલણ)
+,Qty To Be Billed,બીટી બરાબર ક્વોટી
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py,Delivered Amount,વિતરિત રકમ
 apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.js,Reserved Qty for Production: Raw materials quantity to make manufacturing items.,ઉત્પાદન માટે અનામત ક્વોટી: ઉત્પાદન વસ્તુઓ બનાવવા માટે કાચી સામગ્રીનો જથ્થો.
 DocType: Loyalty Point Entry Redemption,Redemption Date,રીડેમ્પશન તારીખ
@@ -1288,7 +1291,7 @@
 DocType: Sales Invoice,Commission Rate (%),કમિશન દર (%)
 apps/erpnext/erpnext/education/doctype/student_group/student_group.py,Please select Program,પસંદ કરો કાર્યક્રમ
 DocType: Project,Estimated Cost,અંદાજીત કિંમત
-DocType: Request for Quotation,Link to material requests,સામગ્રી વિનંતીઓ લિંક
+DocType: Supplier Quotation,Link to material requests,સામગ્રી વિનંતીઓ લિંક
 apps/erpnext/erpnext/public/js/hub/pages/Publish.vue,Publish,પ્રકાશિત કરો
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py,Aerospace,એરોસ્પેસ
 ,Fichier des Ecritures Comptables [FEC],ફિચિયર ડેસ ઇક્ચિટર્સ કૉમ્પેટબલ્સ [એફઇસી]
@@ -1301,6 +1304,7 @@
 apps/erpnext/erpnext/utilities/transaction_base.py,Invalid Posting Time,અમાન્ય પોસ્ટિંગ ટાઇમ
 DocType: Salary Component,Condition and Formula,શરત અને ફોર્મ્યુલા
 DocType: Lead,Campaign Name,ઝુંબેશ નામ
+apps/erpnext/erpnext/setup/default_energy_point_rules.py,On Task Completion,કાર્ય પૂર્ણ કરવા પર
 apps/erpnext/erpnext/hr/doctype/compensatory_leave_request/compensatory_leave_request.py,There is no leave period in between {0} and {1},{0} અને {1} ની વચ્ચે કોઈ રજા અવધિ નથી
 DocType: Fee Validity,Healthcare Practitioner,હેલ્થકેર પ્રેક્ટીશનર
 DocType: Hotel Room,Capacity,ક્ષમતા
@@ -1642,7 +1646,6 @@
 DocType: Quality Feedback Template,Quality Feedback Template,ગુણવત્તા પ્રતિસાદ Templateાંચો
 apps/erpnext/erpnext/config/education.py,LMS Activity,એલએમએસ પ્રવૃત્તિ
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py,Internet Publishing,ઈન્ટરનેટ પબ્લિશિંગ
-DocType: Prescription Duration,Number,સંખ્યા
 apps/erpnext/erpnext/accounts/doctype/opening_invoice_creation_tool/opening_invoice_creation_tool.js,Creating {0} Invoice,{0} ઇન્વૉઇસ બનાવી રહ્યું છે
 DocType: Medical Code,Medical Code Standard,મેડિકલ કોડ સ્ટાન્ડર્ડ
 DocType: Soil Texture,Clay Composition (%),ક્લે રચના (%)
@@ -1717,6 +1720,7 @@
 DocType: Support Settings,Get Started Sections,શરૂ વિભાગો
 DocType: Lead,CRM-LEAD-.YYYY.-,સીઆરએમ- LEAD -YYYY.-
 DocType: Invoice Discounting,Sanctioned,મંજૂર
+,Base Amount,આધાર રકમ
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.js,Total Contribution Amount: {0},કુલ યોગદાન રકમ: {0}
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py,Row #{0}: Please specify Serial No for Item {1},ROW # {0}: વસ્તુ માટે કોઈ સીરીયલ સ્પષ્ટ કરો {1}
 DocType: Payroll Entry,Salary Slips Submitted,પગાર સ્લિપ સબમિટ
@@ -1934,6 +1938,7 @@
 apps/erpnext/erpnext/utilities/user_progress.py,List a few of your suppliers. They could be organizations or individuals.,તમારા સપ્લાયર્સ થોડા યાદી આપે છે. તેઓ સંસ્થાઓ અથવા વ્યક્તિઓ હોઈ શકે છે.
 DocType: Accounting Dimension,Dimension Defaults,ડાયમેન્શન ડિફોલ્ટ્સ
 apps/erpnext/erpnext/crm/report/prospects_engaged_but_not_converted/prospects_engaged_but_not_converted.js,Minimum Lead Age (Days),ન્યુનત્તમ લીડ યુગ (દિવસો)
+apps/erpnext/erpnext/assets/report/fixed_asset_register/fixed_asset_register.py,Available For Use Date,ઉપયોગ તારીખ માટે ઉપલબ્ધ
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py,All BOMs,બધા BOMs
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js,Create Inter Company Journal Entry,ઇન્ટર કંપની જર્નલ એન્ટ્રી બનાવો
 DocType: Company,Parent Company,પિતૃ કંપની
@@ -1997,6 +2002,7 @@
 ,IRS 1099,આઈઆરએસ 1099
 DocType: Salary Slip,Leave Without Pay,પગાર વિના છોડો
 DocType: Payment Request,Outward,બાહ્ય
+apps/erpnext/erpnext/setup/default_energy_point_rules.py,On {0} Creation,{0} બનાવટ પર
 apps/erpnext/erpnext/regional/doctype/gstr_3b_report/gstr_3b_report.html,State/UT Tax,રાજ્ય / યુ.ટી. ટેક્સ
 ,Trial Balance for Party,પાર્ટી માટે ટ્રાયલ બેલેન્સ
 ,Gross and Net Profit Report,કુલ અને ચોખ્ખો નફો અહેવાલ
@@ -2110,6 +2116,7 @@
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js,Make Stock Entry,સ્ટોક એન્ટ્રી કરો
 DocType: Hotel Room Reservation,Hotel Reservation User,હોટેલ રિઝર્વેશન યુઝર
 apps/erpnext/erpnext/projects/doctype/project/project.js,Set Status,સ્થિતિ સેટ કરો
+apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py,Please setup numbering series for Attendance via Setup &gt; Numbering Series,કૃપા કરીને સેટઅપ&gt; નંબરિંગ સિરીઝ દ્વારા હાજરી માટે નંબરિંગ શ્રેણી સેટ કરો
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py,Please select prefix first,પ્રથમ ઉપસર્ગ પસંદ કરો
 DocType: Contract,Fulfilment Deadline,સમાપ્તિની છેલ્લી તારીખ
 apps/erpnext/erpnext/public/js/hub/pages/Home.vue,Near you,તમારી નજીક
@@ -2125,6 +2132,7 @@
 DocType: Announcement,All Students,બધા વિદ્યાર્થીઓ
 apps/erpnext/erpnext/assets/doctype/asset/asset.py,Item {0} must be a non-stock item,વસ્તુ {0} નોન-સ્ટોક વસ્તુ હોઇ જ જોઈએ
 apps/erpnext/erpnext/stock/doctype/batch/batch.js,View Ledger,જુઓ ખાતાવહી
+DocType: Cost Center,Lft,Lft
 DocType: Grading Scale,Intervals,અંતરાલો
 DocType: Bank Statement Transaction Entry,Reconciled Transactions,સુવ્યવસ્થિત વ્યવહારો
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py,Earliest,જુનું
@@ -2239,6 +2247,7 @@
 apps/erpnext/erpnext/hr/doctype/employee_benefit_application/employee_benefit_application.py,As per your assigned Salary Structure you cannot apply for benefits,તમારા સોંપાયેલ પગાર માળખું મુજબ તમે લાભ માટે અરજી કરી શકતા નથી
 apps/erpnext/erpnext/stock/doctype/item/item.py,Website Image should be a public file or website URL,વેબસાઇટ છબી જાહેર ફાઈલ અથવા વેબસાઇટ URL હોવો જોઈએ
 DocType: Purchase Invoice Item,BOM,BOM
+apps/erpnext/erpnext/stock/doctype/item/item.py,Duplicate entry in Manufacturers table,ઉત્પાદકોના કોષ્ટકમાં ડુપ્લિકેટ પ્રવેશ
 apps/erpnext/erpnext/setup/doctype/item_group/item_group.js,This is a root item group and cannot be edited.,આ રુટ વસ્તુ જૂથ છે અને સંપાદિત કરી શકાતી નથી.
 apps/erpnext/erpnext/accounts/doctype/account/account.js,Merge,મર્જ કરો
 DocType: Journal Entry Account,Purchase Order,ખરીદી ઓર્ડર
@@ -2380,7 +2389,6 @@
 DocType: Asset,Depreciation Schedules,અવમૂલ્યન શેડ્યુલ
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.js,Create Sales Invoice,સેલ્સ ઇન્વoiceઇસ બનાવો
 apps/erpnext/erpnext/regional/doctype/gstr_3b_report/gstr_3b_report.html,Ineligible ITC,અયોગ્ય આઇટીસી
-apps/erpnext/erpnext/erpnext_integrations/doctype/shopify_settings/shopify_settings.py,"Support for public app is deprecated. Please setup private app, for more details refer user manual","સાર્વજનિક એપ્લિકેશન માટે સમર્થન દૂર કરવામાં આવ્યું છે. કૃપા કરીને ખાનગી એપ્લિકેશન સેટ કરો, વધુ વિગતો માટે વપરાશકર્તા માર્ગદર્શિકા નો સંદર્ભ લો"
 DocType: Task,Dependent Tasks,આશ્રિત કાર્યો
 apps/erpnext/erpnext/regional/report/gstr_1/gstr_1.py,Following accounts might be selected in GST Settings:,નીચેના એકાઉન્ટ્સ જીએસટી સેટિંગ્સમાં પસંદ કરી શકાય છે:
 apps/erpnext/erpnext/manufacturing/report/bom_stock_report/bom_stock_report.js,Quantity to Produce,ઉત્પન્ન કરવાની માત્રા
@@ -2628,6 +2636,7 @@
 DocType: Water Analysis,Container,કન્ટેઈનર
 apps/erpnext/erpnext/regional/report/gstr_1/gstr_1.py,Please set valid GSTIN No. in Company Address,કૃપા કરીને કંપની સરનામાંમાં માન્ય જીએસટીઆઇએન નંબર સેટ કરો
 apps/erpnext/erpnext/education/utils.py,Student {0} - {1} appears Multiple times in row {2} & {3},વિદ્યાર્થી {0} - {1} પંક્તિ માં ઘણી વખત દેખાય છે {2} અને {3}
+apps/erpnext/erpnext/selling/doctype/customer/customer.py,Following fields are mandatory to create address:,સરનામું બનાવવા માટે નીચેના ક્ષેત્રો ફરજિયાત છે:
 DocType: Item Alternative,Two-way,બે-રસ્તો
 DocType: Item,Manufacturers,ઉત્પાદકો
 ,Employee Billing Summary,કર્મચારીનું બિલિંગ સારાંશ
@@ -2701,9 +2710,9 @@
 DocType: Employee,HR-EMP-,એચઆર-ઇએમપી-
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py,User {0} doesn't have any default POS Profile. Check Default at Row {1} for this User.,વપરાશકર્તા {0} પાસે કોઇપણ મૂળભૂત POS પ્રોફાઇલ નથી. આ વપરાશકર્તા માટે રો {1} પર ડિફોલ્ટ તપાસો
 DocType: Quality Meeting Minutes,Quality Meeting Minutes,ગુણવત્તા મીટિંગ મિનિટ
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Supplier &gt; Supplier Type,સપ્લાયર&gt; સપ્લાયર પ્રકાર
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py,Employee Referral,કર્મચારી રેફરલ
 DocType: Student Group,Set 0 for no limit,કોઈ મર્યાદા માટે 0 સેટ
+DocType: Cost Center,rgt,rgt
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py,The day(s) on which you are applying for leave are holidays. You need not apply for leave.,તમે રજા માટે અરજી છે કે જેના પર દિવસ (ઓ) રજાઓ છે. તમે રજા માટે અરજી જરૂર નથી.
 DocType: Customer,Primary Address and Contact Detail,પ્રાથમિક સરનામું અને સંપર્ક વિગતવાર
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.js,Resend Payment Email,ચુકવણી ઇમેઇલ ફરી મોકલો
@@ -2809,7 +2818,6 @@
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py,Against Supplier Invoice {0} dated {1},પુરવઠોકર્તા સામે ભરતિયું {0} ના રોજ {1}
 DocType: Customer,Default Price List,ડિફૉલ્ટ ભાવ યાદી
 apps/erpnext/erpnext/assets/doctype/asset/asset.py,Asset Movement record {0} created,એસેટ ચળવળ રેકોર્ડ {0} બનાવવામાં
-apps/erpnext/erpnext/utilities/page/leaderboard/leaderboard.js,No items found.,કોઈ આઇટમ્સ મળી નથી
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py,You cannot delete Fiscal Year {0}. Fiscal Year {0} is set as default in Global Settings,તમે કાઢી શકતા નથી ફિસ્કલ વર્ષ {0}. ફિસ્કલ વર્ષ {0} વૈશ્વિક સેટિંગ્સ મૂળભૂત તરીકે સુયોજિત છે
 DocType: Share Transfer,Equity/Liability Account,ઇક્વિટી / જવાબદારી એકાઉન્ટ
 apps/erpnext/erpnext/setup/doctype/customer_group/customer_group.py,A customer with the same name already exists,સમાન નામની ગ્રાહક પહેલેથી હાજર છે
@@ -2825,6 +2833,7 @@
 apps/erpnext/erpnext/selling/doctype/customer/customer.py,Credit limit has been crossed for customer {0} ({1}/{2}),{0} ({1} / {2}) માટે ગ્રાહકની મર્યાદા ઓળંગી ગઈ છે.
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py,Customer required for 'Customerwise Discount',&#39;Customerwise ડિસ્કાઉન્ટ&#39; માટે જરૂરી ગ્રાહક
 apps/erpnext/erpnext/config/accounting.py,Update bank payment dates with journals.,જર્નલો સાથે બેંક ચુકવણી તારીખો અપડેટ કરો.
+,Billed Qty,બિલ ક્વોટી
 apps/erpnext/erpnext/stock/doctype/item/item_dashboard.py,Pricing,પ્રાઇસીંગ
 DocType: Employee,Attendance Device ID (Biometric/RF tag ID),હાજરી ઉપકરણ ID (બાયોમેટ્રિક / આરએફ ટ tagગ ID)
 DocType: Quotation,Term Details,શબ્દ વિગતો
@@ -2846,6 +2855,7 @@
 DocType: Share Transfer,Asset Account,એસેટ એકાઉન્ટ
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js,New release date should be in the future,નવી પ્રકાશન તારીખ ભવિષ્યમાં હોવી જોઈએ
 DocType: Purchase Invoice,End date of current invoice's period,વર્તમાન ભરતિયું માતાનો સમયગાળા ઓવરને અંતે તારીખ
+apps/erpnext/erpnext/hr/doctype/employee/employee.py,Please setup Employee Naming System in Human Resource &gt; HR Settings,કૃપા કરીને માનવ સંસાધન&gt; એચઆર સેટિંગ્સમાં કર્મચારી નામકરણ સિસ્ટમ સેટ કરો
 DocType: Lab Test,Technician Name,ટેક્નિશિયન નામ
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py,"Cannot ensure delivery by Serial No as \
 					Item {0} is added with and without Ensure Delivery by \
@@ -2853,6 +2863,7 @@
 DocType: Accounts Settings,Unlink Payment on Cancellation of Invoice,ભરતિયું રદ પર ચુકવણી નાપસંદ
 DocType: Bank Reconciliation,From Date,તારીખ થી
 apps/erpnext/erpnext/hr/doctype/vehicle_log/vehicle_log.py,Current Odometer reading entered should be greater than initial Vehicle Odometer {0},વર્તમાન ઑડોમીટર વાંચન દાખલ પ્રારંભિક વાહન ઑડોમીટર કરતાં મોટી હોવી જોઈએ {0}
+,Purchase Order Items To Be Received or Billed,પ્રાપ્ત કરવા અથવા બીલ કરવા માટે ખરીદી ઓર્ડર આઇટમ્સ
 DocType: Restaurant Reservation,No Show,બતાવો નહીં
 apps/erpnext/erpnext/regional/india/utils.py,You must be a registered supplier to generate e-Way Bill,ઇ-વે બિલ જનરેટ કરવા માટે તમારે નોંધાયેલ સપ્લાયર હોવું આવશ્યક છે
 DocType: Shipping Rule Country,Shipping Rule Country,શીપીંગ નિયમ દેશ
@@ -2893,6 +2904,7 @@
 apps/erpnext/erpnext/templates/generators/item/item_add_to_cart.html,View in Cart,કાર્ટ માં જુઓ
 DocType: Employee Checkin,Shift Actual Start,પાળી વાસ્તવિક શરૂઆત
 DocType: Tally Migration,Is Day Book Data Imported,ઇઝ ડે બુક ડેટા ઇમ્પોર્ટેડ
+,Purchase Order Items To Be Received or Billed1,પ્રાપ્ત કરવા અથવા બીલ કરવા માટે ખરીદી ઓર્ડર આઇટમ્સ
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py,Marketing Expenses,માર્કેટિંગ ખર્ચ
 ,Item Shortage Report,વસ્તુ અછત રિપોર્ટ
 DocType: Bank Transaction Payments,Bank Transaction Payments,બેંક ટ્રાંઝેક્શન ચુકવણીઓ
@@ -3252,6 +3264,7 @@
 DocType: Homepage Section,Section Cards,વિભાગ કાર્ડ્સ
 ,Campaign Efficiency,ઝુંબેશ કાર્યક્ષમતા
 DocType: Discussion,Discussion,ચર્ચા
+apps/erpnext/erpnext/setup/default_energy_point_rules.py,On Sales Order Submission,સેલ્સ ઓર્ડર સબમિશન પર
 DocType: Bank Transaction,Transaction ID,ટ્રાન્ઝેક્શન આઈડી
 DocType: Payroll Entry,Deduct Tax For Unsubmitted Tax Exemption Proof,વણઉકેલાયેલી કર મુક્તિ પ્રૂફ માટે કર કપાત કરો
 DocType: Volunteer,Anytime,કોઈપણ સમયે
@@ -3259,7 +3272,6 @@
 DocType: Employee Tax Exemption Proof Submission,Employee Tax Exemption Proof Submission,કર્મચારી કર મુક્તિ પ્રૂફ ભર્યા
 DocType: Patient,Surgical History,સર્જિકલ હિસ્ટ્રી
 DocType: Bank Statement Settings Item,Mapped Header,મેપ થયેલ મથાળું
-apps/erpnext/erpnext/hr/doctype/employee/employee.py,Please setup Employee Naming System in Human Resource &gt; HR Settings,કૃપા કરીને માનવ સંસાધન&gt; એચઆર સેટિંગ્સમાં કર્મચારી નામકરણ સિસ્ટમ સેટ કરો
 DocType: Employee,Resignation Letter Date,રાજીનામું પત્ર તારીખ
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Pricing Rules are further filtered based on quantity.,પ્રાઇસીંગ નિયમો વધુ જથ્થો પર આધારિત ફિલ્ટર કરવામાં આવે છે.
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py,Please set the Date Of Joining for employee {0},કર્મચારી માટે જોડાયા તારીખ સેટ કરો {0}
@@ -3273,6 +3285,7 @@
 DocType: Bank Statement Settings,Mapped Items,મેપ કરેલ આઇટમ્સ
 DocType: Amazon MWS Settings,IT,આઇટી
 DocType: Chapter,Chapter,પ્રકરણ
+,Fixed Asset Register,સ્થિર સંપત્તિ રજિસ્ટર
 apps/erpnext/erpnext/utilities/user_progress.py,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,Select BOM and Qty for Production,ઉત્પાદન માટે BOM અને ક્વાલિટી પસંદ કરો
@@ -3959,7 +3972,6 @@
 DocType: Project User,Project Status,પ્રોજેક્ટ સ્થિતિ
 DocType: UOM,Check this to disallow fractions. (for Nos),અપૂર્ણાંક નામંજૂર કરવા માટે આ તપાસો. (સંખ્યા માટે)
 DocType: Student Admission Program,Naming Series (for Student Applicant),સિરીઝ નામકરણ (વિદ્યાર્થી અરજદાર માટે)
-apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.py,UOM Conversion factor ({0} -&gt; {1}) not found for item: {2},આઇટમ માટે યુઓએમ કન્વર્ઝન પરિબળ ({0} -&gt; {1}) મળ્યું નથી: {2}
 apps/erpnext/erpnext/hr/doctype/retention_bonus/retention_bonus.py,Bonus Payment Date cannot be a past date,બોનસ ચુકવણી તારીખ એક ભૂતકાળની તારીખ હોઈ શકતી નથી
 DocType: Travel Request,Copy of Invitation/Announcement,આમંત્રણ / જાહેરાતની નકલ
 DocType: Practitioner Service Unit Schedule,Practitioner Service Unit Schedule,પ્રેક્ટિશનર સેવા એકમ સૂચિ
@@ -4180,7 +4192,6 @@
 DocType: Journal Entry,Accounting Entries,હિસાબી પ્રવેશો
 DocType: Job Card Time Log,Job Card Time Log,જોબ કાર્ડનો સમય લ Logગ
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,"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; ક્ષેત્રમાં મેળવવામાં આવશે."
-apps/erpnext/erpnext/education/doctype/instructor/instructor.py,Please setup Instructor Naming System in Education &gt; Education Settings,કૃપા કરીને શિક્ષણ&gt; શિક્ષણ સેટિંગ્સમાં પ્રશિક્ષક નામકરણ સિસ્ટમ સેટ કરો
 DocType: Journal Entry,Paid Loan,પેઇડ લોન
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py,Duplicate Entry. Please check Authorization Rule {0},એન્ટ્રી ડુપ્લિકેટ. કૃપા કરીને તપાસો અધિકૃતતા નિયમ {0}
 DocType: Journal Entry Account,Reference Due Date,સંદર્ભની તારીખ
@@ -4197,7 +4208,6 @@
 apps/erpnext/erpnext/templates/pages/projects.html,No time sheets,કોઈ સમય શીટ્સ
 DocType: GoCardless Mandate,GoCardless Customer,GoCardless ગ્રાહક
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py,Leave Type {0} cannot be carry-forwarded,{0} હાથ ધરવા આગળ કરી શકાતી નથી પ્રકાર છોડો
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Item Code &gt; Item Group &gt; Brand,આઇટમ કોડ&gt; આઇટમ જૂથ&gt; બ્રાન્ડ
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py,Maintenance Schedule is not generated for all the items. Please click on 'Generate Schedule',જાળવણી સુનિશ્ચિત બધી વસ્તુઓ માટે પેદા નથી. &#39;બનાવો સૂચિ&#39; પર ક્લિક કરો
 ,To Produce,પેદા કરવા માટે
 DocType: Leave Encashment,Payroll,પગારપત્રક
@@ -4311,7 +4321,6 @@
 DocType: Stock Ledger Entry,Actual Qty After Transaction,સોદા બાદ વાસ્તવિક Qty
 ,Pending SO Items For Purchase Request,ખરીદી વિનંતી તેથી વસ્તુઓ બાકી
 apps/erpnext/erpnext/education/doctype/student_admission/student_admission.py,Student Admissions,વિદ્યાર્થી પ્રવેશ
-apps/erpnext/erpnext/accounts/party.py,{0} {1} is disabled,{0} {1} અક્ષમ છે
 DocType: Supplier,Billing Currency,બિલિંગ કરન્સી
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py,Extra Large,બહુ્ મોટુ
 DocType: Loan,Loan Application,લોન અરજી
@@ -4388,7 +4397,6 @@
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py,Only Leave Applications with status 'Approved' and 'Rejected' can be submitted,માત્ર છોડો સ્થિતિ સાથે કાર્યક્રમો &#39;માન્ય&#39; અને &#39;નકારી કાઢ્યો સબમિટ કરી શકો છો
 apps/erpnext/erpnext/accounts/doctype/accounting_dimension/accounting_dimension.py,Creating Dimensions...,પરિમાણો બનાવી રહ્યાં છે ...
 apps/erpnext/erpnext/education/doctype/student_group_creation_tool/student_group_creation_tool.py,Student Group Name is mandatory in row {0},વિદ્યાર્થી જૂથ નામ પંક્તિ માં ફરજિયાત છે {0}
-DocType: Customer Credit Limit,Bypass credit limit_check,બાયપાસ ક્રેડિટ લિમિટ_ચેક
 DocType: Homepage,Products to be shown on website homepage,પ્રોડક્ટ્સ વેબસાઇટ હોમપેજ પર બતાવવામાં આવશે
 DocType: HR Settings,Password Policy,પાસવર્ડ નીતિ
 apps/erpnext/erpnext/setup/doctype/customer_group/customer_group.js,This is a root customer group and cannot be edited.,આ રુટ ગ્રાહક જૂથ છે અને સંપાદિત કરી શકાતી નથી.
@@ -4969,6 +4977,7 @@
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py,No {0} found for Inter Company Transactions.,આંતર કંપની વ્યવહારો માટે કોઈ {0} મળ્યું નથી.
 DocType: Travel Itinerary,Rented Car,ભાડે આપતી કાર
 apps/erpnext/erpnext/public/js/hub/components/profile_dialog.js,About your Company,તમારી કંપની વિશે
+apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.js,Show Stock Ageing Data,સ્ટોક એજિંગ ડેટા બતાવો
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py,Credit To account must be a Balance Sheet account,એકાઉન્ટ ક્રેડિટ બેલેન્સ શીટ એકાઉન્ટ હોવું જ જોઈએ
 DocType: Donor,Donor,દાતા
 DocType: Global Defaults,Disable In Words,શબ્દો માં અક્ષમ
@@ -4983,8 +4992,10 @@
 DocType: Practitioner Schedule,Schedule Name,સૂચિ નામ
 apps/erpnext/erpnext/regional/doctype/gstr_3b_report/gstr_3b_report.py,Please enter GSTIN and state for the Company Address {0},કૃપા કરી જીએસટીઆઇએન દાખલ કરો અને કંપનીના સરનામાં માટે સ્ટેટ કરો {0}
 DocType: Currency Exchange,For Buying,ખરીદી માટે
+apps/erpnext/erpnext/setup/default_energy_point_rules.py,On Purchase Order Submission,ઓર્ડર સબમિશન પર ખરીદી
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js,Add All Suppliers,બધા સપ્લાયર્સ ઉમેરો
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py,Row #{0}: Allocated Amount cannot be greater than outstanding amount.,રો # {0}: ફાળવેલ રકમ બાકી રકમ કરતાં વધારે ન હોઈ શકે.
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Customer &gt; Customer Group &gt; Territory,ગ્રાહક&gt; ગ્રાહક જૂથ&gt; ક્ષેત્ર
 DocType: Tally Migration,Parties,પક્ષો
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js,Browse BOM,બ્રાઉઝ BOM
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py,Secured Loans,સુરક્ષીત લોન્સ
@@ -5015,6 +5026,7 @@
 apps/erpnext/erpnext/stock/doctype/item_alternative/item_alternative.py,Not allow to set alternative item for the item {0},આઇટમ {0} માટે વૈકલ્પિક આઇટમ સેટ કરવાની મંજૂરી આપશો નહીં
 apps/erpnext/erpnext/hr/doctype/leave_block_list/leave_block_list.py,Date is repeated,તારીખ પુનરાવર્તન કરવામાં આવે છે
 apps/erpnext/erpnext/accounts/print_format/payment_receipt_voucher/payment_receipt_voucher.html,Authorized Signatory,અધિકૃત હસ્તાક્ષર
+apps/erpnext/erpnext/education/doctype/instructor/instructor.py,Please setup Instructor Naming System in Education &gt; Education Settings,કૃપા કરીને શિક્ષણ&gt; શિક્ષણ સેટિંગ્સમાં પ્રશિક્ષક નામકરણ સિસ્ટમ સેટ કરો
 apps/erpnext/erpnext/regional/doctype/gstr_3b_report/gstr_3b_report.html,Net ITC Available(A) - (B),નેટ આઇટીસી ઉપલબ્ધ છે (એ) - (બી)
 apps/erpnext/erpnext/education/doctype/fee_schedule/fee_schedule.js,Create Fees,ફી બનાવો
 DocType: Project,Total Purchase Cost (via Purchase Invoice),કુલ ખરીદ કિંમત (ખરીદી ભરતિયું મારફતે)
@@ -5034,6 +5046,7 @@
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.js,Message Sent,સંદેશ મોકલ્યો
 apps/erpnext/erpnext/accounts/doctype/account/account.py,Account with child nodes cannot be set as ledger,બાળક ગાંઠો સાથે એકાઉન્ટ ખાતાવહી તરીકે સેટ કરી શકાય છે
 DocType: C-Form,II,બીજા
+apps/erpnext/erpnext/assets/report/fixed_asset_register/fixed_asset_register.py,Vendor Name,વિક્રેતા નામ
 DocType: Quiz Result,Wrong,ખોટું
 DocType: Sales Invoice,Rate at which Price list currency is converted to customer's base currency,દર ભાવ યાદી ચલણ ગ્રાહક આધાર ચલણ ફેરવાય છે
 DocType: Purchase Invoice Item,Net Amount (Company Currency),ચોખ્ખી રકમ (કંપની ચલણ)
@@ -5273,6 +5286,7 @@
 DocType: Stock Settings,Auto Material Request,ઓટો સામગ્રી વિનંતી
 DocType: Woocommerce Settings,API consumer secret,API ગ્રાહક રહસ્ય
 DocType: Delivery Note Item,Available Batch Qty at From Warehouse,વેરહાઉસ માંથી ઉપલબ્ધ બેચ Qty
+,Received Qty Amount,ક્વોટી રકમ પ્રાપ્ત થઈ
 DocType: Salary Slip,Gross Pay - Total Deduction - Loan Repayment,કુલ પે - કુલ કપાત - લોન પરત ચૂકવણી
 DocType: Bank Account,Last Integration Date,છેલ્લી એકીકરણની તારીખ
 DocType: Expense Claim,Expense Taxes and Charges,ખર્ચ કર અને ચાર્જ
@@ -5727,6 +5741,8 @@
 DocType: Drug Prescription,Hour,કલાક
 DocType: Restaurant Order Entry,Last Sales Invoice,છેલ્લું વેચાણ ભરતિયું
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py,Please select Qty against item {0},આઇટમ {0} સામે જથ્થો પસંદ કરો
+apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py,Latest Age,નવીનતમ ઉંમર
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js,Transfer Material to Supplier,સપ્લાયર માલ પરિવહન
 apps/erpnext/erpnext/hr/report/loan_repayment/loan_repayment.py,EMI,EMI
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py,New Serial No cannot have Warehouse. Warehouse must be set by Stock Entry or Purchase Receipt,ન્યૂ સીરીયલ કોઈ વેરહાઉસ કરી શકે છે. વેરહાઉસ સ્ટોક એન્ટ્રી અથવા ખરીદી રસીદ દ્વારા સુયોજિત થયેલ હોવું જ જોઈએ
 DocType: Lead,Lead Type,લીડ પ્રકાર
@@ -5748,7 +5764,6 @@
 apps/erpnext/erpnext/hr/doctype/employee_benefit_application/employee_benefit_application.py,"An amount of {0} already claimed for the component {1},\
 						 set the amount equal or greater than {2}","{0} નો જથ્થો પહેલાથી ઘટક {1} માટે દાવો કર્યો છે, \ {2} કરતા વધુ અથવા મોટા જથ્થાને સેટ કરો"
 DocType: Shipping Rule,Shipping Rule Conditions,શીપીંગ નિયમ શરતો
-DocType: Purchase Invoice,Export Type,નિકાસ પ્રકાર
 DocType: Salary Slip Loan,Salary Slip Loan,પગાર કાપલી લોન
 DocType: BOM Update Tool,The new BOM after replacement,રિપ્લેસમેન્ટ પછી નવા BOM
 ,Point of Sale,વેચાણ પોઇન્ટ
@@ -5865,7 +5880,6 @@
 DocType: Purchase Order Item,Blanket Order Rate,બ્લેંકેટ ઓર્ડર રેટ
 ,Customer Ledger Summary,ગ્રાહક લેજરે સારાંશ
 apps/erpnext/erpnext/hooks.py,Certification,પ્રમાણન
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js,Are you sure you want to make debit note?,શું તમે ખરેખર ડેબિટ નોટ બનાવવા માંગો છો?
 DocType: Bank Guarantee,Clauses and Conditions,કલમો અને શરતો
 DocType: Serial No,Creation Document Type,બનાવટ દસ્તાવેજ પ્રકારની
 DocType: Amazon MWS Settings,ES,ES
@@ -5903,8 +5917,6 @@
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py,Financial Services,ફાઈનાન્સિયલ સર્વિસીસ
 DocType: Student Sibling,Student ID,વિદ્યાર્થી ID
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.js,For Quantity must be greater than zero,જથ્થા માટે શૂન્ય કરતા વધુ હોવી જોઈએ
-apps/erpnext/erpnext/hr/doctype/employee_transfer/employee_transfer.py,"Please delete the Employee <a href=""#Form/Employee/{0}"">{0}</a>\
-					to cancel this document","કૃપા કરીને આ દસ્તાવેજ રદ કરવા માટે કર્મચારી <a href=""#Form/Employee/{0}"">{0}</a> delete કા deleteી નાખો"
 apps/erpnext/erpnext/config/projects.py,Types of activities for Time Logs,સમય લોગ માટે પ્રવૃત્તિઓ પ્રકાર
 DocType: Opening Invoice Creation Tool,Sales,સેલ્સ
 DocType: Stock Entry Detail,Basic Amount,મૂળભૂત રકમ
@@ -5983,6 +5995,7 @@
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py,Print and Stationery,પ્રિન્ટ અને સ્ટેશનરી
 DocType: Stock Settings,Show Barcode Field,બતાવો બારકોડ ક્ષેત્ર
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js,Send Supplier Emails,પુરવઠોકર્તા ઇમેઇલ્સ મોકલો
+DocType: Asset Movement,ACC-ASM-.YYYY.-,ACC-ASM-.YYYY.-
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py,"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,ઓટો બનાવ્યું
 apps/erpnext/erpnext/hr/doctype/employee_onboarding/employee_onboarding.py,Submit this to create the Employee record,કર્મચારીનું રેકોર્ડ બનાવવા માટે આ સબમિટ કરો
@@ -6058,7 +6071,6 @@
 DocType: Sales Team,Contact No.,સંપર્ક નંબર
 apps/erpnext/erpnext/templates/includes/cart/cart_address.html,Billing Address is same as Shipping Address,બિલિંગ સરનામું શિપિંગ સરનામાં જેવું જ છે
 DocType: Bank Reconciliation,Payment Entries,ચુકવણી પ્રવેશો
-apps/erpnext/erpnext/erpnext_integrations/doctype/shopify_settings/shopify_settings.py,Access token or Shopify URL missing,ઍક્સેસ ટોકન અથવા Shopify URL ખૂટે છે
 DocType: Location,Latitude,અક્ષાંશ
 DocType: Work Order,Scrap Warehouse,સ્ક્રેપ વેરહાઉસ
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py,"Warehouse required at Row No {0}, please set default warehouse for the item {1} for the company {2}","રો નં {0} પર વેરહાઉસ જરૂરી છે, કૃપા કરીને કંપની {1} માટે વસ્તુ {1} માટે ડિફોલ્ટ વેરહાઉસ સેટ કરો"
@@ -6100,7 +6112,6 @@
 DocType: Job Offer Term,Value / Description,ભાવ / વર્ણન
 apps/erpnext/erpnext/controllers/accounts_controller.py,"Row #{0}: Asset {1} cannot be submitted, it is already {2}","રો # {0}: એસેટ {1} સુપ્રત કરી શકાય નહીં, તે પહેલેથી જ છે {2}"
 DocType: Tax Rule,Billing Country,બિલિંગ દેશ
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js,Are you sure you want to make credit note?,શું તમે ખરેખર ક્રેડિટ નોટ બનાવવા માંગો છો?
 DocType: Purchase Order Item,Expected Delivery Date,અપેક્ષિત બોલ તારીખ
 DocType: Restaurant Order Entry,Restaurant Order Entry,રેસ્ટોરન્ટ ઓર્ડર એન્ટ્રી
 apps/erpnext/erpnext/accounts/general_ledger.py,Debit and Credit not equal for {0} #{1}. Difference is {2}.,ડેબિટ અને ક્રેડિટ {0} # માટે સમાન નથી {1}. તફાવત છે {2}.
@@ -6223,6 +6234,7 @@
 DocType: Purchase Invoice,Taxes and Charges Added,કર અને ખર્ચ ઉમેર્યું
 apps/erpnext/erpnext/assets/doctype/asset/asset.py,Depreciation Row {0}: Next Depreciation Date cannot be before Available-for-use Date,અવમૂલ્યન રો {0}: આગલી અવમૂલ્યન તારીખ ઉપલબ્ધ થવાની તારીખ પહેલાં ન હોઈ શકે
 ,Sales Funnel,વેચાણ નાળચું
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Item Code &gt; Item Group &gt; Brand,આઇટમ કોડ&gt; આઇટમ જૂથ&gt; બ્રાન્ડ
 apps/erpnext/erpnext/setup/doctype/company/company.py,Abbreviation is mandatory,સંક્ષેપનો ફરજિયાત છે
 DocType: Project,Task Progress,ટાસ્ક પ્રગતિ
 apps/erpnext/erpnext/templates/includes/navbar/navbar_items.html,Cart,કાર્ટ
@@ -6464,6 +6476,7 @@
 DocType: Employee Grade,Employee Grade,કર્મચારીનું ગ્રેડ
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py,Piecework,છૂટક કામ
 DocType: GSTR 3B Report,June,જૂન
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Supplier &gt; Supplier Type,સપ્લાયર&gt; સપ્લાયર પ્રકાર
 DocType: Share Balance,From No,ના ના
 DocType: Shift Type,Early Exit Grace Period,પ્રારંભિક એક્ઝિટ ગ્રેસ પીરિયડ
 DocType: Task,Actual Time (in Hours),(કલાકોમાં) વાસ્તવિક સમય
@@ -6744,6 +6757,7 @@
 DocType: Warehouse,Warehouse Name,વેરહાઉસ નામ
 DocType: Naming Series,Select Transaction,પસંદ ટ્રાન્ઝેક્શન
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py,Please enter Approving Role or Approving User,ભૂમિકા એપ્રૂવિંગ અથવા વપરાશકર્તા એપ્રૂવિંગ દાખલ કરો
+apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.py,UOM Conversion factor ({0} -&gt; {1}) not found for item: {2},આઇટમ માટે યુઓએમ કન્વર્ઝન પરિબળ ({0} -&gt; {1}) મળ્યું નથી: {2}
 DocType: Journal Entry,Write Off Entry,એન્ટ્રી માંડવાળ
 DocType: BOM,Rate Of Materials Based On,દર સામગ્રી પર આધારિત
 DocType: Education Settings,"If enabled, field Academic Term will be Mandatory in Program Enrollment Tool.","જો સક્ષમ કરેલું હોય, તો ક્ષેત્ર નોંધણી સાધનમાં ફીલ્ડ એકેડેમિક ટર્મ ફરજિયાત રહેશે."
@@ -6932,6 +6946,7 @@
 DocType: Quality Inspection Reading,Quality Inspection Reading,ગુણવત્તા નિરીક્ષણ વાંચન
 apps/erpnext/erpnext/stock/doctype/stock_settings/stock_settings.py,`Freeze Stocks Older Than` should be smaller than %d days.,`કરતા જૂનો સ્થિર સ્ટોક'  %d દિવસ કરતાં ઓછો હોવો જોઈએ
 DocType: Tax Rule,Purchase Tax Template,ટેક્સ ઢાંચો ખરીદી
+apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py,Earliest Age,પ્રારંભિક ઉંમર
 apps/erpnext/erpnext/utilities/user_progress.py,Set a sales goal you'd like to achieve for your company.,તમે તમારી કંપની માટે સેલ્સ ધ્યેય સેટ કરવા માંગો છો
 DocType: Quality Goal,Revision,પુનરાવર્તન
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js,Healthcare Services,હેલ્થકેર સેવાઓ
@@ -6975,6 +6990,7 @@
 apps/erpnext/erpnext/healthcare/doctype/patient_encounter/patient_encounter.js,Schedule Discharge,શેડ્યૂલ ડિસ્ચાર્જ
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py,Cheques and Deposits incorrectly cleared,Cheques અને થાપણો ખોટી રીતે સાફ
 DocType: Homepage Section Card,Homepage Section Card,હોમપેજ વિભાગ કાર્ડ
+,Amount To Be Billed,બિલ ભરવાની રકમ
 apps/erpnext/erpnext/accounts/doctype/account/account.py,Account {0}: You can not assign itself as parent account,એકાઉન્ટ {0}: તમે પિતૃ એકાઉન્ટ તરીકે પોતાને સોંપી શકો છો
 DocType: Purchase Invoice Item,Price List Rate,ભાવ યાદી દર
 apps/erpnext/erpnext/utilities/activation.py,Create customer quotes,ગ્રાહક અવતરણ બનાવો
@@ -7027,6 +7043,7 @@
 DocType: Supplier Scorecard Criteria,Supplier Scorecard Criteria,સપ્લાયર સ્કોરકાર્ડ માપદંડ
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py,Please select Start Date and End Date for Item {0},વસ્તુ માટે શરૂઆત તારીખ અને સમાપ્તિ તારીખ પસંદ કરો {0}
 DocType: Maintenance Schedule,MAT-MSH-.YYYY.-,એમએટી-એમએસએચ-વાય.વાય.વાય.-
+,Amount to Receive,પ્રાપ્ત કરવાની રકમ
 apps/erpnext/erpnext/education/doctype/student_group_creation_tool/student_group_creation_tool.py,Course is mandatory in row {0},કોર્સ પંક્તિ માં ફરજિયાત છે {0}
 apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py,From date can not be greater than than To date,તારીખથી આજની તારીખ કરતા મોટી ન હોઇ શકે
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py,To date cannot be before from date,તારીખ કરવા માટે તારીખથી પહેલાં ન હોઈ શકે
@@ -7473,6 +7490,7 @@
 DocType: Delivery Note,Print Without Amount,રકમ વિના છાપો
 apps/erpnext/erpnext/accounts/report/asset_depreciation_ledger/asset_depreciation_ledger.py,Depreciation Date,અવમૂલ્યન તારીખ
 ,Work Orders in Progress,પ્રગતિમાં કાર્ય ઓર્ડર્સ
+DocType: Customer Credit Limit,Bypass Credit Limit Check,બાયપાસ ક્રેડિટ મર્યાદા તપાસ
 DocType: Issue,Support Team,સપોર્ટ ટીમ
 apps/erpnext/erpnext/stock/report/batch_item_expiry_status/batch_item_expiry_status.py,Expiry (In Days),સમાપ્તિ (દિવસોમાં)
 DocType: Appraisal,Total Score (Out of 5),(5) કુલ સ્કોર
@@ -7654,6 +7672,7 @@
 DocType: Sales Invoice,Customer GSTIN,ગ્રાહક GSTIN
 DocType: Crop Cycle,List of diseases detected on the field. When selected it'll automatically add a list of tasks to deal with the disease ,ફીલ્ડમાં શોધાયેલ રોગોની સૂચિ. જ્યારે પસંદ કરેલ હોય તો તે રોગ સાથે વ્યવહાર કરવા માટે આપમેળે ક્રિયાઓની સૂચિ ઉમેરશે
 apps/erpnext/erpnext/manufacturing/page/bom_comparison_tool/bom_comparison_tool.js,BOM 1,બોમ 1
+apps/erpnext/erpnext/assets/report/fixed_asset_register/fixed_asset_register.py,Asset Id,સંપત્તિ આઈ.ડી.
 apps/erpnext/erpnext/healthcare/doctype/healthcare_service_unit/healthcare_service_unit.js,This is a root healthcare service unit and cannot be edited.,આ રુટ હેલ્થકેર સેવા એકમ છે અને સંપાદિત કરી શકાતું નથી.
 DocType: Asset Repair,Repair Status,સમારકામ સ્થિતિ
 apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.js,"Requested Qty: Quantity requested for purchase, but not ordered.","વિનંતી કરેલી રકમ: ખરીદી માટે સંખ્યાની વિનંતી કરી, પરંતુ ઓર્ડર આપ્યો નથી."
diff --git a/erpnext/translations/he.csv b/erpnext/translations/he.csv
index a48bceb..48e4709 100644
--- a/erpnext/translations/he.csv
+++ b/erpnext/translations/he.csv
@@ -955,6 +955,7 @@
 DocType: Delivery Trip,Delivery Details,פרטי משלוח
 DocType: Authorization Rule,Average Discount,דיסקונט הממוצע
 DocType: Purchase Invoice,Taxes and Charges Deducted (Company Currency),מסים והיטלים שנוכה (חברת מטבע)
+DocType: Cost Center,rgt,rgt
 ,Item-wise Purchase Register,הרשם רכישת פריט-חכם
 DocType: Issue,ISS-,ISS-
 DocType: Manufacturing Settings,Capacity Planning,תכנון קיבולת
@@ -1464,7 +1465,6 @@
 apps/erpnext/erpnext/config/crm.py,Manage Sales Person Tree.,ניהול מכירות אדם עץ.
 apps/erpnext/erpnext/accounts/doctype/c_form/c_form.py,C-form is not applicable for Invoice: {0},C-הטופס אינו ישים עבור חשבונית: {0}
 DocType: Fiscal Year Company,Fiscal Year Company,שנת כספי חברה
-apps/erpnext/erpnext/accounts/party.py,{0} {1} is disabled,{0} {1} מושבתת
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py,Banking,בנקאות
 DocType: Maintenance Visit Purpose,Maintenance Visit Purpose,מטרת התחזוקה בקר
 DocType: Project,Estimated Cost,מחיר משוער
@@ -1669,7 +1669,6 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py,Reference No is mandatory if you entered Reference Date,התייחסות לא חובה אם אתה נכנס תאריך ההפניה
 DocType: Global Defaults,"If disable, 'Rounded Total' field will not be visible in any transaction","אם להשבית, השדה 'מעוגל סה""כ' לא יהיה גלוי בכל עסקה"
 DocType: Upload Attendance,Attendance From Date,נוכחות מתאריך
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js,Please select Company,אנא בחר חברה
 DocType: C-Form Invoice Detail,Invoice No,חשבונית לא
 DocType: BOM Operation,Operation Time,מבצע זמן
 ,Invoiced Amount (Exculsive Tax),סכום חשבונית (מס Exculsive)
@@ -2939,6 +2938,7 @@
 DocType: Payment Entry,Difference Amount (Company Currency),סכום פרש (חברת מטבע)
 DocType: Opportunity,To Discuss,כדי לדון ב
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js,New Account Name,שם חשבון חדש
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js,Purchase Return,חזור רכישה
 DocType: Leave Type,Leave Type Name,השאר סוג שם
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py,You can not enter current voucher in 'Against Journal Entry' column,אתה לא יכול להיכנס לשובר נוכחי ב'נגד תנועת יומן 'טור
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,"To not apply Pricing Rule in a particular transaction, all applicable Pricing Rules should be disabled.","שלא להחיל כלל תמחור בעסקה מסוימת, צריכים להיות נכה כל כללי התמחור הישימים."
@@ -3124,6 +3124,7 @@
 DocType: Employee,Contract End Date,תאריך החוזה End
 DocType: Leave Encashment,Payroll,גִלְיוֹן שָׂכָר
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center_tree.js,Further cost centers can be made under Groups but entries can be made against non-Groups,מרכזי עלות נוספים יכולים להתבצע תחת קבוצות אבל ערכים יכולים להתבצע נגד לא-קבוצות
+DocType: Cost Center,Lft,LFT
 DocType: Shopping Cart Settings,Shopping Cart Settings,הגדרות סל קניות
 apps/erpnext/erpnext/hooks.py,Shipments,משלוחים
 DocType: Sales Order,Fully Delivered,נמסר באופן מלא
@@ -3265,6 +3266,7 @@
 DocType: Sales Person,Name and Employee ID,שם והעובדים ID
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py,Discount must be less than 100,דיסקונט חייב להיות פחות מ -100
 DocType: Purchase Invoice Item,Purchase Order Item,לרכוש פריט להזמין
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js,Transfer Material to Supplier,העברת חומר לספקים
 DocType: Cheque Print Template,Distance from top edge,מרחק הקצה העליון
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py,Payment against {0} {1} cannot be greater than Outstanding Amount {2},תשלום כנגד {0} {1} לא יכול להיות גדול מהסכום מצטיין {2}
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.html,Ref,"נ""צ"
diff --git a/erpnext/translations/hi.csv b/erpnext/translations/hi.csv
index 6826438..7ba9ce6 100644
--- a/erpnext/translations/hi.csv
+++ b/erpnext/translations/hi.csv
@@ -287,7 +287,6 @@
 DocType: Loan,Repay Over Number of Periods,चुकाने से अधिक अवधि की संख्या
 apps/erpnext/erpnext/manufacturing/report/bom_stock_report/bom_stock_report.py,Quantity to Produce can not be less than Zero,उत्पादन की मात्रा शून्य से कम नहीं हो सकती
 DocType: Stock Entry,Additional Costs,अतिरिक्त लागत
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Customer &gt; Customer Group &gt; Territory,ग्राहक&gt; ग्राहक समूह&gt; क्षेत्र
 apps/erpnext/erpnext/accounts/doctype/account/account.py,Account with existing transaction can not be converted to group.,मौजूदा लेन - देन के साथ खाता समूह को नहीं बदला जा सकता .
 DocType: Lead,Product Enquiry,उत्पाद पूछताछ
 DocType: Education Settings,Validate Batch for Students in Student Group,छात्र समूह में छात्रों के लिए बैच का प्रमाणन करें
@@ -584,6 +583,7 @@
 DocType: Healthcare Settings,Create documents for sample collection,नमूना संग्रह के लिए दस्तावेज़ बनाएं
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py,Payment against {0} {1} cannot be greater than Outstanding Amount {2},के खिलाफ भुगतान {0} {1} बकाया राशि से अधिक नहीं हो सकता {2}
 apps/erpnext/erpnext/patches/v11_0/add_healthcare_service_unit_tree_root.py,All Healthcare Service Units,सभी हेल्थकेयर सेवा इकाइयां
+apps/erpnext/erpnext/setup/default_energy_point_rules.py,On Converting Opportunity,अवसर बदलने पर
 DocType: Bank Account,Address HTML,HTML पता करने के लिए
 DocType: Lead,Mobile No.,मोबाइल नंबर
 apps/erpnext/erpnext/selling/doctype/pos_closing_voucher/closing_voucher_details.html,Mode of Payments,भुगतान का तरीका
@@ -648,7 +648,6 @@
 DocType: Accounting Dimension,Dimension Name,आयाम का नाम
 apps/erpnext/erpnext/healthcare/setup.py,Resistant,प्रतिरोधी
 apps/erpnext/erpnext/hotels/doctype/hotel_room_reservation/hotel_room_reservation.py,Please set Hotel Room Rate on {},कृपया होटल कक्ष दर {} पर सेट करें
-apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py,Please setup numbering series for Attendance via Setup &gt; Numbering Series,कृपया सेटअप&gt; नंबरिंग श्रृंखला के माध्यम से उपस्थिति के लिए क्रमांकन श्रृंखला की स्थापना करें
 DocType: Journal Entry,Multi Currency,बहु मुद्रा
 DocType: Bank Statement Transaction Invoice Item,Invoice Type,चालान का प्रकार
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py,Valid from date must be less than valid upto date,दिनांक से मान्य मान्य तिथि से कम होना चाहिए
@@ -763,6 +762,7 @@
 apps/erpnext/erpnext/accounts/page/pos/pos.js,Create a new Customer,एक नए ग्राहक बनाने
 apps/erpnext/erpnext/non_profit/report/expiring_memberships/expiring_memberships.py,Expiring On,समाप्त हो रहा है
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,"If multiple Pricing Rules continue to prevail, users are asked to set Priority manually to resolve conflict.","कई डालती प्रबल करने के लिए जारी रखते हैं, उपयोगकर्ताओं संघर्ष को हल करने के लिए मैन्युअल रूप से प्राथमिकता सेट करने के लिए कहा जाता है."
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js,Purchase Return,क्रय वापसी
 apps/erpnext/erpnext/utilities/activation.py,Create Purchase Orders,खरीद आदेश बनाएं
 ,Purchase Register,इन पंजीकृत खरीद
 apps/erpnext/erpnext/healthcare/doctype/patient/patient.py,Patient not found,रोगी नहीं मिला
@@ -778,7 +778,6 @@
 DocType: Location,Area UOM,क्षेत्र यूओएम
 apps/erpnext/erpnext/manufacturing/doctype/workstation/workstation.py,Workstation is closed on the following dates as per Holiday List: {0},कार्य केंद्र छुट्टी सूची के अनुसार निम्नलिखित तारीखों पर बंद हो गया है: {0}
 apps/erpnext/erpnext/selling/page/sales_funnel/sales_funnel.py,Opportunities,सुनहरे अवसर
-apps/erpnext/erpnext/www/all-products/index.html,Clear filters,फ़िल्टर साफ़ करें
 DocType: Lab Test Template,Single,एक
 DocType: Compensatory Leave Request,Work From Date,तिथि से काम
 DocType: Salary Slip,Total Loan Repayment,कुल ऋण चुकौती
@@ -821,6 +820,7 @@
 DocType: Account,Old Parent,पुरानी माता - पिता
 apps/erpnext/erpnext/education/doctype/program_enrollment_tool/program_enrollment_tool.py,Mandatory field - Academic Year,अनिवार्य क्षेत्र - शैक्षणिक वर्ष
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py,{0} {1} is not associated with {2} {3},{0} {1} {2} {3} से संबद्ध नहीं है
+DocType: Opportunity,Converted By,द्वारा परिवर्तित
 apps/erpnext/erpnext/public/js/hub/components/ReviewArea.vue,You need to login as a Marketplace User before you can add any reviews.,"इससे पहले कि आप कोई समीक्षा जोड़ सकें, आपको मार्केटप्लेस उपयोगकर्ता के रूप में लॉगिन करना होगा।"
 apps/erpnext/erpnext/manufacturing/doctype/job_card/job_card.py,Row {0} : Operation is required against the raw material item {1},पंक्ति {0}: कच्चे माल की वस्तु के खिलाफ ऑपरेशन की आवश्यकता है {1}
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py,Please set default payable account for the company {0},कृपया कंपनी के लिए डिफ़ॉल्ट भुगतान योग्य खाता सेट करें {0}
@@ -846,6 +846,8 @@
 DocType: BOM,Work Order,कार्य आदेश
 DocType: Sales Invoice,Total Qty,कुल मात्रा
 apps/erpnext/erpnext/education/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py,Guardian2 Email ID,संरक्षक 2 ईमेल आईडी
+apps/erpnext/erpnext/hr/doctype/employee_transfer/employee_transfer.py,"Please delete the Employee <a href=""#Form/Employee/{0}"">{0}</a>\
+					to cancel this document","कृपया इस दस्तावेज़ को रद्द करने के लिए कर्मचारी <a href=""#Form/Employee/{0}"">{0}</a> \ _ हटाएं"
 DocType: Item,Show in Website (Variant),वेबसाइट में दिखाने (variant)
 DocType: Employee,Health Concerns,स्वास्थ्य चिंताएं
 DocType: Payroll Entry,Select Payroll Period,पेरोल की अवधि का चयन करें
@@ -904,7 +906,6 @@
 DocType: Codification Table,Codification Table,संहिताकरण तालिका
 DocType: Timesheet Detail,Hrs,बजे
 apps/erpnext/erpnext/manufacturing/page/bom_comparison_tool/bom_comparison_tool.js,Changes in {0},{0} में परिवर्तन
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js,Please select Company,कंपनी का चयन करें
 DocType: Employee Skill,Employee Skill,कर्मचारी कौशल
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.js,Difference Account,अंतर खाता
 DocType: Pricing Rule,Discount on Other Item,अन्य मद पर छूट
@@ -972,6 +973,7 @@
 DocType: BOM,Operating Cost,संचालन लागत
 DocType: Crop,Produced Items,उत्पादित आइटम
 DocType: Bank Statement Transaction Entry,Match Transaction to Invoices,चालान के लिए लेनदेन मैच
+apps/erpnext/erpnext/erpnext_integrations/exotel_integration.py,Error in Exotel incoming call,Exotel आने वाली कॉल में त्रुटि
 DocType: Sales Order Item,Gross Profit,सकल लाभ
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js,Unblock Invoice,चालान अनब्लॉक करें
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py,Increment cannot be 0,वेतन वृद्धि 0 नहीं किया जा सकता
@@ -1185,6 +1187,7 @@
 DocType: Activity Cost,Activity Type,गतिविधि प्रकार
 DocType: Request for Quotation,For individual supplier,व्यक्तिगत आपूर्तिकर्ता
 DocType: BOM Operation,Base Hour Rate(Company Currency),बेस घंटे की दर (कंपनी मुद्रा)
+,Qty To Be Billed,बाइट टू बी बिल
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py,Delivered Amount,वितरित राशि
 apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.js,Reserved Qty for Production: Raw materials quantity to make manufacturing items.,उत्पादन के लिए आरक्षित मात्रा: निर्माण सामग्री बनाने के लिए कच्चे माल की मात्रा।
 DocType: Loyalty Point Entry Redemption,Redemption Date,रीडेम्प्शन तिथि
@@ -1303,7 +1306,7 @@
 DocType: Sales Invoice,Commission Rate (%),आयोग दर (%)
 apps/erpnext/erpnext/education/doctype/student_group/student_group.py,Please select Program,कृपया कार्यक्रम चुनें
 DocType: Project,Estimated Cost,अनुमानित लागत
-DocType: Request for Quotation,Link to material requests,सामग्री अनुरोध करने के लिए लिंक
+DocType: Supplier Quotation,Link to material requests,सामग्री अनुरोध करने के लिए लिंक
 apps/erpnext/erpnext/public/js/hub/pages/Publish.vue,Publish,प्रकाशित करना
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py,Aerospace,एयरोस्पेस
 ,Fichier des Ecritures Comptables [FEC],फिचर्स डेस ऐक्रिटेशंस कॉप्टीबल्स [एफईसी]
@@ -1316,6 +1319,7 @@
 apps/erpnext/erpnext/utilities/transaction_base.py,Invalid Posting Time,अमान्य पोस्टिंग टाइम
 DocType: Salary Component,Condition and Formula,हालत और फॉर्मूला
 DocType: Lead,Campaign Name,अभियान का नाम
+apps/erpnext/erpnext/setup/default_energy_point_rules.py,On Task Completion,कार्य पूर्ण होने पर
 apps/erpnext/erpnext/hr/doctype/compensatory_leave_request/compensatory_leave_request.py,There is no leave period in between {0} and {1},{0} और {1} के बीच कोई छुट्टी अवधि नहीं है
 DocType: Fee Validity,Healthcare Practitioner,हेल्थकेयर प्रैक्टिशनर
 DocType: Hotel Room,Capacity,क्षमता
@@ -1679,7 +1683,6 @@
 DocType: Quality Feedback Template,Quality Feedback Template,गुणवत्ता प्रतिक्रिया टेम्पलेट
 apps/erpnext/erpnext/config/education.py,LMS Activity,एलएमएस गतिविधि
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py,Internet Publishing,इंटरनेट प्रकाशन
-DocType: Prescription Duration,Number,संख्या
 apps/erpnext/erpnext/accounts/doctype/opening_invoice_creation_tool/opening_invoice_creation_tool.js,Creating {0} Invoice,{0} चालान बनाना
 DocType: Medical Code,Medical Code Standard,मेडिकल कोड मानक
 DocType: Soil Texture,Clay Composition (%),क्ले संरचना (%)
@@ -1754,6 +1757,7 @@
 DocType: Support Settings,Get Started Sections,अनुभाग शुरू करें
 DocType: Lead,CRM-LEAD-.YYYY.-,सीआरएम-लीड-.YYYY.-
 DocType: Invoice Discounting,Sanctioned,स्वीकृत
+,Base Amount,मूल
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.js,Total Contribution Amount: {0},कुल योगदान राशि: {0}
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py,Row #{0}: Please specify Serial No for Item {1},Row # {0}: आइटम के लिए धारावाहिक नहीं निर्दिष्ट करें {1}
 DocType: Payroll Entry,Salary Slips Submitted,वेतन पर्ची जमा
@@ -1971,6 +1975,7 @@
 apps/erpnext/erpnext/utilities/user_progress.py,List a few of your suppliers. They could be organizations or individuals.,अपने आपूर्तिकर्ताओं में से कुछ की सूची . वे संगठनों या व्यक्तियों हो सकता है.
 DocType: Accounting Dimension,Dimension Defaults,आयाम दोष
 apps/erpnext/erpnext/crm/report/prospects_engaged_but_not_converted/prospects_engaged_but_not_converted.js,Minimum Lead Age (Days),न्यूनतम लीड आयु (दिन)
+apps/erpnext/erpnext/assets/report/fixed_asset_register/fixed_asset_register.py,Available For Use Date,उपयोग की तारीख के लिए उपलब्ध है
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py,All BOMs,सभी BOMs
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js,Create Inter Company Journal Entry,इंटर कंपनी जर्नल एंट्री बनाएं
 DocType: Company,Parent Company,मूल कंपनी
@@ -2035,6 +2040,7 @@
 ,IRS 1099,आईआरएस 1099
 DocType: Salary Slip,Leave Without Pay,बिना वेतन छुट्टी
 DocType: Payment Request,Outward,बाहर
+apps/erpnext/erpnext/setup/default_energy_point_rules.py,On {0} Creation,{0} निर्माण पर
 apps/erpnext/erpnext/regional/doctype/gstr_3b_report/gstr_3b_report.html,State/UT Tax,राज्य / संघ राज्य क्षेत्र कर
 ,Trial Balance for Party,पार्टी के लिए परीक्षण शेष
 ,Gross and Net Profit Report,सकल और शुद्ध लाभ रिपोर्ट
@@ -2150,6 +2156,7 @@
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js,Make Stock Entry,स्टॉक एंट्री करें
 DocType: Hotel Room Reservation,Hotel Reservation User,होटल आरक्षण उपयोगकर्ता
 apps/erpnext/erpnext/projects/doctype/project/project.js,Set Status,स्थिति सेट करें
+apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py,Please setup numbering series for Attendance via Setup &gt; Numbering Series,कृपया सेटअप&gt; नंबरिंग श्रृंखला के माध्यम से उपस्थिति के लिए क्रमांकन श्रृंखला की स्थापना करें
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py,Please select prefix first,पहले उपसर्ग का चयन करें
 DocType: Contract,Fulfilment Deadline,पूर्ति की अंतिम तिथि
 apps/erpnext/erpnext/public/js/hub/pages/Home.vue,Near you,तुम्हारे पास
@@ -2165,6 +2172,7 @@
 DocType: Announcement,All Students,सभी छात्र
 apps/erpnext/erpnext/assets/doctype/asset/asset.py,Item {0} must be a non-stock item,मद {0} एक गैर शेयर मद में होना चाहिए
 apps/erpnext/erpnext/stock/doctype/batch/batch.js,View Ledger,देखें खाता बही
+DocType: Cost Center,Lft,LFT
 DocType: Grading Scale,Intervals,अंतराल
 DocType: Bank Statement Transaction Entry,Reconciled Transactions,समेकित लेनदेन
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py,Earliest,शीघ्रातिशीघ्र
@@ -2280,6 +2288,7 @@
 apps/erpnext/erpnext/hr/doctype/employee_benefit_application/employee_benefit_application.py,As per your assigned Salary Structure you cannot apply for benefits,आपके असाइन किए गए वेतन संरचना के अनुसार आप लाभ के लिए आवेदन नहीं कर सकते हैं
 apps/erpnext/erpnext/stock/doctype/item/item.py,Website Image should be a public file or website URL,वेबसाइट छवि एक सार्वजनिक फ़ाइल या वेबसाइट URL होना चाहिए
 DocType: Purchase Invoice Item,BOM,बीओएम
+apps/erpnext/erpnext/stock/doctype/item/item.py,Duplicate entry in Manufacturers table,निर्माता तालिका में डुप्लिकेट प्रविष्टि
 apps/erpnext/erpnext/setup/doctype/item_group/item_group.js,This is a root item group and cannot be edited.,यह एक रूट आइटम समूह है और संपादित नहीं किया जा सकता है .
 apps/erpnext/erpnext/accounts/doctype/account/account.js,Merge,मर्ज
 DocType: Journal Entry Account,Purchase Order,आदेश खरीद
@@ -2424,7 +2433,6 @@
 DocType: Asset,Depreciation Schedules,मूल्यह्रास कार्यक्रम
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.js,Create Sales Invoice,बिक्री चालान बनाएँ
 apps/erpnext/erpnext/regional/doctype/gstr_3b_report/gstr_3b_report.html,Ineligible ITC,अयोग्य आईटीसी
-apps/erpnext/erpnext/erpnext_integrations/doctype/shopify_settings/shopify_settings.py,"Support for public app is deprecated. Please setup private app, for more details refer user manual","सार्वजनिक ऐप के लिए समर्थन बहिष्कृत किया गया है। कृपया अधिक जानकारी के लिए निजी ऐप सेट करें, उपयोगकर्ता मैनुअल देखें"
 DocType: Task,Dependent Tasks,आश्रित कार्य
 apps/erpnext/erpnext/regional/report/gstr_1/gstr_1.py,Following accounts might be selected in GST Settings:,निम्नलिखित खातों को जीएसटी सेटिंग में चुना जा सकता है:
 apps/erpnext/erpnext/manufacturing/report/bom_stock_report/bom_stock_report.js,Quantity to Produce,उत्पादन करने की मात्रा
@@ -2677,6 +2685,7 @@
 DocType: Water Analysis,Container,पात्र
 apps/erpnext/erpnext/regional/report/gstr_1/gstr_1.py,Please set valid GSTIN No. in Company Address,कृपया कंपनी के पते में मान्य GSTIN नंबर सेट करें
 apps/erpnext/erpnext/education/utils.py,Student {0} - {1} appears Multiple times in row {2} & {3},छात्र {0} - {1} पंक्ति में कई बार आता है {2} और {3}
+apps/erpnext/erpnext/selling/doctype/customer/customer.py,Following fields are mandatory to create address:,निम्नलिखित फ़ील्ड पते बनाने के लिए अनिवार्य हैं:
 DocType: Item Alternative,Two-way,दो-तरफा
 DocType: Item,Manufacturers,निर्माता
 apps/erpnext/erpnext/accounts/deferred_revenue.py,Error while processing deferred accounting for {0},{0} के लिए स्थगित खाते को संसाधित करते समय त्रुटि
@@ -2751,9 +2760,9 @@
 DocType: Employee,HR-EMP-,मानव संसाधन-EMP-
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py,User {0} doesn't have any default POS Profile. Check Default at Row {1} for this User.,उपयोगकर्ता {0} में कोई भी डिफ़ॉल्ट पीओएस प्रोफ़ाइल नहीं है इस उपयोगकर्ता के लिए पंक्ति {1} पर डिफ़ॉल्ट जांचें
 DocType: Quality Meeting Minutes,Quality Meeting Minutes,गुणवत्ता बैठक मिनट
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Supplier &gt; Supplier Type,आपूर्तिकर्ता&gt; आपूर्तिकर्ता प्रकार
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py,Employee Referral,कर्मचारी रेफरल
 DocType: Student Group,Set 0 for no limit,कोई सीमा के लिए 0 सेट
+DocType: Cost Center,rgt,RGT
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py,The day(s) on which you are applying for leave are holidays. You need not apply for leave.,"आप छुट्टी के लिए आवेदन कर रहे हैं, जिस पर दिन (एस) छुट्टियां हैं। आप छुट्टी के लिए लागू नहीं की जरूरत है।"
 DocType: Customer,Primary Address and Contact Detail,प्राथमिक पता और संपर्क विस्तार
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.js,Resend Payment Email,भुगतान ईमेल पुन: भेजें
@@ -2863,7 +2872,6 @@
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py,Against Supplier Invoice {0} dated {1},प्रदायक के खिलाफ चालान {0} दिनांक {1}
 DocType: Customer,Default Price List,डिफ़ॉल्ट मूल्य सूची
 apps/erpnext/erpnext/assets/doctype/asset/asset.py,Asset Movement record {0} created,एसेट आंदोलन रिकॉर्ड {0} बनाया
-apps/erpnext/erpnext/utilities/page/leaderboard/leaderboard.js,No items found.,कुछ नहीं मिला।
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py,You cannot delete Fiscal Year {0}. Fiscal Year {0} is set as default in Global Settings,आप नहीं हटा सकते वित्त वर्ष {0}। वित्त वर्ष {0} वैश्विक सेटिंग्स में डिफ़ॉल्ट के रूप में सेट किया गया है
 DocType: Share Transfer,Equity/Liability Account,इक्विटी / देयता खाता
 apps/erpnext/erpnext/setup/doctype/customer_group/customer_group.py,A customer with the same name already exists,एक ही नाम वाला ग्राहक पहले से मौजूद है
@@ -2879,6 +2887,7 @@
 apps/erpnext/erpnext/selling/doctype/customer/customer.py,Credit limit has been crossed for customer {0} ({1}/{2}),ग्राहक {0} ({1} / {2}) के लिए क्रेडिट सीमा पार कर दी गई है
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py,Customer required for 'Customerwise Discount',' Customerwise डिस्काउंट ' के लिए आवश्यक ग्राहक
 apps/erpnext/erpnext/config/accounting.py,Update bank payment dates with journals.,अद्यतन बैंक भुगतान पत्रिकाओं के साथ तिथियाँ.
+,Billed Qty,बिल्टी क्यूटी
 apps/erpnext/erpnext/stock/doctype/item/item_dashboard.py,Pricing,मूल्य निर्धारण
 DocType: Employee,Attendance Device ID (Biometric/RF tag ID),उपस्थिति डिवाइस आईडी (बॉयोमीट्रिक / आरएफ टैग आईडी)
 DocType: Quotation,Term Details,अवधि विवरण
@@ -2900,6 +2909,7 @@
 DocType: Share Transfer,Asset Account,संपत्ति खाता
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js,New release date should be in the future,नई रिलीज की तारीख भविष्य में होनी चाहिए
 DocType: Purchase Invoice,End date of current invoice's period,वर्तमान चालान की अवधि की समाप्ति की तारीख
+apps/erpnext/erpnext/hr/doctype/employee/employee.py,Please setup Employee Naming System in Human Resource &gt; HR Settings,कृपया मानव संसाधन&gt; HR सेटिंग्स में कर्मचारी नामकरण प्रणाली सेटअप करें
 DocType: Lab Test,Technician Name,तकनीशियन का नाम
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py,"Cannot ensure delivery by Serial No as \
 					Item {0} is added with and without Ensure Delivery by \
@@ -2907,6 +2917,7 @@
 DocType: Accounts Settings,Unlink Payment on Cancellation of Invoice,चालान को रद्द करने पर भुगतान अनलिंक
 DocType: Bank Reconciliation,From Date,दिनांक से
 apps/erpnext/erpnext/hr/doctype/vehicle_log/vehicle_log.py,Current Odometer reading entered should be greater than initial Vehicle Odometer {0},वर्तमान ओडोमीटर रीडिंग दर्ज की गई प्रारंभिक वाहन ओडोमीटर से अधिक होना चाहिए {0}
+,Purchase Order Items To Be Received or Billed,खरीद ऑर्डर प्राप्त या बिल किया जाना है
 DocType: Restaurant Reservation,No Show,कोई शो नहीं
 apps/erpnext/erpnext/regional/india/utils.py,You must be a registered supplier to generate e-Way Bill,ई-वे बिल जनरेट करने के लिए आपके पास एक पंजीकृत सप्लायर होना चाहिए
 DocType: Shipping Rule Country,Shipping Rule Country,नौवहन नियम देश
@@ -2949,6 +2960,7 @@
 apps/erpnext/erpnext/templates/generators/item/item_add_to_cart.html,View in Cart,कार्ट में देखें
 DocType: Employee Checkin,Shift Actual Start,वास्तविक शुरुआत शिफ्ट करें
 DocType: Tally Migration,Is Day Book Data Imported,क्या डे बुक डेटा आयात किया गया है
+,Purchase Order Items To Be Received or Billed1,खरीद आदेश आइटम प्राप्त या Billed1 हो
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py,Marketing Expenses,विपणन व्यय
 apps/erpnext/erpnext/stock/doctype/pick_list/pick_list.py,{0} units of {1} is not available.,{0} की इकाइयां {1} उपलब्ध नहीं हैं।
 ,Item Shortage Report,आइटम कमी की रिपोर्ट
@@ -3173,7 +3185,6 @@
 apps/erpnext/erpnext/public/js/call_popup/call_popup.js,View all issues from {0},{0} से सभी मुद्दों को देखें
 DocType: Quality Inspection,MAT-QA-.YYYY.-,मेट-क्यूए-.YYYY.-
 DocType: Quality Meeting Table,Quality Meeting Table,गुणवत्ता बैठक की मेज
-apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,कृपया सेटिंग&gt; सेटिंग&gt; नामकरण श्रृंखला के माध्यम से {0} के लिए नामकरण श्रृंखला निर्धारित करें
 apps/erpnext/erpnext/templates/pages/help.html,Visit the forums,मंचों पर जाएं
 DocType: Student,Student Mobile Number,छात्र मोबाइल नंबर
 DocType: Item,Has Variants,वेरिएंट है
@@ -3316,6 +3327,7 @@
 DocType: Homepage Section,Section Cards,अनुभाग कार्ड
 ,Campaign Efficiency,अभियान दक्षता
 DocType: Discussion,Discussion,विचार-विमर्श
+apps/erpnext/erpnext/setup/default_energy_point_rules.py,On Sales Order Submission,बिक्री आदेश प्रस्तुत करने पर
 DocType: Bank Transaction,Transaction ID,लेन-देन आईडी
 DocType: Payroll Entry,Deduct Tax For Unsubmitted Tax Exemption Proof,असम्बद्ध कर छूट प्रमाण के लिए कटौती कर
 DocType: Volunteer,Anytime,किसी भी समय
@@ -3323,7 +3335,6 @@
 DocType: Employee Tax Exemption Proof Submission,Employee Tax Exemption Proof Submission,कर्मचारी कर छूट सबूत सबमिशन
 DocType: Patient,Surgical History,सर्जिकल इतिहास
 DocType: Bank Statement Settings Item,Mapped Header,मैप किया गया हैडर
-apps/erpnext/erpnext/hr/doctype/employee/employee.py,Please setup Employee Naming System in Human Resource &gt; HR Settings,कृपया मानव संसाधन&gt; HR सेटिंग्स में कर्मचारी नामकरण प्रणाली सेटअप करें
 DocType: Employee,Resignation Letter Date,इस्तीफा पत्र दिनांक
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Pricing Rules are further filtered based on quantity.,मूल्य निर्धारण नियमों आगे मात्रा के आधार पर छान रहे हैं.
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py,Please set the Date Of Joining for employee {0},कृपया कर्मचारी {0} के लिए शामिल होने की तिथि निर्धारित करें
@@ -3337,6 +3348,7 @@
 DocType: Bank Statement Settings,Mapped Items,मैप किए गए आइटम
 DocType: Amazon MWS Settings,IT,आईटी
 DocType: Chapter,Chapter,अध्याय
+,Fixed Asset Register,फिक्स्ड एसेट रजिस्टर
 apps/erpnext/erpnext/utilities/user_progress.py,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,Select BOM and Qty for Production,उत्पादन के लिए बीओएम और मात्रा का चयन करें
@@ -3472,7 +3484,6 @@
 apps/erpnext/erpnext/templates/emails/reorder_item.html,Following Material Requests have been raised automatically based on Item's re-order level,सामग्री अनुरोध के बाद मद के फिर से आदेश स्तर के आधार पर स्वचालित रूप से उठाया गया है
 apps/erpnext/erpnext/controllers/accounts_controller.py,Account {0} is invalid. Account Currency must be {1},खाते {0} अमान्य है। खाता मुद्रा होना चाहिए {1}
 apps/erpnext/erpnext/hr/doctype/salary_structure_assignment/salary_structure_assignment.py,From Date {0} cannot be after employee's relieving Date {1},तिथि से {0} कर्मचारी की राहत तिथि के बाद नहीं हो सकता है {1}
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py,Debit Note {0} has been created automatically,डेबिट नोट {0} स्वचालित रूप से बनाया गया है
 apps/erpnext/erpnext/accounts/doctype/payment_order/payment_order.js,Create Payment Entries,भुगतान प्रविष्टियाँ बनाएँ
 DocType: Supplier,Is Internal Supplier,आंतरिक प्रदायक है
 DocType: Employee,Create User Permission,उपयोगकर्ता अनुमति बनाएं
@@ -4031,7 +4042,6 @@
 DocType: Project User,Project Status,परियोजना की स्थिति
 DocType: UOM,Check this to disallow fractions. (for Nos),नामंज़ूर भिन्न करने के लिए इसे चेक करें. (ओपन स्कूल के लिए)
 DocType: Student Admission Program,Naming Series (for Student Applicant),सीरीज का नामकरण (छात्र आवेदक के लिए)
-apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.py,UOM Conversion factor ({0} -&gt; {1}) not found for item: {2},UOM रूपांतरण कारक ({0} -&gt; {1}) आइटम के लिए नहीं मिला: {2}
 apps/erpnext/erpnext/hr/doctype/retention_bonus/retention_bonus.py,Bonus Payment Date cannot be a past date,बोनस भुगतान तिथि पिछली तारीख नहीं हो सकती है
 DocType: Travel Request,Copy of Invitation/Announcement,आमंत्रण / घोषणा की प्रति
 DocType: Practitioner Service Unit Schedule,Practitioner Service Unit Schedule,प्रैक्टिशनर सर्विस यूनिट अनुसूची
@@ -4199,6 +4209,7 @@
 apps/erpnext/erpnext/utilities/user_progress.py,Setup Company,सेटअप कंपनी
 ,Lab Test Report,लैब टेस्ट रिपोर्ट
 DocType: Employee Benefit Application,Employee Benefit Application,कर्मचारी लाभ आवेदन
+apps/erpnext/erpnext/accounts/doctype/invoice_discounting/invoice_discounting.py,Row({0}): {1} is already discounted in {2},पंक्ति ({0}): {1} पहले से ही {2} में छूट दी गई है
 apps/erpnext/erpnext/hr/doctype/additional_salary/additional_salary.py,Additional Salary Component Exists.,अतिरिक्त वेतन घटक मौजूद है।
 DocType: Purchase Invoice,Unregistered,अपंजीकृत
 DocType: Student Applicant,Application Date,आवेदन तिथि
@@ -4277,7 +4288,6 @@
 DocType: Journal Entry,Accounting Entries,लेखांकन प्रवेश
 DocType: Job Card Time Log,Job Card Time Log,जॉब कार्ड समय लॉग
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,"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; फ़ील्ड में प्राप्त किया जाएगा।"
-apps/erpnext/erpnext/education/doctype/instructor/instructor.py,Please setup Instructor Naming System in Education &gt; Education Settings,कृपया शिक्षा&gt; शिक्षा सेटिंग्स में इंस्ट्रक्टर नामकरण प्रणाली सेटअप करें
 DocType: Journal Entry,Paid Loan,भुगतान ऋण
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py,Duplicate Entry. Please check Authorization Rule {0},एंट्री डुप्लिकेट. प्राधिकरण नियम की जांच करें {0}
 DocType: Journal Entry Account,Reference Due Date,संदर्भ नियत दिनांक
@@ -4294,7 +4304,6 @@
 apps/erpnext/erpnext/templates/pages/projects.html,No time sheets,कोई समय पत्रक
 DocType: GoCardless Mandate,GoCardless Customer,GoCardless ग्राहक
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py,Leave Type {0} cannot be carry-forwarded,{0} ले अग्रेषित नहीं किया जा सकता प्रकार छोड़ दो
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Item Code &gt; Item Group &gt; Brand,आइटम कोड&gt; आइटम समूह&gt; ब्रांड
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py,Maintenance Schedule is not generated for all the items. Please click on 'Generate Schedule',रखरखाव अनुसूची सभी मदों के लिए उत्पन्न नहीं है . 'उत्पन्न अनुसूची' पर क्लिक करें
 ,To Produce,निर्माण करने के लिए
 DocType: Leave Encashment,Payroll,पेरोल
@@ -4409,7 +4418,6 @@
 DocType: Stock Ledger Entry,Actual Qty After Transaction,लेन - देन के बाद वास्तविक मात्रा
 ,Pending SO Items For Purchase Request,खरीद के अनुरोध के लिए लंबित है तो आइटम
 apps/erpnext/erpnext/education/doctype/student_admission/student_admission.py,Student Admissions,विद्यार्थी प्रवेश
-apps/erpnext/erpnext/accounts/party.py,{0} {1} is disabled,{0} {1} अयोग्य कर दिया है
 DocType: Supplier,Billing Currency,बिलिंग मुद्रा
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py,Extra Large,एक्स्ट्रा लार्ज
 DocType: Loan,Loan Application,ऋण का आवेदन
@@ -4486,7 +4494,6 @@
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py,Only Leave Applications with status 'Approved' and 'Rejected' can be submitted,केवल छोड़ दो की स्थिति के साथ अनुप्रयोग &#39;स्वीकृत&#39; और &#39;अस्वीकृत&#39; प्रस्तुत किया जा सकता
 apps/erpnext/erpnext/accounts/doctype/accounting_dimension/accounting_dimension.py,Creating Dimensions...,आयाम बनाना ...
 apps/erpnext/erpnext/education/doctype/student_group_creation_tool/student_group_creation_tool.py,Student Group Name is mandatory in row {0},छात्र समूह का नाम पंक्ति में अनिवार्य है {0}
-DocType: Customer Credit Limit,Bypass credit limit_check,बायपास क्रेडिट सीमा_चेक
 DocType: Homepage,Products to be shown on website homepage,उत्पाद वेबसाइट के होमपेज पर दिखाया जाएगा
 DocType: HR Settings,Password Policy,पासवर्ड नीति
 apps/erpnext/erpnext/setup/doctype/customer_group/customer_group.js,This is a root customer group and cannot be edited.,यह एक रूट ग्राहक समूह है और संपादित नहीं किया जा सकता है .
@@ -4790,6 +4797,7 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py,Row {0}: Advance against Customer must be credit,पंक्ति {0}: ग्राहक के खिलाफ अग्रिम ऋण होना चाहिए
 DocType: Quality Meeting,Quality Meeting,गुणवत्ता की बैठक
 apps/erpnext/erpnext/accounts/doctype/account/account.js,Non-Group to Group,गैर-समूह समूह को
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,कृपया सेटिंग&gt; सेटिंग&gt; नामकरण श्रृंखला के माध्यम से {0} के लिए नामकरण श्रृंखला निर्धारित करें
 DocType: Employee,ERPNext User,ERPNext उपयोगकर्ता
 apps/erpnext/erpnext/education/doctype/student_group_creation_tool/student_group_creation_tool.py,Batch is mandatory in row {0},पंक्ति {0} में बैच अनिवार्य है
 DocType: Company,Default Buying Terms,डिफ़ॉल्ट खरीदना शर्तें
@@ -5084,6 +5092,7 @@
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py,No {0} found for Inter Company Transactions.,इंटर कंपनी लेनदेन के लिए कोई {0} नहीं मिला।
 DocType: Travel Itinerary,Rented Car,किराए पर कार
 apps/erpnext/erpnext/public/js/hub/components/profile_dialog.js,About your Company,आपकी कंपनी के बारे में
+apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.js,Show Stock Ageing Data,स्टॉक एजिंग डेटा दिखाएं
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py,Credit To account must be a Balance Sheet account,खाते में जमा एक बैलेंस शीट खाता होना चाहिए
 DocType: Donor,Donor,दाता
 DocType: Global Defaults,Disable In Words,शब्दों में अक्षम
@@ -5098,8 +5107,10 @@
 DocType: Practitioner Schedule,Schedule Name,अनुसूची नाम
 apps/erpnext/erpnext/regional/doctype/gstr_3b_report/gstr_3b_report.py,Please enter GSTIN and state for the Company Address {0},कृपया कंपनी के पते के लिए GSTIN और राज्य दर्ज करें {0}
 DocType: Currency Exchange,For Buying,खरीदने के लिए
+apps/erpnext/erpnext/setup/default_energy_point_rules.py,On Purchase Order Submission,खरीद आदेश प्रस्तुत करने पर
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js,Add All Suppliers,सभी आपूर्तिकर्ता जोड़ें
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py,Row #{0}: Allocated Amount cannot be greater than outstanding amount.,पंक्ति # {0}: आवंटित राशि बकाया राशि से अधिक नहीं हो सकती।
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Customer &gt; Customer Group &gt; Territory,ग्राहक&gt; ग्राहक समूह&gt; क्षेत्र
 DocType: Tally Migration,Parties,दलों
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js,Browse BOM,ब्राउज़ बीओएम
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py,Secured Loans,सुरक्षित कर्जे
@@ -5131,6 +5142,7 @@
 apps/erpnext/erpnext/stock/doctype/item_alternative/item_alternative.py,Not allow to set alternative item for the item {0},आइटम {0} के लिए वैकल्पिक आइटम सेट करने की अनुमति नहीं है
 apps/erpnext/erpnext/hr/doctype/leave_block_list/leave_block_list.py,Date is repeated,तिथि दोहराया है
 apps/erpnext/erpnext/accounts/print_format/payment_receipt_voucher/payment_receipt_voucher.html,Authorized Signatory,अधिकृत हस्ताक्षरकर्ता
+apps/erpnext/erpnext/education/doctype/instructor/instructor.py,Please setup Instructor Naming System in Education &gt; Education Settings,कृपया शिक्षा&gt; शिक्षा सेटिंग्स में इंस्ट्रक्टर नामकरण प्रणाली सेटअप करें
 apps/erpnext/erpnext/regional/doctype/gstr_3b_report/gstr_3b_report.html,Net ITC Available(A) - (B),नेट आईटीसी उपलब्ध (ए) - (बी)
 apps/erpnext/erpnext/education/doctype/fee_schedule/fee_schedule.js,Create Fees,फीस बनाएं
 DocType: Project,Total Purchase Cost (via Purchase Invoice),कुल खरीद मूल्य (खरीद चालान के माध्यम से)
@@ -5151,6 +5163,7 @@
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.js,Message Sent,भेजे गए संदेश
 apps/erpnext/erpnext/accounts/doctype/account/account.py,Account with child nodes cannot be set as ledger,बच्चे नोड्स के साथ खाता बही के रूप में सेट नहीं किया जा सकता
 DocType: C-Form,II,द्वितीय
+apps/erpnext/erpnext/assets/report/fixed_asset_register/fixed_asset_register.py,Vendor Name,विक्रेता का नाम
 DocType: Quiz Result,Wrong,गलत
 DocType: Sales Invoice,Rate at which Price list currency is converted to customer's base currency,दर जिस पर मूल्य सूची मुद्रा ग्राहक आधार मुद्रा में परिवर्तित किया जाता है
 DocType: Purchase Invoice Item,Net Amount (Company Currency),शुद्ध राशि (कंपनी मुद्रा)
@@ -5394,6 +5407,7 @@
 DocType: Stock Settings,Auto Material Request,ऑटो सामग्री अनुरोध
 DocType: Woocommerce Settings,API consumer secret,एपीआई उपभोक्ता रहस्य
 DocType: Delivery Note Item,Available Batch Qty at From Warehouse,गोदाम से पर उपलब्ध बैच मात्रा
+,Received Qty Amount,प्राप्त मात्रा राशि
 DocType: Salary Slip,Gross Pay - Total Deduction - Loan Repayment,सकल वेतन - कुल कटौती - ऋण चुकौती
 DocType: Bank Account,Last Integration Date,अंतिम एकीकरण की तारीख
 DocType: Expense Claim,Expense Taxes and Charges,व्यय कर और शुल्क
@@ -5852,6 +5866,8 @@
 DocType: Drug Prescription,Hour,घंटा
 DocType: Restaurant Order Entry,Last Sales Invoice,अंतिम बिक्री चालान
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py,Please select Qty against item {0},आइटम के खिलाफ मात्रा का चयन करें {0}
+apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py,Latest Age,देर से मंच
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js,Transfer Material to Supplier,प्रदायक के लिए सामग्री हस्तांतरण
 apps/erpnext/erpnext/hr/report/loan_repayment/loan_repayment.py,EMI,ईएमआई
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py,New Serial No cannot have Warehouse. Warehouse must be set by Stock Entry or Purchase Receipt,नया धारावाहिक कोई गोदाम नहीं कर सकते हैं . गोदाम स्टॉक एंट्री या खरीद रसीद द्वारा निर्धारित किया जाना चाहिए
 DocType: Lead,Lead Type,प्रकार लीड
@@ -5875,7 +5891,6 @@
 apps/erpnext/erpnext/hr/doctype/employee_benefit_application/employee_benefit_application.py,"An amount of {0} already claimed for the component {1},\
 						 set the amount equal or greater than {2}","{0} पहले से घटक {1} के लिए दावा किया गया है, \ {2} से बराबर या उससे अधिक राशि निर्धारित करें"
 DocType: Shipping Rule,Shipping Rule Conditions,नौवहन नियम शर्तें
-DocType: Purchase Invoice,Export Type,निर्यात प्रकार
 DocType: Salary Slip Loan,Salary Slip Loan,वेतन स्लिप ऋण
 DocType: BOM Update Tool,The new BOM after replacement,बदलने के बाद नए बीओएम
 ,Point of Sale,बिक्री के प्वाइंट
@@ -5994,7 +6009,6 @@
 DocType: Purchase Order Item,Blanket Order Rate,कंबल आदेश दर
 ,Customer Ledger Summary,ग्राहक लेजर सारांश
 apps/erpnext/erpnext/hooks.py,Certification,प्रमाणीकरण
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js,Are you sure you want to make debit note?,क्या आप वाकई डेबिट नोट बनाना चाहते हैं?
 DocType: Bank Guarantee,Clauses and Conditions,खंड और शर्तें
 DocType: Serial No,Creation Document Type,निर्माण दस्तावेज़ प्रकार
 DocType: Amazon MWS Settings,ES,ES
@@ -6032,8 +6046,6 @@
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py,Financial Services,वित्तीय सेवाएँ
 DocType: Student Sibling,Student ID,छात्र आईडी
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.js,For Quantity must be greater than zero,मात्रा के लिए शून्य से अधिक होना चाहिए
-apps/erpnext/erpnext/hr/doctype/employee_transfer/employee_transfer.py,"Please delete the Employee <a href=""#Form/Employee/{0}"">{0}</a>\
-					to cancel this document","कृपया इस दस्तावेज़ को रद्द करने के लिए कर्मचारी <a href=""#Form/Employee/{0}"">{0}</a> \ _ हटाएं"
 apps/erpnext/erpnext/config/projects.py,Types of activities for Time Logs,समय लॉग के लिए गतिविधियों के प्रकार
 DocType: Opening Invoice Creation Tool,Sales,विक्रय
 DocType: Stock Entry Detail,Basic Amount,मूल राशि
@@ -6112,6 +6124,7 @@
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py,Print and Stationery,प्रिंट और स्टेशनरी
 DocType: Stock Settings,Show Barcode Field,शो बारकोड फील्ड
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js,Send Supplier Emails,प्रदायक ईमेल भेजें
+DocType: Asset Movement,ACC-ASM-.YYYY.-,एसीसी-एएसएम-.YYYY.-
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py,"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,ऑटो बनाया गया
 apps/erpnext/erpnext/hr/doctype/employee_onboarding/employee_onboarding.py,Submit this to create the Employee record,कर्मचारी रिकॉर्ड बनाने के लिए इसे सबमिट करें
@@ -6189,7 +6202,6 @@
 DocType: Sales Team,Contact No.,सं संपर्क
 apps/erpnext/erpnext/templates/includes/cart/cart_address.html,Billing Address is same as Shipping Address,बिलिंग पता शिपिंग पते के समान है
 DocType: Bank Reconciliation,Payment Entries,भुगतान प्रविष्टियां
-apps/erpnext/erpnext/erpnext_integrations/doctype/shopify_settings/shopify_settings.py,Access token or Shopify URL missing,एक्सेस टोकन या Shopify यूआरएल गायब है
 DocType: Location,Latitude,अक्षांश
 DocType: Work Order,Scrap Warehouse,स्क्रैप गोदाम
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py,"Warehouse required at Row No {0}, please set default warehouse for the item {1} for the company {2}","पंक्ति संख्या {0} पर आवश्यक वेयरहाउस, कृपया कंपनी के लिए आइटम {1} के लिए डिफ़ॉल्ट गोदाम सेट करें {2}"
@@ -6232,7 +6244,6 @@
 DocType: Job Offer Term,Value / Description,मूल्य / विवरण
 apps/erpnext/erpnext/controllers/accounts_controller.py,"Row #{0}: Asset {1} cannot be submitted, it is already {2}","पंक्ति # {0}: संपत्ति {1} प्रस्तुत नहीं किया जा सकता है, यह पहले से ही है {2}"
 DocType: Tax Rule,Billing Country,बिलिंग देश
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js,Are you sure you want to make credit note?,क्या आप वाकई क्रेडिट नोट बनाना चाहते हैं?
 DocType: Purchase Order Item,Expected Delivery Date,उम्मीद डिलीवरी की तारीख
 DocType: Restaurant Order Entry,Restaurant Order Entry,रेस्तरां आदेश प्रविष्टि
 apps/erpnext/erpnext/accounts/general_ledger.py,Debit and Credit not equal for {0} #{1}. Difference is {2}.,डेबिट और क्रेडिट {0} # के लिए बराबर नहीं {1}। अंतर यह है {2}।
@@ -6357,6 +6368,7 @@
 DocType: Purchase Invoice,Taxes and Charges Added,कर और शुल्क जोड़ा
 apps/erpnext/erpnext/assets/doctype/asset/asset.py,Depreciation Row {0}: Next Depreciation Date cannot be before Available-for-use Date,मूल्यह्रास पंक्ति {0}: अगली मूल्यह्रास तिथि उपलब्ध उपयोग के लिए पहले नहीं हो सकती है
 ,Sales Funnel,बिक्री कीप
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Item Code &gt; Item Group &gt; Brand,आइटम कोड&gt; आइटम समूह&gt; ब्रांड
 apps/erpnext/erpnext/setup/doctype/company/company.py,Abbreviation is mandatory,संक्षिप्त अनिवार्य है
 DocType: Project,Task Progress,कार्य प्रगति
 apps/erpnext/erpnext/templates/includes/navbar/navbar_items.html,Cart,गाड़ी
@@ -6601,6 +6613,7 @@
 DocType: Employee Grade,Employee Grade,कर्मचारी ग्रेड
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py,Piecework,ठेका
 DocType: GSTR 3B Report,June,जून
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Supplier &gt; Supplier Type,आपूर्तिकर्ता&gt; आपूर्तिकर्ता प्रकार
 DocType: Share Balance,From No,नंबर से
 DocType: Shift Type,Early Exit Grace Period,प्रारंभिक निकास अनुग्रह अवधि
 DocType: Task,Actual Time (in Hours),(घंटे में) वास्तविक समय
@@ -6885,6 +6898,7 @@
 DocType: Warehouse,Warehouse Name,वेअरहाउस नाम
 DocType: Naming Series,Select Transaction,लेन - देन का चयन करें
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py,Please enter Approving Role or Approving User,रोल अनुमोदन या उपयोगकर्ता स्वीकृति दर्ज करें
+apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.py,UOM Conversion factor ({0} -&gt; {1}) not found for item: {2},UOM रूपांतरण कारक ({0} -&gt; {1}) आइटम के लिए नहीं मिला: {2}
 apps/erpnext/erpnext/support/doctype/service_level_agreement/service_level_agreement.py,Service Level Agreement with Entity Type {0} and Entity {1} already exists.,एंटिटी टाइप {0} और एंटिटी {1} सर्विस लेवल एग्रीमेंट पहले से मौजूद है।
 DocType: Journal Entry,Write Off Entry,एंट्री बंद लिखने
 DocType: BOM,Rate Of Materials Based On,सामग्री के आधार पर दर
@@ -7075,6 +7089,7 @@
 DocType: Quality Inspection Reading,Quality Inspection Reading,गुणवत्ता निरीक्षण पढ़ना
 apps/erpnext/erpnext/stock/doctype/stock_settings/stock_settings.py,`Freeze Stocks Older Than` should be smaller than %d days.,` से अधिक पुराने स्टॉक `% d दिनों से कम होना चाहिए .
 DocType: Tax Rule,Purchase Tax Template,टैक्स टेम्पलेट खरीद
+apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py,Earliest Age,प्राचीनतम युग
 apps/erpnext/erpnext/utilities/user_progress.py,Set a sales goal you'd like to achieve for your company.,एक बिक्री लक्ष्य निर्धारित करें जिसे आप अपनी कंपनी के लिए प्राप्त करना चाहते हैं
 DocType: Quality Goal,Revision,संशोधन
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js,Healthcare Services,स्वास्थ्य देखभाल सेवाएँ
@@ -7118,6 +7133,7 @@
 apps/erpnext/erpnext/healthcare/doctype/patient_encounter/patient_encounter.js,Schedule Discharge,अनुसूची निर्वहन
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py,Cheques and Deposits incorrectly cleared,चेक्स और जमाओं को गलत तरीके से मंजूरी दे दी है
 DocType: Homepage Section Card,Homepage Section Card,होमपेज अनुभाग कार्ड
+,Amount To Be Billed,बिल भेजा जाना है
 apps/erpnext/erpnext/accounts/doctype/account/account.py,Account {0}: You can not assign itself as parent account,खाते {0}: तुम माता पिता के खाते के रूप में खुद को आवंटन नहीं कर सकते
 DocType: Purchase Invoice Item,Price List Rate,मूल्य सूची दर
 apps/erpnext/erpnext/utilities/activation.py,Create customer quotes,ग्राहक उद्धरण बनाएं
@@ -7170,6 +7186,7 @@
 DocType: Supplier Scorecard Criteria,Supplier Scorecard Criteria,आपूर्तिकर्ता स्कोरकार्ड मानदंड
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py,Please select Start Date and End Date for Item {0},प्रारंभ तिथि और आइटम के लिए अंतिम तिथि का चयन करें {0}
 DocType: Maintenance Schedule,MAT-MSH-.YYYY.-,मेट-MSH-.YYYY.-
+,Amount to Receive,प्राप्त करने के लिए राशि
 apps/erpnext/erpnext/education/doctype/student_group_creation_tool/student_group_creation_tool.py,Course is mandatory in row {0},कोर्स पंक्ति में अनिवार्य है {0}
 apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py,From date can not be greater than than To date,तिथि से तिथि से अधिक नहीं हो सकती है
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py,To date cannot be before from date,तिथि करने के लिए तिथि से पहले नहीं हो सकता
@@ -7417,7 +7434,6 @@
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js,BOM and Manufacturing Quantity are required,बीओएम और विनिर्माण मात्रा की आवश्यकता होती है
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js,Ageing Range 2,बूढ़े रेंज 2
 DocType: SG Creation Tool Course,Max Strength,मैक्स शक्ति
-apps/erpnext/erpnext/accounts/doctype/account/account.py,"Account {0} already exists in child company {1}. The following fields have different values, they should be same:<ul><li>{2}</li></ul>","खाता {0} पहले से ही चाइल्ड कंपनी {1} में मौजूद है। निम्नलिखित क्षेत्रों के अलग-अलग मूल्य हैं, वे समान होने चाहिए: <ul><li> {2} </li></ul>"
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py,Installing presets,प्रीसेट स्थापित करना
 DocType: Fee Schedule,EDU-FSH-.YYYY.-,EDU-एफएसएच-.YYYY.-
 apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js,No Delivery Note selected for Customer {},ग्राहक के लिए कोई डिलिवरी नोट चयनित नहीं है {}
@@ -7625,6 +7641,7 @@
 DocType: Delivery Note,Print Without Amount,राशि के बिना प्रिंट
 apps/erpnext/erpnext/accounts/report/asset_depreciation_ledger/asset_depreciation_ledger.py,Depreciation Date,मूल्यह्रास दिनांक
 ,Work Orders in Progress,प्रगति में कार्य आदेश
+DocType: Customer Credit Limit,Bypass Credit Limit Check,बाईपास क्रेडिट लिमिट चेक
 DocType: Issue,Support Team,टीम का समर्थन
 apps/erpnext/erpnext/stock/report/batch_item_expiry_status/batch_item_expiry_status.py,Expiry (In Days),समाप्ति (दिनों में)
 DocType: Appraisal,Total Score (Out of 5),कुल स्कोर (5 से बाहर)
@@ -7808,6 +7825,7 @@
 DocType: Sales Invoice,Customer GSTIN,ग्राहक जीएसटीआईएन
 DocType: Crop Cycle,List of diseases detected on the field. When selected it'll automatically add a list of tasks to deal with the disease ,मैदान पर पाए गए रोगों की सूची जब यह चुना जाता है तो यह बीमारी से निपटने के लिए स्वचालित रूप से कार्यों की एक सूची जोड़ देगा
 apps/erpnext/erpnext/manufacturing/page/bom_comparison_tool/bom_comparison_tool.js,BOM 1,बोम १
+apps/erpnext/erpnext/assets/report/fixed_asset_register/fixed_asset_register.py,Asset Id,संपत्ति आईडी
 apps/erpnext/erpnext/healthcare/doctype/healthcare_service_unit/healthcare_service_unit.js,This is a root healthcare service unit and cannot be edited.,यह एक रूट हेल्थकेयर सेवा इकाई है और इसे संपादित नहीं किया जा सकता है।
 DocType: Asset Repair,Repair Status,स्थिति की मरम्मत
 apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.js,"Requested Qty: Quantity requested for purchase, but not ordered.","निवेदित मात्रा: मात्रा का आदेश दिया खरीद के लिए अनुरोध किया , लेकिन नहीं ."
diff --git a/erpnext/translations/hr.csv b/erpnext/translations/hr.csv
index c92a840..f590e18 100644
--- a/erpnext/translations/hr.csv
+++ b/erpnext/translations/hr.csv
@@ -289,7 +289,6 @@
 DocType: Loan,Repay Over Number of Periods,Vrati Preko broj razdoblja
 apps/erpnext/erpnext/manufacturing/report/bom_stock_report/bom_stock_report.py,Quantity to Produce can not be less than Zero,Količina za proizvodnju ne može biti manja od Nula
 DocType: Stock Entry,Additional Costs,Dodatni troškovi
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Customer &gt; Customer Group &gt; Territory,Kupac&gt; Grupa kupaca&gt; Teritorij
 apps/erpnext/erpnext/accounts/doctype/account/account.py,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
@@ -586,6 +585,7 @@
 DocType: Healthcare Settings,Create documents for sample collection,Izradite dokumente za prikupljanje uzoraka
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py,Payment against {0} {1} cannot be greater than Outstanding Amount {2},Plaćanje protiv {0} {1} ne može biti veća od preostali iznos {2}
 apps/erpnext/erpnext/patches/v11_0/add_healthcare_service_unit_tree_root.py,All Healthcare Service Units,Sve zdravstvene usluge
+apps/erpnext/erpnext/setup/default_energy_point_rules.py,On Converting Opportunity,O mogućnosti pretvorbe
 DocType: Bank Account,Address HTML,Adressa u HTML-u
 DocType: Lead,Mobile No.,Mobitel br.
 apps/erpnext/erpnext/selling/doctype/pos_closing_voucher/closing_voucher_details.html,Mode of Payments,Način plaćanja
@@ -650,7 +650,6 @@
 DocType: Accounting Dimension,Dimension Name,Naziv dimenzije
 apps/erpnext/erpnext/healthcare/setup.py,Resistant,otporan
 apps/erpnext/erpnext/hotels/doctype/hotel_room_reservation/hotel_room_reservation.py,Please set Hotel Room Rate on {},Molimo postavite Hotel Room Rate na {}
-apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py,Please setup numbering series for Attendance via Setup &gt; Numbering Series,Postavite serijsku brojevnu seriju za Attendance putem Postavljanje&gt; Numeriranje serija
 DocType: Journal Entry,Multi Currency,Više valuta
 DocType: Bank Statement Transaction Invoice Item,Invoice Type,Tip fakture
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py,Valid from date must be less than valid upto date,Vrijedi od datuma mora biti manje od važećeg do datuma
@@ -765,6 +764,7 @@
 apps/erpnext/erpnext/accounts/page/pos/pos.js,Create a new Customer,Stvaranje novog kupca
 apps/erpnext/erpnext/non_profit/report/expiring_memberships/expiring_memberships.py,Expiring On,Istječe
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,"If multiple Pricing Rules continue to prevail, users are asked to set Priority manually to resolve conflict.","Ako više Cijene pravila i dalje prevladavaju, korisnici su zamoljeni da postavite prioritet ručno riješiti sukob."
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js,Purchase Return,Kupnja Povratak
 apps/erpnext/erpnext/utilities/activation.py,Create Purchase Orders,Izrada narudžbenice
 ,Purchase Register,Popis nabave
 apps/erpnext/erpnext/healthcare/doctype/patient/patient.py,Patient not found,Pacijent nije pronađen
@@ -780,7 +780,6 @@
 DocType: Location,Area UOM,Područje UOM
 apps/erpnext/erpnext/manufacturing/doctype/workstation/workstation.py,Workstation is closed on the following dates as per Holiday List: {0},Radna stanica je zatvorena na sljedeće datume po Holiday Popis: {0}
 apps/erpnext/erpnext/selling/page/sales_funnel/sales_funnel.py,Opportunities,Mogućnosti
-apps/erpnext/erpnext/www/all-products/index.html,Clear filters,Očistite filtre
 DocType: Lab Test Template,Single,Singl
 DocType: Compensatory Leave Request,Work From Date,Rad s datumom
 DocType: Salary Slip,Total Loan Repayment,Ukupno otplate kredita
@@ -823,6 +822,7 @@
 DocType: Account,Old Parent,Stari Roditelj
 apps/erpnext/erpnext/education/doctype/program_enrollment_tool/program_enrollment_tool.py,Mandatory field - Academic Year,Obavezno polje - akademska godina
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py,{0} {1} is not associated with {2} {3},{0} {1} nije povezan s {2} {3}
+DocType: Opportunity,Converted By,Pretvorio
 apps/erpnext/erpnext/public/js/hub/components/ReviewArea.vue,You need to login as a Marketplace User before you can add any reviews.,"Prije nego što dodate bilo koju recenziju, morate se prijaviti kao korisnik Marketplacea."
 apps/erpnext/erpnext/manufacturing/doctype/job_card/job_card.py,Row {0} : Operation is required against the raw material item {1},Redak {0}: Potrebna je operacija prema stavci sirovine {1}
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py,Please set default payable account for the company {0},Postavite zadani dugovni račun za tvrtku {0}
@@ -848,6 +848,8 @@
 DocType: BOM,Work Order,Radni nalog
 DocType: Sales Invoice,Total Qty,Ukupna količina
 apps/erpnext/erpnext/education/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py,Guardian2 Email ID,ID e-pošte Guardian2
+apps/erpnext/erpnext/hr/doctype/employee_transfer/employee_transfer.py,"Please delete the Employee <a href=""#Form/Employee/{0}"">{0}</a>\
+					to cancel this document","Izbrišite zaposlenika <a href=""#Form/Employee/{0}"">{0}</a> \ da biste otkazali ovaj dokument"
 DocType: Item,Show in Website (Variant),Prikaži u Web (Variant)
 DocType: Employee,Health Concerns,Zdravlje Zabrinutost
 DocType: Payroll Entry,Select Payroll Period,Odaberite Platne razdoblje
@@ -907,7 +909,6 @@
 DocType: Codification Table,Codification Table,Tablica kodifikacije
 DocType: Timesheet Detail,Hrs,hrs
 apps/erpnext/erpnext/manufacturing/page/bom_comparison_tool/bom_comparison_tool.js,Changes in {0},Promjene u {0}
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js,Please select Company,Odaberite tvrtke
 DocType: Employee Skill,Employee Skill,Vještina zaposlenika
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.js,Difference Account,Račun razlike
 DocType: Pricing Rule,Discount on Other Item,Popust na drugi artikl
@@ -975,6 +976,7 @@
 DocType: BOM,Operating Cost,Operativni troškovi
 DocType: Crop,Produced Items,Proizvedene stavke
 DocType: Bank Statement Transaction Entry,Match Transaction to Invoices,Podudaranje transakcije s fakturama
+apps/erpnext/erpnext/erpnext_integrations/exotel_integration.py,Error in Exotel incoming call,Pogreška u dolaznom pozivu Exotela
 DocType: Sales Order Item,Gross Profit,Bruto dobit
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js,Unblock Invoice,Deblokiraj fakturu
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py,Increment cannot be 0,Prirast ne može biti 0
@@ -1188,6 +1190,7 @@
 DocType: Activity Cost,Activity Type,Tip aktivnosti
 DocType: Request for Quotation,For individual supplier,Za pojedinog opskrbljivača
 DocType: BOM Operation,Base Hour Rate(Company Currency),Baza Sat stopa (Društvo valuta)
+,Qty To Be Billed,Količina za naplatu
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py,Delivered Amount,Isporučeno Iznos
 apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.js,Reserved Qty for Production: Raw materials quantity to make manufacturing items.,Količina rezervirane za proizvodnju: Količina sirovina za izradu proizvodnih predmeta.
 DocType: Loyalty Point Entry Redemption,Redemption Date,Datum otkupa
@@ -1306,7 +1309,7 @@
 DocType: Sales Invoice,Commission Rate (%),Komisija stopa (%)
 apps/erpnext/erpnext/education/doctype/student_group/student_group.py,Please select Program,Odaberite Program
 DocType: Project,Estimated Cost,Procjena cijene
-DocType: Request for Quotation,Link to material requests,Link na materijalnim zahtjevima
+DocType: Supplier Quotation,Link to material requests,Link na materijalnim zahtjevima
 apps/erpnext/erpnext/public/js/hub/pages/Publish.vue,Publish,Objaviti
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py,Aerospace,Zračno-kosmički prostor
 ,Fichier des Ecritures Comptables [FEC],Fichier des Ecritures Comptables [FEC]
@@ -1319,6 +1322,7 @@
 apps/erpnext/erpnext/utilities/transaction_base.py,Invalid Posting Time,Nevažeće vrijeme knjiženja
 DocType: Salary Component,Condition and Formula,Stanje i Formula
 DocType: Lead,Campaign Name,Naziv kampanje
+apps/erpnext/erpnext/setup/default_energy_point_rules.py,On Task Completion,Po završetku zadatka
 apps/erpnext/erpnext/hr/doctype/compensatory_leave_request/compensatory_leave_request.py,There is no leave period in between {0} and {1},Ne postoji razdoblje odmora između {0} i {1}
 DocType: Fee Validity,Healthcare Practitioner,Zdravstveni praktičar
 DocType: Hotel Room,Capacity,Kapacitet
@@ -1682,7 +1686,6 @@
 DocType: Quality Feedback Template,Quality Feedback Template,Predložak povratne informacije o kvaliteti
 apps/erpnext/erpnext/config/education.py,LMS Activity,LMS aktivnost
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py,Internet Publishing,Internet izdavaštvo
-DocType: Prescription Duration,Number,Broj
 apps/erpnext/erpnext/accounts/doctype/opening_invoice_creation_tool/opening_invoice_creation_tool.js,Creating {0} Invoice,Izrada fakture {0}
 DocType: Medical Code,Medical Code Standard,Standard medicinskog koda
 DocType: Soil Texture,Clay Composition (%),Sastava glina (%)
@@ -1757,6 +1760,7 @@
 DocType: Support Settings,Get Started Sections,Započnite s radom
 DocType: Lead,CRM-LEAD-.YYYY.-,CRM-OLOVO-.YYYY.-
 DocType: Invoice Discounting,Sanctioned,kažnjeni
+,Base Amount,Osnovni iznos
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.js,Total Contribution Amount: {0},Iznos ukupnog iznosa doprinosa: {0}
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py,Row #{0}: Please specify Serial No for Item {1},Row # {0}: Navedite rednim brojem predmeta za {1}
 DocType: Payroll Entry,Salary Slips Submitted,Plaćene zamke poslane
@@ -1974,6 +1978,7 @@
 apps/erpnext/erpnext/utilities/user_progress.py,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.
 DocType: Accounting Dimension,Dimension Defaults,Zadane dimenzije
 apps/erpnext/erpnext/crm/report/prospects_engaged_but_not_converted/prospects_engaged_but_not_converted.js,Minimum Lead Age (Days),Minimalna dob (olovo)
+apps/erpnext/erpnext/assets/report/fixed_asset_register/fixed_asset_register.py,Available For Use Date,Datum upotrebe
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py,All BOMs,Svi Sastavnice
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js,Create Inter Company Journal Entry,Napravite unos časopisa Inter Company
 DocType: Company,Parent Company,Matično društvo
@@ -2038,6 +2043,7 @@
 ,IRS 1099,IRS 1099
 DocType: Salary Slip,Leave Without Pay,Neplaćeno odsustvo
 DocType: Payment Request,Outward,van
+apps/erpnext/erpnext/setup/default_energy_point_rules.py,On {0} Creation,Na {0} Stvaranje
 apps/erpnext/erpnext/regional/doctype/gstr_3b_report/gstr_3b_report.html,State/UT Tax,Porez na države / UT
 ,Trial Balance for Party,Suđenje Stanje na stranku
 ,Gross and Net Profit Report,Izvješće o bruto i neto dobiti
@@ -2153,6 +2159,7 @@
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js,Make Stock Entry,Unesite zalihe
 DocType: Hotel Room Reservation,Hotel Reservation User,Korisnik hotela rezervacije
 apps/erpnext/erpnext/projects/doctype/project/project.js,Set Status,Postavite status
+apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py,Please setup numbering series for Attendance via Setup &gt; Numbering Series,Postavite serijsku brojevnu seriju za Attendance putem Postavljanje&gt; Numeriranje serija
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py,Please select prefix first,Odaberite prefiks prvi
 DocType: Contract,Fulfilment Deadline,Rok provedbe
 apps/erpnext/erpnext/public/js/hub/pages/Home.vue,Near you,Blizu tebe
@@ -2168,6 +2175,7 @@
 DocType: Announcement,All Students,Svi studenti
 apps/erpnext/erpnext/assets/doctype/asset/asset.py,Item {0} must be a non-stock item,Stavka {0} mora biti ne-stock točka a
 apps/erpnext/erpnext/stock/doctype/batch/batch.js,View Ledger,Pogledaj Ledger
+DocType: Cost Center,Lft,LFT
 DocType: Grading Scale,Intervals,intervali
 DocType: Bank Statement Transaction Entry,Reconciled Transactions,Usklađene transakcije
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py,Earliest,Najstarije
@@ -2283,6 +2291,7 @@
 apps/erpnext/erpnext/hr/doctype/employee_benefit_application/employee_benefit_application.py,As per your assigned Salary Structure you cannot apply for benefits,Prema vašoj dodijeljenoj Strukturi plaća ne možete podnijeti zahtjev za naknadu
 apps/erpnext/erpnext/stock/doctype/item/item.py,Website Image should be a public file or website URL,Web slika bi trebala biti javna datoteke ili URL web stranice
 DocType: Purchase Invoice Item,BOM,BOM
+apps/erpnext/erpnext/stock/doctype/item/item.py,Duplicate entry in Manufacturers table,Duplikat unosa u tablici proizvođača
 apps/erpnext/erpnext/setup/doctype/item_group/item_group.js,This is a root item group and cannot be edited.,To jekorijen stavka grupa i ne može se mijenjati .
 apps/erpnext/erpnext/accounts/doctype/account/account.js,Merge,Sjediniti
 DocType: Journal Entry Account,Purchase Order,Narudžbenica
@@ -2427,7 +2436,6 @@
 DocType: Asset,Depreciation Schedules,amortizacija Raspored
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.js,Create Sales Invoice,Stvorite račun za prodaju
 apps/erpnext/erpnext/regional/doctype/gstr_3b_report/gstr_3b_report.html,Ineligible ITC,Neprihvatljiv ITC
-apps/erpnext/erpnext/erpnext_integrations/doctype/shopify_settings/shopify_settings.py,"Support for public app is deprecated. Please setup private app, for more details refer user manual","Podrška za javnu aplikaciju je obustavljena. Postavite privatnu aplikaciju, a više pojedinosti potražite u korisničkom priručniku"
 DocType: Task,Dependent Tasks,Zavisni zadaci
 apps/erpnext/erpnext/regional/report/gstr_1/gstr_1.py,Following accounts might be selected in GST Settings:,Sljedeći računi mogu biti odabrani u GST postavkama:
 apps/erpnext/erpnext/manufacturing/report/bom_stock_report/bom_stock_report.js,Quantity to Produce,Količina za proizvodnju
@@ -2680,6 +2688,7 @@
 DocType: Water Analysis,Container,kontejner
 apps/erpnext/erpnext/regional/report/gstr_1/gstr_1.py,Please set valid GSTIN No. in Company Address,Molimo postavite važeći GSTIN broj na adresi tvrtke
 apps/erpnext/erpnext/education/utils.py,Student {0} - {1} appears Multiple times in row {2} & {3},Student {0} - {1} pojavljuje više puta u nizu {2} {3}
+apps/erpnext/erpnext/selling/doctype/customer/customer.py,Following fields are mandatory to create address:,Sljedeća polja su obavezna za stvaranje adrese:
 DocType: Item Alternative,Two-way,Dvosmjeran
 DocType: Item,Manufacturers,Proizvođači
 apps/erpnext/erpnext/accounts/deferred_revenue.py,Error while processing deferred accounting for {0},Pogreška tijekom obrade odgođenog računovodstva za {0}
@@ -2754,9 +2763,9 @@
 DocType: Employee,HR-EMP-,HR-Poslodavci
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py,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: Quality Meeting Minutes,Quality Meeting Minutes,Zapisnici sa kvalitetnim sastankom
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Supplier &gt; Supplier Type,Dobavljač&gt; vrsta dobavljača
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py,Employee Referral,Upućivanje zaposlenika
 DocType: Student Group,Set 0 for no limit,Postavite 0 bez granica
+DocType: Cost Center,rgt,RGT
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py,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.
 DocType: Customer,Primary Address and Contact Detail,Primarna adresa i kontakt detalja
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.js,Resend Payment Email,Ponovno slanje plaćanja Email
@@ -2866,7 +2875,6 @@
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py,Against Supplier Invoice {0} dated {1},Protiv dobavljača Račun {0} datira {1}
 DocType: Customer,Default Price List,Zadani cjenik
 apps/erpnext/erpnext/assets/doctype/asset/asset.py,Asset Movement record {0} created,Unos imovine Pokret {0} stvorio
-apps/erpnext/erpnext/utilities/page/leaderboard/leaderboard.js,No items found.,Nijedna stavka nije pronađena.
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py,You cannot delete Fiscal Year {0}. Fiscal Year {0} is set as default in Global Settings,Ne možete izbrisati Fiskalnu godinu {0}. Fiskalna godina {0} je postavljena kao zadana u Globalnim postavkama
 DocType: Share Transfer,Equity/Liability Account,Račun vlasničke i odgovornosti
 apps/erpnext/erpnext/setup/doctype/customer_group/customer_group.py,A customer with the same name already exists,Kupac s istim imenom već postoji
@@ -2882,6 +2890,7 @@
 apps/erpnext/erpnext/selling/doctype/customer/customer.py,Credit limit has been crossed for customer {0} ({1}/{2}),Kreditna je ograničenja prekinuta za kupca {0} ({1} / {2})
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py,Customer required for 'Customerwise Discount',Kupac je potrebno za ' Customerwise Popust '
 apps/erpnext/erpnext/config/accounting.py,Update bank payment dates with journals.,Update banka datum plaćanja s časopisima.
+,Billed Qty,Količina računa
 apps/erpnext/erpnext/stock/doctype/item/item_dashboard.py,Pricing,Cijena
 DocType: Employee,Attendance Device ID (Biometric/RF tag ID),ID uređaja za posjećenost (ID biometrijske / RF oznake)
 DocType: Quotation,Term Details,Oročeni Detalji
@@ -2903,6 +2912,7 @@
 DocType: Share Transfer,Asset Account,Asset Account
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js,New release date should be in the future,Novi datum izlaska trebao bi biti u budućnosti
 DocType: Purchase Invoice,End date of current invoice's period,Kraj datum tekućeg razdoblja dostavnice
+apps/erpnext/erpnext/hr/doctype/employee/employee.py,Please setup Employee Naming System in Human Resource &gt; HR Settings,Postavite sustav imenovanja zaposlenika u Ljudski resursi&gt; HR postavke
 DocType: Lab Test,Technician Name,Naziv tehničara
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py,"Cannot ensure delivery by Serial No as \
 					Item {0} is added with and without Ensure Delivery by \
@@ -2910,6 +2920,7 @@
 DocType: Accounts Settings,Unlink Payment on Cancellation of Invoice,Prekini vezu Plaćanje o otkazu fakture
 DocType: Bank Reconciliation,From Date,Od datuma
 apps/erpnext/erpnext/hr/doctype/vehicle_log/vehicle_log.py,Current Odometer reading entered should be greater than initial Vehicle Odometer {0},Trenutno stanje kilometraže ušao bi trebala biti veća od početne vozila kilometraže {0}
+,Purchase Order Items To Be Received or Billed,Kupnja stavki za primanje ili naplatu
 DocType: Restaurant Reservation,No Show,Nema prikazivanja
 apps/erpnext/erpnext/regional/india/utils.py,You must be a registered supplier to generate e-Way Bill,Za generiranje računa za e-put morate biti registrirani dobavljač
 DocType: Shipping Rule Country,Shipping Rule Country,Pravilo dostava Država
@@ -2952,6 +2963,7 @@
 apps/erpnext/erpnext/templates/generators/item/item_add_to_cart.html,View in Cart,Pogledaj u košaricu
 DocType: Employee Checkin,Shift Actual Start,Stvarni početak promjene
 DocType: Tally Migration,Is Day Book Data Imported,Uvoze li se podaci dnevnih knjiga
+,Purchase Order Items To Be Received or Billed1,Kupnja predmeta koji treba primiti ili naplatiti1
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py,Marketing Expenses,Troškovi marketinga
 apps/erpnext/erpnext/stock/doctype/pick_list/pick_list.py,{0} units of {1} is not available.,{0} jedinice od {1} nisu dostupne.
 ,Item Shortage Report,Nedostatak izvješća za proizvod
@@ -3175,7 +3187,6 @@
 apps/erpnext/erpnext/public/js/call_popup/call_popup.js,View all issues from {0},Pregled svih izdanja od {0}
 DocType: Quality Inspection,MAT-QA-.YYYY.-,MAT-QA-.YYYY.-
 DocType: Quality Meeting Table,Quality Meeting Table,Stol za sastanke o kvaliteti
-apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,Postavite Nameing Series za {0} putem Postavke&gt; Postavke&gt; Imenovanje serija
 apps/erpnext/erpnext/templates/pages/help.html,Visit the forums,Posjetite forume
 DocType: Student,Student Mobile Number,Studentski broj mobitela
 DocType: Item,Has Variants,Je Varijante
@@ -3318,6 +3329,7 @@
 DocType: Homepage Section,Section Cards,Karte odsjeka
 ,Campaign Efficiency,Učinkovitost kampanje
 DocType: Discussion,Discussion,Rasprava
+apps/erpnext/erpnext/setup/default_energy_point_rules.py,On Sales Order Submission,Na predaju prodajnih naloga
 DocType: Bank Transaction,Transaction ID,ID transakcije
 DocType: Payroll Entry,Deduct Tax For Unsubmitted Tax Exemption Proof,Odbitak poreza za nepodoban dokaz o oslobođenju poreza
 DocType: Volunteer,Anytime,Bilo kada
@@ -3325,7 +3337,6 @@
 DocType: Employee Tax Exemption Proof Submission,Employee Tax Exemption Proof Submission,Podnošenje dokaza o izuzeću od izuzeća od zaposlenika
 DocType: Patient,Surgical History,Kirurška povijest
 DocType: Bank Statement Settings Item,Mapped Header,Mapped Header
-apps/erpnext/erpnext/hr/doctype/employee/employee.py,Please setup Employee Naming System in Human Resource &gt; HR Settings,Postavite sustav imenovanja zaposlenika u Ljudski resursi&gt; HR postavke
 DocType: Employee,Resignation Letter Date,Ostavka Pismo Datum
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Pricing Rules are further filtered based on quantity.,Pravilnik o određivanju cijena dodatno se filtrira na temelju količine.
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py,Please set the Date Of Joining for employee {0},Postavite datum pridruživanja za zaposlenika {0}
@@ -3339,6 +3350,7 @@
 DocType: Bank Statement Settings,Mapped Items,Mapped Items
 DocType: Amazon MWS Settings,IT,TO
 DocType: Chapter,Chapter,Poglavlje
+,Fixed Asset Register,Registar fiksne imovine
 apps/erpnext/erpnext/utilities/user_progress.py,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,Select BOM and Qty for Production,Odaberite BOM i Kol za proizvodnju
@@ -3474,7 +3486,6 @@
 apps/erpnext/erpnext/templates/emails/reorder_item.html,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
 apps/erpnext/erpnext/controllers/accounts_controller.py,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/hr/doctype/salary_structure_assignment/salary_structure_assignment.py,From Date {0} cannot be after employee's relieving Date {1},Od datuma {0} ne može biti nakon datuma olakšavanja zaposlenika {1}
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py,Debit Note {0} has been created automatically,Bilješka o zaduženju {0} stvorena je automatski
 apps/erpnext/erpnext/accounts/doctype/payment_order/payment_order.js,Create Payment Entries,Stvorite uplate za plaćanje
 DocType: Supplier,Is Internal Supplier,Je li unutarnji dobavljač
 DocType: Employee,Create User Permission,Izradi User Permission
@@ -4032,7 +4043,6 @@
 DocType: Project User,Project Status,Status projekta
 DocType: UOM,Check this to disallow fractions. (for Nos),Provjerite to da ne dopušta frakcija. (Za br)
 DocType: Student Admission Program,Naming Series (for Student Applicant),Imenovanje serije (za studentske zahtjeva)
-apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.py,UOM Conversion factor ({0} -&gt; {1}) not found for item: {2},Faktor konverzije UOM ({0} -&gt; {1}) nije pronađen za stavku: {2}
 apps/erpnext/erpnext/hr/doctype/retention_bonus/retention_bonus.py,Bonus Payment Date cannot be a past date,Datum plaćanja bonusa ne može biti posljednji datum
 DocType: Travel Request,Copy of Invitation/Announcement,Kopija pozivnice / obavijesti
 DocType: Practitioner Service Unit Schedule,Practitioner Service Unit Schedule,Raspored
@@ -4200,6 +4210,7 @@
 apps/erpnext/erpnext/utilities/user_progress.py,Setup Company,Tvrtka za postavljanje
 ,Lab Test Report,Izvješće testiranja laboratorija
 DocType: Employee Benefit Application,Employee Benefit Application,Primjena zaposlenika
+apps/erpnext/erpnext/accounts/doctype/invoice_discounting/invoice_discounting.py,Row({0}): {1} is already discounted in {2},Red ({0}): {1} već je snižen u {2}
 apps/erpnext/erpnext/hr/doctype/additional_salary/additional_salary.py,Additional Salary Component Exists.,Postoje dodatne komponente plaće.
 DocType: Purchase Invoice,Unregistered,neregistrovan
 DocType: Student Applicant,Application Date,Datum Primjena
@@ -4278,7 +4289,6 @@
 DocType: Journal Entry,Accounting Entries,Računovodstvenih unosa
 DocType: Job Card Time Log,Job Card Time Log,Evidencija vremena radne kartice
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,"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;."
-apps/erpnext/erpnext/education/doctype/instructor/instructor.py,Please setup Instructor Naming System in Education &gt; Education Settings,Postavite sustav imenovanja instruktora u Obrazovanje&gt; Postavke obrazovanja
 DocType: Journal Entry,Paid Loan,Plaćeni zajam
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py,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
@@ -4295,7 +4305,6 @@
 apps/erpnext/erpnext/templates/pages/projects.html,No time sheets,Nema vremenske tablice
 DocType: GoCardless Mandate,GoCardless Customer,GoCardless Customer
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py,Leave Type {0} cannot be carry-forwarded,Ostavite Tip {0} ne može nositi-proslijeđen
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Item Code &gt; Item Group &gt; Brand,Kod artikla&gt; Grupa artikala&gt; Marka
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py,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
 DocType: Leave Encashment,Payroll,Platni spisak
@@ -4410,7 +4419,6 @@
 DocType: Stock Ledger Entry,Actual Qty After Transaction,Stvarna količina nakon transakcije
 ,Pending SO Items For Purchase Request,Otvorene stavke narudžbe za zahtjev za kupnju
 apps/erpnext/erpnext/education/doctype/student_admission/student_admission.py,Student Admissions,Studentski Upisi
-apps/erpnext/erpnext/accounts/party.py,{0} {1} is disabled,{0} {1} je onemogućen
 DocType: Supplier,Billing Currency,Naplata valuta
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py,Extra Large,Extra large
 DocType: Loan,Loan Application,Primjena zajma
@@ -4487,7 +4495,6 @@
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py,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/accounts/doctype/accounting_dimension/accounting_dimension.py,Creating Dimensions...,Izrada dimenzija ...
 apps/erpnext/erpnext/education/doctype/student_group_creation_tool/student_group_creation_tool.py,Student Group Name is mandatory in row {0},Student Grupa Ime obvezna je u redu {0}
-DocType: Customer Credit Limit,Bypass credit limit_check,Zaobiđite ograničenje kredita
 DocType: Homepage,Products to be shown on website homepage,Proizvodi koji će biti prikazan na web stranici početnu stranicu
 DocType: HR Settings,Password Policy,Politika lozinke
 apps/erpnext/erpnext/setup/doctype/customer_group/customer_group.js,This is a root customer group and cannot be edited.,Ovo je glavna grupa kupaca i ne može se mijenjati.
@@ -4791,6 +4798,7 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py,Row {0}: Advance against Customer must be credit,Red {0}: Advance protiv Kupac mora biti kreditna
 DocType: Quality Meeting,Quality Meeting,Sastanak kvalitete
 apps/erpnext/erpnext/accounts/doctype/account/account.js,Non-Group to Group,Non-skupine do skupine
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,Postavite Nameing Series za {0} putem Postavke&gt; Postavke&gt; Imenovanje serija
 DocType: Employee,ERPNext User,ERPNext korisnik
 apps/erpnext/erpnext/education/doctype/student_group_creation_tool/student_group_creation_tool.py,Batch is mandatory in row {0},Šarža je obavezna u retku {0}
 DocType: Company,Default Buying Terms,Zadani uvjeti kupnje
@@ -5085,6 +5093,7 @@
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py,No {0} found for Inter Company Transactions.,Ne postoji {0} pronađen za transakcije tvrtke Inter.
 DocType: Travel Itinerary,Rented Car,Najam automobila
 apps/erpnext/erpnext/public/js/hub/components/profile_dialog.js,About your Company,O vašoj tvrtki
+apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.js,Show Stock Ageing Data,Pokaži podatke o starenju zaliha
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py,Credit To account must be a Balance Sheet account,Kredit na računu mora biti bilanca račun
 DocType: Donor,Donor,donator
 DocType: Global Defaults,Disable In Words,Onemogućavanje riječima
@@ -5099,8 +5108,10 @@
 DocType: Practitioner Schedule,Schedule Name,Raspored imena
 apps/erpnext/erpnext/regional/doctype/gstr_3b_report/gstr_3b_report.py,Please enter GSTIN and state for the Company Address {0},Unesite GSTIN i upišite adresu tvrtke {0}
 DocType: Currency Exchange,For Buying,Za kupnju
+apps/erpnext/erpnext/setup/default_energy_point_rules.py,On Purchase Order Submission,Nakon predaje narudžbe
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js,Add All Suppliers,Dodaj sve dobavljače
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py,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/accounts/doctype/pricing_rule/pricing_rule.js,Customer &gt; Customer Group &gt; Territory,Kupac&gt; Grupa kupaca&gt; Teritorij
 DocType: Tally Migration,Parties,Strane
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js,Browse BOM,Pretraživanje BOM
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py,Secured Loans,osigurani krediti
@@ -5132,6 +5143,7 @@
 apps/erpnext/erpnext/stock/doctype/item_alternative/item_alternative.py,Not allow to set alternative item for the item {0},Ne dopusti postavljanje alternativne stavke za stavku {0}
 apps/erpnext/erpnext/hr/doctype/leave_block_list/leave_block_list.py,Date is repeated,Datum se ponavlja
 apps/erpnext/erpnext/accounts/print_format/payment_receipt_voucher/payment_receipt_voucher.html,Authorized Signatory,Ovlašteni potpisnik
+apps/erpnext/erpnext/education/doctype/instructor/instructor.py,Please setup Instructor Naming System in Education &gt; Education Settings,Postavite sustav imenovanja instruktora u Obrazovanje&gt; Postavke obrazovanja
 apps/erpnext/erpnext/regional/doctype/gstr_3b_report/gstr_3b_report.html,Net ITC Available(A) - (B),Neto dostupan ITC (A) - (B)
 apps/erpnext/erpnext/education/doctype/fee_schedule/fee_schedule.js,Create Fees,Napravite naknade
 DocType: Project,Total Purchase Cost (via Purchase Invoice),Ukupno troškovi nabave (putem kupnje proizvoda)
@@ -5152,6 +5164,7 @@
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.js,Message Sent,Poslana poruka
 apps/erpnext/erpnext/accounts/doctype/account/account.py,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/assets/report/fixed_asset_register/fixed_asset_register.py,Vendor Name,Naziv dobavljača
 DocType: Quiz Result,Wrong,pogrešno
 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)
@@ -5395,6 +5408,7 @@
 DocType: Stock Settings,Auto Material Request,Automatski zahtjev za materijalom
 DocType: Woocommerce Settings,API consumer secret,API tajna potrošača
 DocType: Delivery Note Item,Available Batch Qty at From Warehouse,Dostupno Batch Količina u iz skladišta
+,Received Qty Amount,Primljena količina u količini
 DocType: Salary Slip,Gross Pay - Total Deduction - Loan Repayment,Bruto plaća - Ukupni odbitak - otplate kredita
 DocType: Bank Account,Last Integration Date,Zadnji datum integracije
 DocType: Expense Claim,Expense Taxes and Charges,Porez na poreza i naknada
@@ -5853,6 +5867,8 @@
 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,Please select Qty against item {0},Odaberite Qty od stavke {0}
+apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py,Latest Age,Najnovije doba
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js,Transfer Material to Supplier,Prebaci Materijal Dobavljaču
 apps/erpnext/erpnext/hr/report/loan_repayment/loan_repayment.py,EMI,EMI
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py,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
@@ -5876,7 +5892,6 @@
 apps/erpnext/erpnext/hr/doctype/employee_benefit_application/employee_benefit_application.py,"An amount of {0} already claimed for the component {1},\
 						 set the amount equal or greater than {2}","Iznos {0} već zatraži za komponentu {1}, \ postavite iznos koji je jednak ili veći od {2}"
 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
 DocType: BOM Update Tool,The new BOM after replacement,Novi BOM nakon zamjene
 ,Point of Sale,Point of Sale
@@ -5996,7 +6011,6 @@
 DocType: Purchase Order Item,Blanket Order Rate,Brzina narudžbe
 ,Customer Ledger Summary,Sažetak knjige klijenta
 apps/erpnext/erpnext/hooks.py,Certification,potvrda
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js,Are you sure you want to make debit note?,Jeste li sigurni da želite izvršiti zaduženje?
 DocType: Bank Guarantee,Clauses and Conditions,Klauzule i uvjeti
 DocType: Serial No,Creation Document Type,Tip stvaranje dokumenata
 DocType: Amazon MWS Settings,ES,ES
@@ -6034,8 +6048,6 @@
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py,Financial Services,Financijske usluge
 DocType: Student Sibling,Student ID,studentska iskaznica
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.js,For Quantity must be greater than zero,Količina mora biti veća od nule
-apps/erpnext/erpnext/hr/doctype/employee_transfer/employee_transfer.py,"Please delete the Employee <a href=""#Form/Employee/{0}"">{0}</a>\
-					to cancel this document","Izbrišite zaposlenika <a href=""#Form/Employee/{0}"">{0}</a> \ da biste otkazali ovaj dokument"
 apps/erpnext/erpnext/config/projects.py,Types of activities for Time Logs,Vrste aktivnosti za vrijeme Evidencije
 DocType: Opening Invoice Creation Tool,Sales,Prodaja
 DocType: Stock Entry Detail,Basic Amount,Osnovni iznos
@@ -6114,6 +6126,7 @@
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py,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,Send Supplier Emails,Pošalji Supplier e-pošte
+DocType: Asset Movement,ACC-ASM-.YYYY.-,ACC-ASM-.YYYY.-
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py,"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
 apps/erpnext/erpnext/hr/doctype/employee_onboarding/employee_onboarding.py,Submit this to create the Employee record,Pošaljite ovo kako biste stvorili zapisnik zaposlenika
@@ -6191,7 +6204,6 @@
 DocType: Sales Team,Contact No.,Kontakt broj
 apps/erpnext/erpnext/templates/includes/cart/cart_address.html,Billing Address is same as Shipping Address,Adresa za naplatu jednaka je adresi za dostavu
 DocType: Bank Reconciliation,Payment Entries,Prijave plaćanja
-apps/erpnext/erpnext/erpnext_integrations/doctype/shopify_settings/shopify_settings.py,Access token or Shopify URL missing,Nedostaje pristupni token ili Shopify URL
 DocType: Location,Latitude,širina
 DocType: Work Order,Scrap Warehouse,otpaci Skladište
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py,"Warehouse required at Row No {0}, please set default warehouse for the item {1} for the company {2}","Skladište je potrebno za redak br. {0}, postavite zadano skladište za stavku {1} za tvrtku {2}"
@@ -6234,7 +6246,6 @@
 DocType: Job Offer Term,Value / Description,Vrijednost / Opis
 apps/erpnext/erpnext/controllers/accounts_controller.py,"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
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js,Are you sure you want to make credit note?,Jeste li sigurni da želite uplatiti kreditni račun?
 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,Debit and Credit not equal for {0} #{1}. Difference is {2}.,Debitne i kreditne nije jednaka za {0} # {1}. Razlika je {2}.
@@ -6359,6 +6370,7 @@
 DocType: Purchase Invoice,Taxes and Charges Added,Porezi i naknade Dodano
 apps/erpnext/erpnext/assets/doctype/asset/asset.py,Depreciation Row {0}: Next Depreciation Date cannot be before Available-for-use Date,Row amortizacije {0}: Sljedeći datum amortizacije ne može biti prije datuma raspoloživog korištenja
 ,Sales Funnel,prodaja dimnjak
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Item Code &gt; Item Group &gt; Brand,Kod artikla&gt; Grupa artikala&gt; Marka
 apps/erpnext/erpnext/setup/doctype/company/company.py,Abbreviation is mandatory,Naziv je obavezan
 DocType: Project,Task Progress,Zadatak Napredak
 apps/erpnext/erpnext/templates/includes/navbar/navbar_items.html,Cart,Kolica
@@ -6603,6 +6615,7 @@
 DocType: Employee Grade,Employee Grade,Grade zaposlenika
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py,Piecework,Rad po komadu
 DocType: GSTR 3B Report,June,lipanj
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Supplier &gt; Supplier Type,Dobavljač&gt; vrsta dobavljača
 DocType: Share Balance,From No,Od br
 DocType: Shift Type,Early Exit Grace Period,Period prijevremenog izlaska iz milosti
 DocType: Task,Actual Time (in Hours),Stvarno vrijeme (u satima)
@@ -6887,6 +6900,7 @@
 DocType: Warehouse,Warehouse Name,Naziv skladišta
 DocType: Naming Series,Select Transaction,Odaberite transakciju
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py,Please enter Approving Role or Approving User,Unesite Odobravanje ulogu ili Odobravanje korisnike
+apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.py,UOM Conversion factor ({0} -&gt; {1}) not found for item: {2},Faktor konverzije UOM ({0} -&gt; {1}) nije pronađen za stavku: {2}
 apps/erpnext/erpnext/support/doctype/service_level_agreement/service_level_agreement.py,Service Level Agreement with Entity Type {0} and Entity {1} already exists.,Ugovor o razini usluge s tipom entiteta {0} i entitetom {1} već postoji.
 DocType: Journal Entry,Write Off Entry,Otpis unos
 DocType: BOM,Rate Of Materials Based On,Stopa materijali na temelju
@@ -7077,6 +7091,7 @@
 DocType: Quality Inspection Reading,Quality Inspection Reading,Inspekcija kvalitete - čitanje
 apps/erpnext/erpnext/stock/doctype/stock_settings/stock_settings.py,`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/stock/report/stock_balance/stock_balance.py,Earliest Age,Najranije doba
 apps/erpnext/erpnext/utilities/user_progress.py,Set a sales goal you'd like to achieve for your company.,Postavite cilj prodaje koji biste željeli postići svojoj tvrtki.
 DocType: Quality Goal,Revision,Revizija
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js,Healthcare Services,Zdravstvene usluge
@@ -7120,6 +7135,7 @@
 apps/erpnext/erpnext/healthcare/doctype/patient_encounter/patient_encounter.js,Schedule Discharge,Raspored otpuštanja
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py,Cheques and Deposits incorrectly cleared,Čekovi i depozita pogrešno izbrisani
 DocType: Homepage Section Card,Homepage Section Card,Kartica odjela početne stranice
+,Amount To Be Billed,Iznos koji treba platiti
 apps/erpnext/erpnext/accounts/doctype/account/account.py,Account {0}: You can not assign itself as parent account,Račun {0}: Ne možeš ga dodijeliti kao nadređeni račun
 DocType: Purchase Invoice Item,Price List Rate,Stopa cjenika
 apps/erpnext/erpnext/utilities/activation.py,Create customer quotes,Stvaranje kupaca citati
@@ -7172,6 +7188,7 @@
 DocType: Supplier Scorecard Criteria,Supplier Scorecard Criteria,Kriteriji ocjenjivanja dobavljača
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py,Please select Start Date and End Date for Item {0},Molimo odaberite datum početka i datum završetka za točke {0}
 DocType: Maintenance Schedule,MAT-MSH-.YYYY.-,MAT-MSH-.YYYY.-
+,Amount to Receive,Iznos za primanje
 apps/erpnext/erpnext/education/doctype/student_group_creation_tool/student_group_creation_tool.py,Course is mandatory in row {0},Tečaj je obavezan u redu {0}
 apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py,From date can not be greater than than To date,Od datuma ne može biti veći od Do danas
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py,To date cannot be before from date,Do danas ne može biti prije od datuma
@@ -7420,7 +7437,6 @@
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js,BOM and Manufacturing Quantity are required,BOM i proizvodnja Količina potrebne su
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js,Ageing Range 2,Starenje Raspon 2
 DocType: SG Creation Tool Course,Max Strength,Max snaga
-apps/erpnext/erpnext/accounts/doctype/account/account.py,"Account {0} already exists in child company {1}. The following fields have different values, they should be same:<ul><li>{2}</li></ul>","Račun {0} već postoji u dječjoj tvrtki {1}. Sljedeća polja imaju različite vrijednosti, trebala bi biti ista: <ul><li> {2} </li></ul>"
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py,Installing presets,Instaliranje unaprijed postavljenih postavki
 DocType: Fee Schedule,EDU-FSH-.YYYY.-,EDU-FSH-.YYYY.-
 apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js,No Delivery Note selected for Customer {},Nijedna isporuka nije odabrana za kupca {}
@@ -7628,6 +7644,7 @@
 DocType: Delivery Note,Print Without Amount,Ispis Bez visini
 apps/erpnext/erpnext/accounts/report/asset_depreciation_ledger/asset_depreciation_ledger.py,Depreciation Date,Amortizacija Datum
 ,Work Orders in Progress,Radni nalozi u tijeku
+DocType: Customer Credit Limit,Bypass Credit Limit Check,Zaobiđite provjeru limita kredita
 DocType: Issue,Support Team,Tim za podršku
 apps/erpnext/erpnext/stock/report/batch_item_expiry_status/batch_item_expiry_status.py,Expiry (In Days),Rok (u danima)
 DocType: Appraisal,Total Score (Out of 5),Ukupna ocjena (od 5)
@@ -7811,6 +7828,7 @@
 DocType: Sales Invoice,Customer GSTIN,Korisnik GSTIN
 DocType: Crop Cycle,List of diseases detected on the field. When selected it'll automatically add a list of tasks to deal with the disease ,Popis bolesti otkrivenih na terenu. Kada je odabrana automatski će dodati popis zadataka za rješavanje ove bolesti
 apps/erpnext/erpnext/manufacturing/page/bom_comparison_tool/bom_comparison_tool.js,BOM 1,BOM 1
+apps/erpnext/erpnext/assets/report/fixed_asset_register/fixed_asset_register.py,Asset Id,Id sredstva
 apps/erpnext/erpnext/healthcare/doctype/healthcare_service_unit/healthcare_service_unit.js,This is a root healthcare service unit and cannot be edited.,Ovo je jedinica za zdravstvenu zaštitu root i ne može se uređivati.
 DocType: Asset Repair,Repair Status,Status popravka
 apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.js,"Requested Qty: Quantity requested for purchase, but not ordered.","Tražena količina : Količina zatražio za kupnju , ali ne i naređeno ."
diff --git a/erpnext/translations/hu.csv b/erpnext/translations/hu.csv
index 42670c8..3bb5f7d 100644
--- a/erpnext/translations/hu.csv
+++ b/erpnext/translations/hu.csv
@@ -289,7 +289,6 @@
 DocType: Loan,Repay Over Number of Periods,Törleszteni megadott számú időszakon belül
 apps/erpnext/erpnext/manufacturing/report/bom_stock_report/bom_stock_report.py,Quantity to Produce can not be less than Zero,Gyártandó mennyiség nem lehet kevesebb mint nulla
 DocType: Stock Entry,Additional Costs,További költségek
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Customer &gt; Customer Group &gt; Territory,Vevő&gt; Vevőcsoport&gt; Terület
 apps/erpnext/erpnext/accounts/doctype/account/account.py,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
@@ -586,6 +585,7 @@
 DocType: Healthcare Settings,Create documents for sample collection,Dokumentumok létrehozása a mintagyűjtéshez
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py,Payment against {0} {1} cannot be greater than Outstanding Amount {2},"Fizetés {0} {1} ellenében nem lehet nagyobb, mint kintlevő, fennálló negatív összeg {2}"
 apps/erpnext/erpnext/patches/v11_0/add_healthcare_service_unit_tree_root.py,All Healthcare Service Units,Összes egészségügyi szolgáltató egység
+apps/erpnext/erpnext/setup/default_energy_point_rules.py,On Converting Opportunity,A lehetőség konvertálásáról
 DocType: Bank Account,Address HTML,HTML Cím
 DocType: Lead,Mobile No.,Mobil sz.
 apps/erpnext/erpnext/selling/doctype/pos_closing_voucher/closing_voucher_details.html,Mode of Payments,Fizetési mód
@@ -650,7 +650,6 @@
 DocType: Accounting Dimension,Dimension Name,Dimenzió neve
 apps/erpnext/erpnext/healthcare/setup.py,Resistant,Ellenálló
 apps/erpnext/erpnext/hotels/doctype/hotel_room_reservation/hotel_room_reservation.py,Please set Hotel Room Rate on {},"Kérjük, állítsa be a szobaárakat a {}"
-apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py,Please setup numbering series for Attendance via Setup &gt; Numbering Series,"Kérjük, állítsa be a számozási sorozatokat a jelenléthez a Beállítás&gt; Számozási sorozat segítségével"
 DocType: Journal Entry,Multi Currency,Több pénznem
 DocType: Bank Statement Transaction Invoice Item,Invoice Type,Számla típusa
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py,Valid from date must be less than valid upto date,A dátumtól érvényesnek kevesebbnek kell lennie az érvényes dátumig
@@ -765,6 +764,7 @@
 apps/erpnext/erpnext/accounts/page/pos/pos.js,Create a new Customer,Hozzon létre egy új Vevőt
 apps/erpnext/erpnext/non_profit/report/expiring_memberships/expiring_memberships.py,Expiring On,Megszűnés ekkor
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,"If multiple Pricing Rules continue to prevail, users are asked to set Priority manually to resolve conflict.","Ha több árképzési szabály továbbra is fennáll, a felhasználók fel lesznek kérve, hogy a kézi prioritás beállítással orvosolják a konfliktusokat."
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js,Purchase Return,Beszerzési megrendelés visszárú
 apps/erpnext/erpnext/utilities/activation.py,Create Purchase Orders,Beszerzési megrendelés létrehozása
 ,Purchase Register,Beszerzési Regisztráció
 apps/erpnext/erpnext/healthcare/doctype/patient/patient.py,Patient not found,Beteg nem található
@@ -780,7 +780,6 @@
 DocType: Location,Area UOM,Terület ME
 apps/erpnext/erpnext/manufacturing/doctype/workstation/workstation.py,Workstation is closed on the following dates as per Holiday List: {0},Munkaállomás zárva a következő időpontokban a Nyaralási lista szerint: {0}
 apps/erpnext/erpnext/selling/page/sales_funnel/sales_funnel.py,Opportunities,Lehetőségek
-apps/erpnext/erpnext/www/all-products/index.html,Clear filters,Törölje a szűrőket
 DocType: Lab Test Template,Single,Egyedülálló
 DocType: Compensatory Leave Request,Work From Date,Munka kező dátuma
 DocType: Salary Slip,Total Loan Repayment,Összesen hitel visszafizetése
@@ -823,6 +822,7 @@
 DocType: Account,Old Parent,Régi szülő
 apps/erpnext/erpnext/education/doctype/program_enrollment_tool/program_enrollment_tool.py,Mandatory field - Academic Year,Kötelező mező - Tanév
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py,{0} {1} is not associated with {2} {3},{0} {1} nincs társítva ezekhez: {2} {3}
+DocType: Opportunity,Converted By,Átalakítva
 apps/erpnext/erpnext/public/js/hub/components/ReviewArea.vue,You need to login as a Marketplace User before you can add any reviews.,"Mielőtt bármilyen véleményt hozzáadhat, be kell jelentkeznie Marketplace-felhasználóként."
 apps/erpnext/erpnext/manufacturing/doctype/job_card/job_card.py,Row {0} : Operation is required against the raw material item {1},{0} sor: a nyersanyagelem {1}
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py,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}"
@@ -848,6 +848,8 @@
 DocType: BOM,Work Order,Munka rendelés
 DocType: Sales Invoice,Total Qty,Összesen Mennyiség
 apps/erpnext/erpnext/education/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py,Guardian2 Email ID,Helyettesítő2 e-mail azonosító
+apps/erpnext/erpnext/hr/doctype/employee_transfer/employee_transfer.py,"Please delete the Employee <a href=""#Form/Employee/{0}"">{0}</a>\
+					to cancel this document","Kérjük, törölje a (z) <a href=""#Form/Employee/{0}"">{0}</a> alkalmazottat a dokumentum visszavonásához"
 DocType: Item,Show in Website (Variant),Megjelenítés a weboldalon (Változat)
 DocType: Employee,Health Concerns,Egészségügyi problémák
 DocType: Payroll Entry,Select Payroll Period,Válasszon Bérszámfejtési Időszakot
@@ -907,7 +909,6 @@
 DocType: Codification Table,Codification Table,Kodifikációs táblázat
 DocType: Timesheet Detail,Hrs,Óra
 apps/erpnext/erpnext/manufacturing/page/bom_comparison_tool/bom_comparison_tool.js,Changes in {0},A (z) {0} változásai
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js,Please select Company,"Kérjük, válasszon Vállalkozást először"
 DocType: Employee Skill,Employee Skill,Munkavállalói készség
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.js,Difference Account,Különbség főkönyvi számla
 DocType: Pricing Rule,Discount on Other Item,Kedvezmény más cikkre
@@ -975,6 +976,7 @@
 DocType: BOM,Operating Cost,Működési költség
 DocType: Crop,Produced Items,Gyártott termékek
 DocType: Bank Statement Transaction Entry,Match Transaction to Invoices,A számlák tranzakcióinak egyeztetése
+apps/erpnext/erpnext/erpnext_integrations/exotel_integration.py,Error in Exotel incoming call,Hiba az Exotel bejövő hívásában
 DocType: Sales Order Item,Gross Profit,Bruttó nyereség
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js,Unblock Invoice,Számla feloldása
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py,Increment cannot be 0,Lépésköz nem lehet 0
@@ -1188,6 +1190,7 @@
 DocType: Activity Cost,Activity Type,Tevékenység típusa
 DocType: Request for Quotation,For individual supplier,Az egyéni beszállítónak
 DocType: BOM Operation,Base Hour Rate(Company Currency),Alapértelmezett óradíj (Vállalkozás pénznemében)
+,Qty To Be Billed,Mennyit kell számlázni
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py,Delivered Amount,Szállított érték
 apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.js,Reserved Qty for Production: Raw materials quantity to make manufacturing items.,Fenntartott termelési mennyiség: alapanyagok mennyisége a gyártáshoz.
 DocType: Loyalty Point Entry Redemption,Redemption Date,Visszaváltási dátum
@@ -1306,7 +1309,7 @@
 DocType: Sales Invoice,Commission Rate (%),Jutalék mértéke (%)
 apps/erpnext/erpnext/education/doctype/student_group/student_group.py,Please select Program,"Kérjük, válassza ki a Program"
 DocType: Project,Estimated Cost,Becsült költség
-DocType: Request for Quotation,Link to material requests,Hivatkozás az anyagra igénylésre
+DocType: Supplier Quotation,Link to material requests,Hivatkozás az anyagra igénylésre
 apps/erpnext/erpnext/public/js/hub/pages/Publish.vue,Publish,Közzétesz
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py,Aerospace,Repülőgép-és űripar
 ,Fichier des Ecritures Comptables [FEC],Könyvelési tétel fájlok [FEC]
@@ -1319,6 +1322,7 @@
 apps/erpnext/erpnext/utilities/transaction_base.py,Invalid Posting Time,Érvénytelen kiküldési idő
 DocType: Salary Component,Condition and Formula,Állapot és képlet
 DocType: Lead,Campaign Name,Kampány neve
+apps/erpnext/erpnext/setup/default_energy_point_rules.py,On Task Completion,A Feladat befejezése
 apps/erpnext/erpnext/hr/doctype/compensatory_leave_request/compensatory_leave_request.py,There is no leave period in between {0} and {1},Nincs távolléti idő a {0} és a {1} között
 DocType: Fee Validity,Healthcare Practitioner,Egészségügyi szakember
 DocType: Hotel Room,Capacity,Kapacitás
@@ -1663,7 +1667,6 @@
 DocType: Quality Feedback Template,Quality Feedback Template,Minőségi visszajelző sablon
 apps/erpnext/erpnext/config/education.py,LMS Activity,LMS tevékenység
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py,Internet Publishing,Internetes közzététel
-DocType: Prescription Duration,Number,Szám
 apps/erpnext/erpnext/accounts/doctype/opening_invoice_creation_tool/opening_invoice_creation_tool.js,Creating {0} Invoice,{0} számla létrehozása
 DocType: Medical Code,Medical Code Standard,Orvosi kódex standard
 DocType: Soil Texture,Clay Composition (%),Agyag összetétel (%)
@@ -1738,6 +1741,7 @@
 DocType: Support Settings,Get Started Sections,Get Started részek
 DocType: Lead,CRM-LEAD-.YYYY.-,CRM-LEAD-.YYYY.-
 DocType: Invoice Discounting,Sanctioned,Szankcionált
+,Base Amount,Alapösszeg
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.js,Total Contribution Amount: {0},Összes hozzájárulási összeg: {0}
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py,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: Payroll Entry,Salary Slips Submitted,Fizetéscsúcsok benyújtása
@@ -1955,6 +1959,7 @@
 apps/erpnext/erpnext/utilities/user_progress.py,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.
 DocType: Accounting Dimension,Dimension Defaults,Dimension Defaults
 apps/erpnext/erpnext/crm/report/prospects_engaged_but_not_converted/prospects_engaged_but_not_converted.js,Minimum Lead Age (Days),Érdeklődés minimum kora (napok)
+apps/erpnext/erpnext/assets/report/fixed_asset_register/fixed_asset_register.py,Available For Use Date,Felhasználható
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py,All BOMs,minden anyagjegyzéket
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js,Create Inter Company Journal Entry,Hozzon létre társaságközi naplóbejegyzést
 DocType: Company,Parent Company,Fő vállalkozás
@@ -2019,6 +2024,7 @@
 ,IRS 1099,IRS 1099
 DocType: Salary Slip,Leave Without Pay,Fizetés nélküli távollét
 DocType: Payment Request,Outward,Kifelé
+apps/erpnext/erpnext/setup/default_energy_point_rules.py,On {0} Creation,A (z) {0} létrehozáson
 apps/erpnext/erpnext/regional/doctype/gstr_3b_report/gstr_3b_report.html,State/UT Tax,Állami / UT adó
 ,Trial Balance for Party,Ügyfél Főkönyvi kivonat egyenleg
 ,Gross and Net Profit Report,Bruttó és nettó nyereségjelentés
@@ -2134,6 +2140,7 @@
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js,Make Stock Entry,Nyilvántartásba vétel
 DocType: Hotel Room Reservation,Hotel Reservation User,Hotel foglalás felhasználó
 apps/erpnext/erpnext/projects/doctype/project/project.js,Set Status,Állapot beállítása
+apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py,Please setup numbering series for Attendance via Setup &gt; Numbering Series,"Kérjük, állítsa be a számozási sorozatokat a jelenléthez a Beállítás&gt; Számozási sorozat segítségével"
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py,Please select prefix first,"Kérjük, válasszon prefix először"
 DocType: Contract,Fulfilment Deadline,Teljesítési határidő
 apps/erpnext/erpnext/public/js/hub/pages/Home.vue,Near you,Közel hozzád
@@ -2149,6 +2156,7 @@
 DocType: Announcement,All Students,Összes diák
 apps/erpnext/erpnext/assets/doctype/asset/asset.py,Item {0} must be a non-stock item,Tétel: {0} -  Nem készletezhető tételnek kell lennie
 apps/erpnext/erpnext/stock/doctype/batch/batch.js,View Ledger,Főkönyvi kivonat megtekintése
+DocType: Cost Center,Lft,Lft
 DocType: Grading Scale,Intervals,Periódusai
 DocType: Bank Statement Transaction Entry,Reconciled Transactions,Összeegyeztetett tranzakciók
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py,Earliest,Legkorábbi
@@ -2264,6 +2272,7 @@
 apps/erpnext/erpnext/hr/doctype/employee_benefit_application/employee_benefit_application.py,As per your assigned Salary Structure you cannot apply for benefits,Mivel az Önhöz kiosztott fizetési struktúrára nem alkalmazható különjuttatás
 apps/erpnext/erpnext/stock/doctype/item/item.py,Website Image should be a public file or website URL,Weboldal kép legyen nyilvános fájl vagy weboldal URL
 DocType: Purchase Invoice Item,BOM,ANYGJZ
+apps/erpnext/erpnext/stock/doctype/item/item.py,Duplicate entry in Manufacturers table,Másolás a Gyártók táblában
 apps/erpnext/erpnext/setup/doctype/item_group/item_group.js,This is a root item group and cannot be edited.,"Ez egy forrás tétel-csoport, és nem lehet szerkeszteni."
 apps/erpnext/erpnext/accounts/doctype/account/account.js,Merge,Összevon
 DocType: Journal Entry Account,Purchase Order,Beszerzési megrendelés
@@ -2408,7 +2417,6 @@
 DocType: Asset,Depreciation Schedules,Értékcsökkentési ütemezések
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.js,Create Sales Invoice,Hozzon létre értékesítési számlát
 apps/erpnext/erpnext/regional/doctype/gstr_3b_report/gstr_3b_report.html,Ineligible ITC,Nem támogatható ITC
-apps/erpnext/erpnext/erpnext_integrations/doctype/shopify_settings/shopify_settings.py,"Support for public app is deprecated. Please setup private app, for more details refer user manual","A nyilvános alkalmazások támogatása elavult. Kérjük, állítson be privát alkalmazást, további részletekért olvassa el a felhasználói kézikönyvet"
 DocType: Task,Dependent Tasks,Függő feladatok
 apps/erpnext/erpnext/regional/report/gstr_1/gstr_1.py,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/manufacturing/report/bom_stock_report/bom_stock_report.js,Quantity to Produce,Gyártandó mennyiség
@@ -2660,6 +2668,7 @@
 DocType: Water Analysis,Container,Tartály
 apps/erpnext/erpnext/regional/report/gstr_1/gstr_1.py,Please set valid GSTIN No. in Company Address,"Kérjük, érvényes vállalati GSTIN-számot állítson be"
 apps/erpnext/erpnext/education/utils.py,Student {0} - {1} appears Multiple times in row {2} & {3},Tanuló {0} - {1} többször is megjelenik ezekben a sorokban {2} & {3}
+apps/erpnext/erpnext/selling/doctype/customer/customer.py,Following fields are mandatory to create address:,A következő mezők kitöltése kötelező a cím létrehozásához:
 DocType: Item Alternative,Two-way,Kétirányú
 DocType: Item,Manufacturers,Gyártók
 apps/erpnext/erpnext/accounts/deferred_revenue.py,Error while processing deferred accounting for {0},Hiba a (z) {0} halasztott számvitelének feldolgozása során
@@ -2734,9 +2743,9 @@
 DocType: Employee,HR-EMP-,HR-EMP
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py,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: Quality Meeting Minutes,Quality Meeting Minutes,Minőségi találkozó jegyzőkönyve
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Supplier &gt; Supplier Type,Szállító&gt; Beszállító típusa
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py,Employee Referral,Alkalmazott ajánlója
 DocType: Student Group,Set 0 for no limit,Állítsa 0 = nincs korlátozás
+DocType: Cost Center,rgt,RGT
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py,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."
 DocType: Customer,Primary Address and Contact Detail,Elsődleges cím és kapcsolatfelvétel
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.js,Resend Payment Email,Küldje el újra a Fizetési E-mailt
@@ -2847,7 +2856,6 @@
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py,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,Asset Movement record {0} created,Vagyontárgy mozgás bejegyzés {0} létrehozva
-apps/erpnext/erpnext/utilities/page/leaderboard/leaderboard.js,No items found.,Nem található tétel.
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py,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"
 DocType: Share Transfer,Equity/Liability Account,Tőke / felelősség számla
 apps/erpnext/erpnext/setup/doctype/customer_group/customer_group.py,A customer with the same name already exists,Már létezik egy azonos nevű vásárló
@@ -2863,6 +2871,7 @@
 apps/erpnext/erpnext/selling/doctype/customer/customer.py,Credit limit has been crossed for customer {0} ({1}/{2}),A hitelkeretet átlépte ez az ügyfél {0} ({1} / {2})
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py,Customer required for 'Customerwise Discount',Vevő szükséges ehhez: 'Vevőszerinti kedvezmény'
 apps/erpnext/erpnext/config/accounting.py,Update bank payment dates with journals.,Frissítse a bank fizetési időpontokat a jelentésekkel.
+,Billed Qty,Számlázott mennyiség
 apps/erpnext/erpnext/stock/doctype/item/item_dashboard.py,Pricing,Árazás
 DocType: Employee,Attendance Device ID (Biometric/RF tag ID),Jelenlévő eszköz azonosítója (biometrikus / RF címke azonosítója)
 DocType: Quotation,Term Details,ÁSZF részletek
@@ -2884,6 +2893,7 @@
 DocType: Share Transfer,Asset Account,Vagyontárgy-számla
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js,New release date should be in the future,Az új kiadási dátumnak a jövőben kell lennie
 DocType: Purchase Invoice,End date of current invoice's period,A befejezés dátuma az aktuális számla időszakra
+apps/erpnext/erpnext/hr/doctype/employee/employee.py,Please setup Employee Naming System in Human Resource &gt; HR Settings,"Kérjük, állítsa be a Munkavállalók elnevezési rendszerét a Humán erőforrás&gt; HR beállítások menüpontban"
 DocType: Lab Test,Technician Name,Technikus neve
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py,"Cannot ensure delivery by Serial No as \
 					Item {0} is added with and without Ensure Delivery by \
@@ -2891,6 +2901,7 @@
 DocType: Accounts Settings,Unlink Payment on Cancellation of Invoice,Fizetetlen számlához tartozó Fizetés megszüntetése
 DocType: Bank Reconciliation,From Date,Dátumtól
 apps/erpnext/erpnext/hr/doctype/vehicle_log/vehicle_log.py,Current Odometer reading entered should be greater than initial Vehicle Odometer {0},"Jelenlegi leolvasott kilométerállásnak nagyobbnak kell lennie, mint a Jármű kezdeti kilométeróra állása {0}"
+,Purchase Order Items To Be Received or Billed,"Megrendelési tételek, amelyeket meg kell kapni vagy számlázni kell"
 DocType: Restaurant Reservation,No Show,Nincs megjelenítés
 apps/erpnext/erpnext/regional/india/utils.py,You must be a registered supplier to generate e-Way Bill,Az e-Way Bill előállításához regisztrált szállítónak kell lennie
 DocType: Shipping Rule Country,Shipping Rule Country,Szállítási szabály Ország
@@ -2933,6 +2944,7 @@
 apps/erpnext/erpnext/templates/generators/item/item_add_to_cart.html,View in Cart,Megtekintés a kosárban
 DocType: Employee Checkin,Shift Actual Start,A váltás tényleges indítása
 DocType: Tally Migration,Is Day Book Data Imported,A napi könyv adatait importálták
+,Purchase Order Items To Be Received or Billed1,Fogadási vagy számlázási megrendelési tételek1
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py,Marketing Expenses,Marketing költségek
 apps/erpnext/erpnext/stock/doctype/pick_list/pick_list.py,{0} units of {1} is not available.,A (z) {1} {0} egység nem érhető el.
 ,Item Shortage Report,Tétel Hiány jelentés
@@ -3158,7 +3170,6 @@
 apps/erpnext/erpnext/public/js/call_popup/call_popup.js,View all issues from {0},Az összes probléma megtekintése itt: {0}
 DocType: Quality Inspection,MAT-QA-.YYYY.-,MAT-QA-.YYYY.-
 DocType: Quality Meeting Table,Quality Meeting Table,Minőségi találkozótábla
-apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,"Kérjük, állítsa a Naming sorozatot a (z) {0} beállításra a Beállítás&gt; Beállítások&gt; Sorozat elnevezése menüpont alatt"
 apps/erpnext/erpnext/templates/pages/help.html,Visit the forums,Látogassa meg a fórumokat
 DocType: Student,Student Mobile Number,Tanuló mobil szám
 DocType: Item,Has Variants,Rrendelkezik változatokkal
@@ -3300,6 +3311,7 @@
 DocType: Homepage Section,Section Cards,Szekciókártyák
 ,Campaign Efficiency,Kampány hatékonyság
 DocType: Discussion,Discussion,Megbeszélés
+apps/erpnext/erpnext/setup/default_energy_point_rules.py,On Sales Order Submission,Értékesítési megrendelés benyújtásakor
 DocType: Bank Transaction,Transaction ID,Tranzakció azonosítója
 DocType: Payroll Entry,Deduct Tax For Unsubmitted Tax Exemption Proof,Levonja az adót a meg nam fizetett adómentességi igazolásra
 DocType: Volunteer,Anytime,Bármikor
@@ -3307,7 +3319,6 @@
 DocType: Employee Tax Exemption Proof Submission,Employee Tax Exemption Proof Submission,Munkavállalói adómentesség bizonyíték benyújtása
 DocType: Patient,Surgical History,Sebészeti előzmény
 DocType: Bank Statement Settings Item,Mapped Header,Átkötött fejléc
-apps/erpnext/erpnext/hr/doctype/employee/employee.py,Please setup Employee Naming System in Human Resource &gt; HR Settings,"Kérjük, állítsa be a Munkavállalók elnevezési rendszerét a Humán erőforrás&gt; HR beállítások menüpontban"
 DocType: Employee,Resignation Letter Date,Lemondását levélben dátuma
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Pricing Rules are further filtered based on quantity.,Árazási szabályok tovább szűrhetők a mennyiség alapján.
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py,Please set the Date Of Joining for employee {0},"Kérjük, állítsd be a Csatlakozás dátumát ehhez a munkavállalóhoz {0}"
@@ -3321,6 +3332,7 @@
 DocType: Bank Statement Settings,Mapped Items,Megkerülő elemek
 DocType: Amazon MWS Settings,IT,AZT
 DocType: Chapter,Chapter,Fejezet
+,Fixed Asset Register,Tárgyi nyilvántartás
 apps/erpnext/erpnext/utilities/user_progress.py,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,Select BOM and Qty for Production,Válasszon Anyagj és Mennyiséget a Termeléshez
@@ -4014,7 +4026,6 @@
 DocType: Project User,Project Status,Projekt téma állapota
 DocType: UOM,Check this to disallow fractions. (for Nos),"Jelölje be ezt, hogy ne engedélyezze a törtrészt. (a darab számokhoz)"
 DocType: Student Admission Program,Naming Series (for Student Applicant),Elnevezési sorozatok  (Tanuló Kérelmezőhöz)
-apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.py,UOM Conversion factor ({0} -&gt; {1}) not found for item: {2},UOM konverziós tényező ({0} -&gt; {1}) nem található az elemhez: {2}
 apps/erpnext/erpnext/hr/doctype/retention_bonus/retention_bonus.py,Bonus Payment Date cannot be a past date,A bónusz fizetési dátuma nem történhet a múltban
 DocType: Travel Request,Copy of Invitation/Announcement,Meghívó / hirdetmény másolata
 DocType: Practitioner Service Unit Schedule,Practitioner Service Unit Schedule,Gyakorló szolgáltatási egység menetrendje
@@ -4161,6 +4172,7 @@
 apps/erpnext/erpnext/utilities/user_progress.py,Setup Company,Vállalkozás beállítása
 ,Lab Test Report,Labor tesztjelentés
 DocType: Employee Benefit Application,Employee Benefit Application,Alkalmazotti juttatási kérelem
+apps/erpnext/erpnext/accounts/doctype/invoice_discounting/invoice_discounting.py,Row({0}): {1} is already discounted in {2},({0} sor): A (z) {1} már kedvezményes a (z) {2} -ben.
 apps/erpnext/erpnext/hr/doctype/additional_salary/additional_salary.py,Additional Salary Component Exists.,Létezik kiegészítő fizetési elem.
 DocType: Purchase Invoice,Unregistered,Nem regisztrált
 DocType: Student Applicant,Application Date,Jelentkezési dátum
@@ -4239,7 +4251,6 @@
 DocType: Journal Entry,Accounting Entries,Könyvelési tételek
 DocType: Job Card Time Log,Job Card Time Log,Munkalap kártya időnaplója
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,"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."
-apps/erpnext/erpnext/education/doctype/instructor/instructor.py,Please setup Instructor Naming System in Education &gt; Education Settings,"Kérjük, állítsa be az Oktató elnevezési rendszert az Oktatás&gt; Oktatási beállítások menüben"
 DocType: Journal Entry,Paid Loan,Fizetett kölcsön
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py,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ő
@@ -4256,7 +4267,6 @@
 apps/erpnext/erpnext/templates/pages/projects.html,No time sheets,Nincsenek idő nyilvántartások
 DocType: GoCardless Mandate,GoCardless Customer,GoCardless ügyfél
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py,Leave Type {0} cannot be carry-forwarded,Távollét típusa {0} nem továbbítható jövőbe
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Item Code &gt; Item Group &gt; Brand,Cikkszám&gt; Tételcsoport&gt; Márka
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py,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
 DocType: Leave Encashment,Payroll,Bérszámfejtés
@@ -4371,7 +4381,6 @@
 DocType: Stock Ledger Entry,Actual Qty After Transaction,Tényleges Mennyiség a tranzakció után
 ,Pending SO Items For Purchase Request,Függőben lévő VR tételek erre a vásárolható rendelésre
 apps/erpnext/erpnext/education/doctype/student_admission/student_admission.py,Student Admissions,Tanuló Felvételi
-apps/erpnext/erpnext/accounts/party.py,{0} {1} is disabled,{0} {1} le van tiltva
 DocType: Supplier,Billing Currency,Számlázási Árfolyam
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py,Extra Large,Extra Nagy
 DocType: Loan,Loan Application,Hiteligénylés
@@ -4448,7 +4457,6 @@
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py,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/accounts/doctype/accounting_dimension/accounting_dimension.py,Creating Dimensions...,Méretek létrehozása ...
 apps/erpnext/erpnext/education/doctype/student_group_creation_tool/student_group_creation_tool.py,Student Group Name is mandatory in row {0},Diák csoport neve kötelező sorban {0}
-DocType: Customer Credit Limit,Bypass credit limit_check,A hitelkeretek megkerülése
 DocType: Homepage,Products to be shown on website homepage,Termékek feltüntetett internetes honlapon
 DocType: HR Settings,Password Policy,Jelszó házirend
 apps/erpnext/erpnext/setup/doctype/customer_group/customer_group.js,This is a root customer group and cannot be edited.,"Ez egy forrás vevőkör csoport, és nem lehet szerkeszteni."
@@ -4740,6 +4748,7 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py,Row {0}: Advance against Customer must be credit,Sor {0}: A Vevővel szembeni előlegnek követelésnek kell lennie
 DocType: Quality Meeting,Quality Meeting,Minőségi találkozó
 apps/erpnext/erpnext/accounts/doctype/account/account.js,Non-Group to Group,Csoport nélküliek csoportokba
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,"Kérjük, állítsa a Naming sorozatot a (z) {0} beállításra a Beállítás&gt; Beállítások&gt; Sorozat elnevezése menüpont alatt"
 DocType: Employee,ERPNext User,ERPNext felhasználó
 apps/erpnext/erpnext/education/doctype/student_group_creation_tool/student_group_creation_tool.py,Batch is mandatory in row {0},Köteg kötelező ebben a sorban {0}
 DocType: Company,Default Buying Terms,Alapértelmezett vásárlási feltételek
@@ -5034,6 +5043,7 @@
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py,No {0} found for Inter Company Transactions.,{0} találha az Inter Company Tranzakciók esetében.
 DocType: Travel Itinerary,Rented Car,Bérelt autó
 apps/erpnext/erpnext/public/js/hub/components/profile_dialog.js,About your Company,A Társaságról
+apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.js,Show Stock Ageing Data,Jelenítse meg az állomány öregedési adatait
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py,Credit To account must be a Balance Sheet account,Követelés főkönyvi számlának Mérlegszámlának kell lennie
 DocType: Donor,Donor,Adományozó
 DocType: Global Defaults,Disable In Words,Szavakkal mező elrejtése
@@ -5048,8 +5058,10 @@
 DocType: Practitioner Schedule,Schedule Name,Ütemezési név
 apps/erpnext/erpnext/regional/doctype/gstr_3b_report/gstr_3b_report.py,Please enter GSTIN and state for the Company Address {0},"Kérjük, írja be a GSTIN-t és adja meg a (z) {0} cégcímet"
 DocType: Currency Exchange,For Buying,A vásárláshoz
+apps/erpnext/erpnext/setup/default_energy_point_rules.py,On Purchase Order Submission,Megrendelés benyújtásakor
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js,Add All Suppliers,Összes beszállító hozzáadása
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py,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/accounts/doctype/pricing_rule/pricing_rule.js,Customer &gt; Customer Group &gt; Territory,Vevő&gt; Vevőcsoport&gt; Terület
 DocType: Tally Migration,Parties,A felek
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js,Browse BOM,Keressen anyagjegyzéket
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py,Secured Loans,Záloghitel
@@ -5081,6 +5093,7 @@
 apps/erpnext/erpnext/stock/doctype/item_alternative/item_alternative.py,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
 apps/erpnext/erpnext/hr/doctype/leave_block_list/leave_block_list.py,Date is repeated,Dátum megismétlődik
 apps/erpnext/erpnext/accounts/print_format/payment_receipt_voucher/payment_receipt_voucher.html,Authorized Signatory,Hitelesített aláírás
+apps/erpnext/erpnext/education/doctype/instructor/instructor.py,Please setup Instructor Naming System in Education &gt; Education Settings,"Kérjük, állítsa be az Oktató elnevezési rendszert az Oktatás&gt; Oktatási beállítások menüben"
 apps/erpnext/erpnext/regional/doctype/gstr_3b_report/gstr_3b_report.html,Net ITC Available(A) - (B),Nettó ITC elérhető (A) - (B)
 apps/erpnext/erpnext/education/doctype/fee_schedule/fee_schedule.js,Create Fees,Díjak létrehozása
 DocType: Project,Total Purchase Cost (via Purchase Invoice),Beszerzés teljes költsége (Beszerzési számla alapján)
@@ -5101,6 +5114,7 @@
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.js,Message Sent,Üzenet elküldve
 apps/erpnext/erpnext/accounts/doctype/account/account.py,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/assets/report/fixed_asset_register/fixed_asset_register.py,Vendor Name,Szállító neve
 DocType: Quiz Result,Wrong,Rossz
 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)
@@ -5344,6 +5358,7 @@
 DocType: Stock Settings,Auto Material Request,Automata anyagigénylés
 DocType: Woocommerce Settings,API consumer secret,API fogyasztói titok
 DocType: Delivery Note Item,Available Batch Qty at From Warehouse,Elérhető Kötegelt Mennyiség a Behozatali Raktárból
+,Received Qty Amount,Fogadott darabszám
 DocType: Salary Slip,Gross Pay - Total Deduction - Loan Repayment,Bruttó bér - Összes levonás - Hitel visszafizetése
 DocType: Bank Account,Last Integration Date,Az utolsó integrációs dátum
 DocType: Expense Claim,Expense Taxes and Charges,Költségadók és díjak
@@ -5802,6 +5817,8 @@
 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,Please select Qty against item {0},"Kérjük, válassza ki a mennyiséget az {0} tételhez"
+apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py,Latest Age,Legújabb kor
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js,Transfer Material to Supplier,Át az anyagot szállító
 apps/erpnext/erpnext/hr/report/loan_repayment/loan_repayment.py,EMI,EMI
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py,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
@@ -5825,7 +5842,6 @@
 apps/erpnext/erpnext/hr/doctype/employee_benefit_application/employee_benefit_application.py,"An amount of {0} already claimed for the component {1},\
 						 set the amount equal or greater than {2}","A (z) {1} összetevőhöz már igényelt {0} összeget, \ állítsa be az összeget nagyobb vagy egyenlőre mint  {2}"
 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
 DocType: BOM Update Tool,The new BOM after replacement,"Az új anyagjegyzék, amire lecseréli mindenhol"
 ,Point of Sale,Értékesítési hely kassza
@@ -5945,7 +5961,6 @@
 DocType: Purchase Order Item,Blanket Order Rate,Keretszerződési ár
 ,Customer Ledger Summary,Vevőkönyv összegzése
 apps/erpnext/erpnext/hooks.py,Certification,Tanúsítvány
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js,Are you sure you want to make debit note?,"Biztos benne, hogy terhelési értesítést szeretne készíteni?"
 DocType: Bank Guarantee,Clauses and Conditions,Kondíciók és feltételek
 DocType: Serial No,Creation Document Type,Létrehozott Dokumentum típus
 DocType: Amazon MWS Settings,ES,ES
@@ -5983,8 +5998,6 @@
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py,Financial Services,Pénzügyi szolgáltatások
 DocType: Student Sibling,Student ID,Diákigazolvány ID
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.js,For Quantity must be greater than zero,A mennyiségnek nagyobbnak kell lennie mint nulla
-apps/erpnext/erpnext/hr/doctype/employee_transfer/employee_transfer.py,"Please delete the Employee <a href=""#Form/Employee/{0}"">{0}</a>\
-					to cancel this document","Kérjük, törölje a (z) <a href=""#Form/Employee/{0}"">{0}</a> alkalmazottat a dokumentum visszavonásához"
 apps/erpnext/erpnext/config/projects.py,Types of activities for Time Logs,Tevékenységek típusa Idő Naplókhoz
 DocType: Opening Invoice Creation Tool,Sales,Értékesítés
 DocType: Stock Entry Detail,Basic Amount,Alapösszege
@@ -6063,6 +6076,7 @@
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py,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,Send Supplier Emails,Beszállítói e-mailek küldése
+DocType: Asset Movement,ACC-ASM-.YYYY.-,ACC-ASM-.YYYY.-
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py,"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,Automatikusan létrehozott
 apps/erpnext/erpnext/hr/doctype/employee_onboarding/employee_onboarding.py,Submit this to create the Employee record,Küldje el ezt a Munkavállalói rekord létrehozásához
@@ -6140,7 +6154,6 @@
 DocType: Sales Team,Contact No.,Kapcsolattartó szám
 apps/erpnext/erpnext/templates/includes/cart/cart_address.html,Billing Address is same as Shipping Address,A számlázási cím megegyezik a szállítási címmel
 DocType: Bank Reconciliation,Payment Entries,Fizetési bejegyzések
-apps/erpnext/erpnext/erpnext_integrations/doctype/shopify_settings/shopify_settings.py,Access token or Shopify URL missing,Hozzáférési token vagy a Shopify URL hiányzik
 DocType: Location,Latitude,Szélességi kör
 DocType: Work Order,Scrap Warehouse,Hulladék raktár
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py,"Warehouse required at Row No {0}, please set default warehouse for the item {1} for the company {2}","A (z) {0} sorban a raktárban kérjük, állítsa be az {1} tétel alapértelmezett raktárát a vállalat számára {2}"
@@ -6183,7 +6196,6 @@
 DocType: Job Offer Term,Value / Description,Érték / Leírás
 apps/erpnext/erpnext/controllers/accounts_controller.py,"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
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js,Are you sure you want to make credit note?,"Biztos benne, hogy jóváírást szeretne készíteni?"
 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,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}.
@@ -6307,6 +6319,7 @@
 DocType: Purchase Invoice,Taxes and Charges Added,Adók és költségek hozzáadva
 apps/erpnext/erpnext/assets/doctype/asset/asset.py,Depreciation Row {0}: Next Depreciation Date cannot be before Available-for-use Date,Értékcsökkenési sor {0}: A következő értékcsökkenési időpont nem lehet a rendelkezésre álló felhasználási dátuma előtt
 ,Sales Funnel,Értékesítési csatorna
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Item Code &gt; Item Group &gt; Brand,Cikkszám&gt; Tételcsoport&gt; Márka
 apps/erpnext/erpnext/setup/doctype/company/company.py,Abbreviation is mandatory,Rövidítés kötelező
 DocType: Project,Task Progress,Feladat előrehaladása
 apps/erpnext/erpnext/templates/includes/navbar/navbar_items.html,Cart,Kosár
@@ -6550,6 +6563,7 @@
 DocType: Employee Grade,Employee Grade,Alkalmazott fokozat
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py,Piecework,Darabszámra fizetett munka
 DocType: GSTR 3B Report,June,június
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Supplier &gt; Supplier Type,Szállító&gt; Beszállító típusa
 DocType: Share Balance,From No,Ettől
 DocType: Shift Type,Early Exit Grace Period,Korai kilépési türelmi idő
 DocType: Task,Actual Time (in Hours),Tényleges idő (óra)
@@ -6834,6 +6848,7 @@
 DocType: Warehouse,Warehouse Name,Raktár neve
 DocType: Naming Series,Select Transaction,Válasszon Tranzakciót
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py,Please enter Approving Role or Approving User,"Kérjük, adja be Beosztás jóváhagyásra vagy Felhasználó jóváhagyásra"
+apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.py,UOM Conversion factor ({0} -&gt; {1}) not found for item: {2},UOM konverziós tényező ({0} -&gt; {1}) nem található az elemhez: {2}
 apps/erpnext/erpnext/support/doctype/service_level_agreement/service_level_agreement.py,Service Level Agreement with Entity Type {0} and Entity {1} already exists.,Szolgáltatási szintű megállapodás a (z) {0} típusú entitással és a {1} entitással már létezik.
 DocType: Journal Entry,Write Off Entry,Leíró Bejegyzés
 DocType: BOM,Rate Of Materials Based On,Anyagköltség számítás módja
@@ -7024,6 +7039,7 @@
 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,`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/stock/report/stock_balance/stock_balance.py,Earliest Age,A legkorábbi életkor
 apps/erpnext/erpnext/utilities/user_progress.py,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."
 DocType: Quality Goal,Revision,Felülvizsgálat
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js,Healthcare Services,Egészségügyi szolgáltatások
@@ -7067,6 +7083,7 @@
 apps/erpnext/erpnext/healthcare/doctype/patient_encounter/patient_encounter.js,Schedule Discharge,Felmentés tervezés
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py,Cheques and Deposits incorrectly cleared,Csekkek és betétek helytelenül elszámoltak
 DocType: Homepage Section Card,Homepage Section Card,Honlap szekciókártya
+,Amount To Be Billed,Számlázandó összeg
 apps/erpnext/erpnext/accounts/doctype/account/account.py,Account {0}: You can not assign itself as parent account,A {0} számla: Nem rendelheti saját szülő számlájának
 DocType: Purchase Invoice Item,Price List Rate,Árlista árértékek
 apps/erpnext/erpnext/utilities/activation.py,Create customer quotes,Árajánlatok létrehozása vevők részére
@@ -7119,6 +7136,7 @@
 DocType: Supplier Scorecard Criteria,Supplier Scorecard Criteria,Beszállítói mutatószámok kritériumai
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py,Please select Start Date and End Date for Item {0},"Kérjük, válassza ki a Start és végé dátumát erre a tételre {0}"
 DocType: Maintenance Schedule,MAT-MSH-.YYYY.-,MAT-MSH-.YYYY.-
+,Amount to Receive,Fogadás összege
 apps/erpnext/erpnext/education/doctype/student_group_creation_tool/student_group_creation_tool.py,Course is mandatory in row {0},Tanfolyam kötelező ebben a sorban {0}
 apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py,From date can not be greater than than To date,"A dátum nem lehet nagyobb, mint a mai napig"
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py,To date cannot be before from date,"A végső nap nem lehet, a kezdő dátum előtti"
@@ -7366,7 +7384,6 @@
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js,BOM and Manufacturing Quantity are required,Anyagjegyzék és Gyártási Mennyiség szükséges
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js,Ageing Range 2,Öregedés tartomány 2
 DocType: SG Creation Tool Course,Max Strength,Max állomány
-apps/erpnext/erpnext/accounts/doctype/account/account.py,"Account {0} already exists in child company {1}. The following fields have different values, they should be same:<ul><li>{2}</li></ul>","A (z) {0} számla már létezik a (z) {1} gyermekvállalkozásban. A következő mezőknek különböző értékei vannak, ezeknek azonosaknak kell lenniük: <ul><li> {2} </li></ul>"
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py,Installing presets,Telepítés beállításai
 DocType: Fee Schedule,EDU-FSH-.YYYY.-,EDU-FSH-.YYYY.-
 apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js,No Delivery Note selected for Customer {},Nincs kézbesítési értesítés ehhez az Ügyfélhez {}
@@ -7574,6 +7591,7 @@
 DocType: Delivery Note,Print Without Amount,Nyomtatás érték nélkül
 apps/erpnext/erpnext/accounts/report/asset_depreciation_ledger/asset_depreciation_ledger.py,Depreciation Date,Értékcsökkentés dátuma
 ,Work Orders in Progress,Folyamatban lévő munka megrendelések
+DocType: Customer Credit Limit,Bypass Credit Limit Check,A hitelkeret megkerülése
 DocType: Issue,Support Team,Támogató csoport
 apps/erpnext/erpnext/stock/report/batch_item_expiry_status/batch_item_expiry_status.py,Expiry (In Days),Érvényességi idő (napokban)
 DocType: Appraisal,Total Score (Out of 5),Összes pontszám (5–ből)
@@ -7757,6 +7775,7 @@
 DocType: Sales Invoice,Customer GSTIN,Vevő GSTIN
 DocType: Crop Cycle,List of diseases detected on the field. When selected it'll automatically add a list of tasks to deal with the disease ,A területen észlelt kórokozók listája. Kiválasztáskor automatikusan felveszi a kórokozók kezelésére szolgáló feladatok listáját
 apps/erpnext/erpnext/manufacturing/page/bom_comparison_tool/bom_comparison_tool.js,BOM 1,BOM 1
+apps/erpnext/erpnext/assets/report/fixed_asset_register/fixed_asset_register.py,Asset Id,Asset Id
 apps/erpnext/erpnext/healthcare/doctype/healthcare_service_unit/healthcare_service_unit.js,This is a root healthcare service unit and cannot be edited.,"Ez egy forrás egészségügyi szolgáltatási egység, és nem szerkeszthető."
 DocType: Asset Repair,Repair Status,Javítási állapota
 apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.js,"Requested Qty: Quantity requested for purchase, but not ordered.","Kért mennyiség: Mennyiség vételhez, de nem rendelte."
diff --git a/erpnext/translations/id.csv b/erpnext/translations/id.csv
index 39f18f3..8e29ff6 100644
--- a/erpnext/translations/id.csv
+++ b/erpnext/translations/id.csv
@@ -289,7 +289,6 @@
 DocType: Loan,Repay Over Number of Periods,Membayar Lebih dari Jumlah Periode
 apps/erpnext/erpnext/manufacturing/report/bom_stock_report/bom_stock_report.py,Quantity to Produce can not be less than Zero,Kuantitas untuk Menghasilkan tidak boleh kurang dari Nol
 DocType: Stock Entry,Additional Costs,Biaya-biaya tambahan
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Customer &gt; Customer Group &gt; Territory,Pelanggan&gt; Grup Pelanggan&gt; Wilayah
 apps/erpnext/erpnext/accounts/doctype/account/account.py,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
@@ -586,6 +585,7 @@
 DocType: Healthcare Settings,Create documents for sample collection,Buat dokumen untuk koleksi sampel
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py,Payment against {0} {1} cannot be greater than Outstanding Amount {2},Pembayaran terhadap {0} {1} tidak dapat lebih besar dari Posisi Jumlah {2}
 apps/erpnext/erpnext/patches/v11_0/add_healthcare_service_unit_tree_root.py,All Healthcare Service Units,Semua Unit Layanan Kesehatan
+apps/erpnext/erpnext/setup/default_energy_point_rules.py,On Converting Opportunity,Tentang Konversi Peluang
 DocType: Bank Account,Address HTML,Alamat HTML
 DocType: Lead,Mobile No.,Nomor Ponsel
 apps/erpnext/erpnext/selling/doctype/pos_closing_voucher/closing_voucher_details.html,Mode of Payments,Mode Pembayaran
@@ -650,7 +650,6 @@
 DocType: Accounting Dimension,Dimension Name,Nama Dimensi
 apps/erpnext/erpnext/healthcare/setup.py,Resistant,Tahan
 apps/erpnext/erpnext/hotels/doctype/hotel_room_reservation/hotel_room_reservation.py,Please set Hotel Room Rate on {},Harap atur Tarif Kamar Hotel di {}
-apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py,Please setup numbering series for Attendance via Setup &gt; Numbering Series,Silakan atur seri penomoran untuk Kehadiran melalui Pengaturan&gt; Seri Penomoran
 DocType: Journal Entry,Multi Currency,Multi Mata Uang
 DocType: Bank Statement Transaction Invoice Item,Invoice Type,Tipe Faktur
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py,Valid from date must be less than valid upto date,Valid dari tanggal harus kurang dari tanggal yang berlaku
@@ -765,6 +764,7 @@
 apps/erpnext/erpnext/accounts/page/pos/pos.js,Create a new Customer,Buat Pelanggan baru
 apps/erpnext/erpnext/non_profit/report/expiring_memberships/expiring_memberships.py,Expiring On,Kedaluwarsa pada
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,"If multiple Pricing Rules continue to prevail, users are asked to set Priority manually to resolve conflict.","Jika beberapa Aturan Harga terus menang, pengguna akan diminta untuk mengatur Prioritas manual untuk menyelesaikan konflik."
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js,Purchase Return,Pembelian Kembali
 apps/erpnext/erpnext/utilities/activation.py,Create Purchase Orders,Buat Purchase Order
 ,Purchase Register,Register Pembelian
 apps/erpnext/erpnext/healthcare/doctype/patient/patient.py,Patient not found,Pasien tidak ditemukan
@@ -780,7 +780,6 @@
 DocType: Location,Area UOM,Area UOM
 apps/erpnext/erpnext/manufacturing/doctype/workstation/workstation.py,Workstation is closed on the following dates as per Holiday List: {0},Workstation ditutup pada tanggal berikut sesuai Hari Libur Daftar: {0}
 apps/erpnext/erpnext/selling/page/sales_funnel/sales_funnel.py,Opportunities,Peluang
-apps/erpnext/erpnext/www/all-products/index.html,Clear filters,Hapus filter
 DocType: Lab Test Template,Single,Tunggal
 DocType: Compensatory Leave Request,Work From Date,Bekerja Dari Tanggal
 DocType: Salary Slip,Total Loan Repayment,Total Pembayaran Pinjaman
@@ -823,6 +822,7 @@
 DocType: Account,Old Parent,Old Parent
 apps/erpnext/erpnext/education/doctype/program_enrollment_tool/program_enrollment_tool.py,Mandatory field - Academic Year,Bidang Wajib - Tahun Akademik
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py,{0} {1} is not associated with {2} {3},{0} {1} tidak terkait dengan {2} {3}
+DocType: Opportunity,Converted By,Dikonversi oleh
 apps/erpnext/erpnext/public/js/hub/components/ReviewArea.vue,You need to login as a Marketplace User before you can add any reviews.,Anda harus masuk sebagai Pengguna Marketplace sebelum dapat menambahkan ulasan apa pun.
 apps/erpnext/erpnext/manufacturing/doctype/job_card/job_card.py,Row {0} : Operation is required against the raw material item {1},Baris {0}: Operasi diperlukan terhadap item bahan baku {1}
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py,Please set default payable account for the company {0},Harap atur akun hutang default untuk perusahaan {0}
@@ -848,6 +848,8 @@
 DocType: BOM,Work Order,Perintah kerja
 DocType: Sales Invoice,Total Qty,Jumlah Qty
 apps/erpnext/erpnext/education/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py,Guardian2 Email ID,ID Email Guardian2
+apps/erpnext/erpnext/hr/doctype/employee_transfer/employee_transfer.py,"Please delete the Employee <a href=""#Form/Employee/{0}"">{0}</a>\
+					to cancel this document","Silakan hapus Karyawan <a href=""#Form/Employee/{0}"">{0}</a> \ untuk membatalkan dokumen ini"
 DocType: Item,Show in Website (Variant),Tampilkan Website (Variant)
 DocType: Employee,Health Concerns,Kekhawatiran Kesehatan
 DocType: Payroll Entry,Select Payroll Period,Pilih Payroll Periode
@@ -907,7 +909,6 @@
 DocType: Codification Table,Codification Table,Tabel Kodifikasi
 DocType: Timesheet Detail,Hrs,Hrs
 apps/erpnext/erpnext/manufacturing/page/bom_comparison_tool/bom_comparison_tool.js,Changes in {0},Perubahan {0}
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js,Please select Company,Silakan pilih Perusahaan
 DocType: Employee Skill,Employee Skill,Keterampilan Karyawan
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.js,Difference Account,Perbedaan Akun
 DocType: Pricing Rule,Discount on Other Item,Diskon untuk Barang Lainnya
@@ -975,6 +976,7 @@
 DocType: BOM,Operating Cost,Biaya Operasi
 DocType: Crop,Produced Items,Item yang Diproduksi
 DocType: Bank Statement Transaction Entry,Match Transaction to Invoices,Cocokkan Transaksi ke Faktur
+apps/erpnext/erpnext/erpnext_integrations/exotel_integration.py,Error in Exotel incoming call,Kesalahan dalam panggilan masuk Exotel
 DocType: Sales Order Item,Gross Profit,Laba Kotor
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js,Unblock Invoice,Bebaskan Blokir Faktur
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py,Increment cannot be 0,Kenaikan tidak bisa 0
@@ -1188,6 +1190,7 @@
 DocType: Activity Cost,Activity Type,Jenis Kegiatan
 DocType: Request for Quotation,For individual supplier,Untuk pemasok individual
 DocType: BOM Operation,Base Hour Rate(Company Currency),Dasar Tarif Perjam (Mata Uang Perusahaan)
+,Qty To Be Billed,Qty To Be Billed
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py,Delivered Amount,Jumlah Telah Terikirim
 apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.js,Reserved Qty for Production: Raw materials quantity to make manufacturing items.,Jumlah Pesanan untuk Produksi: Jumlah bahan baku untuk membuat barang-barang manufaktur.
 DocType: Loyalty Point Entry Redemption,Redemption Date,Tanggal Penebusan
@@ -1306,7 +1309,7 @@
 DocType: Sales Invoice,Commission Rate (%),Komisi Rate (%)
 apps/erpnext/erpnext/education/doctype/student_group/student_group.py,Please select Program,Silahkan pilih Program
 DocType: Project,Estimated Cost,Estimasi biaya
-DocType: Request for Quotation,Link to material requests,Link ke permintaan bahan
+DocType: Supplier Quotation,Link to material requests,Link ke permintaan bahan
 apps/erpnext/erpnext/public/js/hub/pages/Publish.vue,Publish,Menerbitkan
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py,Aerospace,Dirgantara
 ,Fichier des Ecritures Comptables [FEC],Fichier des Ecritures Comptables [FEC]
@@ -1319,6 +1322,7 @@
 apps/erpnext/erpnext/utilities/transaction_base.py,Invalid Posting Time,Waktu posting tidak valid
 DocType: Salary Component,Condition and Formula,Kondisi dan Formula
 DocType: Lead,Campaign Name,Nama Promosi Kampanye
+apps/erpnext/erpnext/setup/default_energy_point_rules.py,On Task Completion,Penyelesaian Tugas
 apps/erpnext/erpnext/hr/doctype/compensatory_leave_request/compensatory_leave_request.py,There is no leave period in between {0} and {1},Tidak ada periode cuti di antara {0} dan {1}
 DocType: Fee Validity,Healthcare Practitioner,Praktisi Perawatan Kesehatan
 DocType: Hotel Room,Capacity,Kapasitas
@@ -1663,7 +1667,6 @@
 DocType: Quality Feedback Template,Quality Feedback Template,Template Umpan Balik Kualitas
 apps/erpnext/erpnext/config/education.py,LMS Activity,Aktivitas LMS
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py,Internet Publishing,Penerbitan Internet
-DocType: Prescription Duration,Number,Jumlah
 apps/erpnext/erpnext/accounts/doctype/opening_invoice_creation_tool/opening_invoice_creation_tool.js,Creating {0} Invoice,Membuat {0} Faktur
 DocType: Medical Code,Medical Code Standard,Standar Kode Medis
 DocType: Soil Texture,Clay Composition (%),Komposisi Tanah Liar (%)
@@ -1738,6 +1741,7 @@
 DocType: Support Settings,Get Started Sections,Mulai Bagian
 DocType: Lead,CRM-LEAD-.YYYY.-,CRM-LEAD-.YYYY.-
 DocType: Invoice Discounting,Sanctioned,sanksi
+,Base Amount,Jumlah dasar
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.js,Total Contribution Amount: {0},Jumlah Kontribusi Total: {0}
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py,Row #{0}: Please specify Serial No for Item {1},Row # {0}: Silakan tentukan Serial ada untuk Item {1}
 DocType: Payroll Entry,Salary Slips Submitted,Slip Gaji Diserahkan
@@ -1955,6 +1959,7 @@
 apps/erpnext/erpnext/utilities/user_progress.py,List a few of your suppliers. They could be organizations or individuals.,Daftar beberapa Supplier Anda. Mereka bisa menjadi organisasi atau individu.
 DocType: Accounting Dimension,Dimension Defaults,Default Dimensi
 apps/erpnext/erpnext/crm/report/prospects_engaged_but_not_converted/prospects_engaged_but_not_converted.js,Minimum Lead Age (Days),Minimum Umur Prospek (Hari)
+apps/erpnext/erpnext/assets/report/fixed_asset_register/fixed_asset_register.py,Available For Use Date,Tersedia Untuk Digunakan Tanggal
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py,All BOMs,Semua BOMs
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js,Create Inter Company Journal Entry,Buat Entri Jurnal Perusahaan Inter
 DocType: Company,Parent Company,Perusahaan utama
@@ -2019,6 +2024,7 @@
 ,IRS 1099,IRS 1099
 DocType: Salary Slip,Leave Without Pay,Cuti Tanpa Bayar
 DocType: Payment Request,Outward,Ke luar
+apps/erpnext/erpnext/setup/default_energy_point_rules.py,On {0} Creation,Pada {0} Pembuatan
 apps/erpnext/erpnext/regional/doctype/gstr_3b_report/gstr_3b_report.html,State/UT Tax,Pajak Negara / UT
 ,Trial Balance for Party,Trial Balance untuk Partai
 ,Gross and Net Profit Report,Laporan Laba Kotor dan Laba Bersih
@@ -2134,6 +2140,7 @@
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js,Make Stock Entry,Masuk Stock
 DocType: Hotel Room Reservation,Hotel Reservation User,Pengguna Reservasi Hotel
 apps/erpnext/erpnext/projects/doctype/project/project.js,Set Status,Setel Status
+apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py,Please setup numbering series for Attendance via Setup &gt; Numbering Series,Silakan atur seri penomoran untuk Kehadiran melalui Pengaturan&gt; Seri Penomoran
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py,Please select prefix first,Silakan pilih awalan terlebih dahulu
 DocType: Contract,Fulfilment Deadline,Batas Waktu Pemenuhan
 apps/erpnext/erpnext/public/js/hub/pages/Home.vue,Near you,Di dekat Anda
@@ -2149,6 +2156,7 @@
 DocType: Announcement,All Students,Semua murid
 apps/erpnext/erpnext/assets/doctype/asset/asset.py,Item {0} must be a non-stock item,Barang {0} harus barang non-persediaan
 apps/erpnext/erpnext/stock/doctype/batch/batch.js,View Ledger,Lihat Buku Besar
+DocType: Cost Center,Lft,lft
 DocType: Grading Scale,Intervals,interval
 DocType: Bank Statement Transaction Entry,Reconciled Transactions,Rekonsiliasi Transaksi
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py,Earliest,Paling Awal
@@ -2264,6 +2272,7 @@
 apps/erpnext/erpnext/hr/doctype/employee_benefit_application/employee_benefit_application.py,As per your assigned Salary Structure you cannot apply for benefits,"Sesuai dengan Struktur Gaji yang ditugaskan, Anda tidak dapat mengajukan permohonan untuk tunjangan"
 apps/erpnext/erpnext/stock/doctype/item/item.py,Website Image should be a public file or website URL,Website Image harus file umum atau URL situs
 DocType: Purchase Invoice Item,BOM,BOM
+apps/erpnext/erpnext/stock/doctype/item/item.py,Duplicate entry in Manufacturers table,Entri duplikat di tabel Produsen
 apps/erpnext/erpnext/setup/doctype/item_group/item_group.js,This is a root item group and cannot be edited.,Ini adalah kelompok Stok Barang akar dan tidak dapat diedit.
 apps/erpnext/erpnext/accounts/doctype/account/account.js,Merge,Menggabungkan
 DocType: Journal Entry Account,Purchase Order,Purchase Order
@@ -2408,7 +2417,6 @@
 DocType: Asset,Depreciation Schedules,Jadwal penyusutan
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.js,Create Sales Invoice,Buat Faktur Penjualan
 apps/erpnext/erpnext/regional/doctype/gstr_3b_report/gstr_3b_report.html,Ineligible ITC,ITC yang tidak memenuhi syarat
-apps/erpnext/erpnext/erpnext_integrations/doctype/shopify_settings/shopify_settings.py,"Support for public app is deprecated. Please setup private app, for more details refer user manual","Dukungan untuk aplikasi publik tidak lagi digunakan. Silakan setup aplikasi pribadi, untuk lebih jelasnya lihat buku petunjuk pengguna"
 DocType: Task,Dependent Tasks,Tugas Tanggungan
 apps/erpnext/erpnext/regional/report/gstr_1/gstr_1.py,Following accounts might be selected in GST Settings:,Akun berikut mungkin dipilih di Setelan GST:
 apps/erpnext/erpnext/manufacturing/report/bom_stock_report/bom_stock_report.js,Quantity to Produce,Kuantitas untuk Menghasilkan
@@ -2661,6 +2669,7 @@
 DocType: Water Analysis,Container,Wadah
 apps/erpnext/erpnext/regional/report/gstr_1/gstr_1.py,Please set valid GSTIN No. in Company Address,Harap tetapkan No. GSTIN yang valid di Alamat Perusahaan
 apps/erpnext/erpnext/education/utils.py,Student {0} - {1} appears Multiple times in row {2} & {3},Mahasiswa {0} - {1} muncul Beberapa kali berturut-turut {2} &amp; {3}
+apps/erpnext/erpnext/selling/doctype/customer/customer.py,Following fields are mandatory to create address:,Bidang-bidang berikut wajib untuk membuat alamat:
 DocType: Item Alternative,Two-way,Dua arah
 DocType: Item,Manufacturers,Pabrikan
 apps/erpnext/erpnext/accounts/deferred_revenue.py,Error while processing deferred accounting for {0},Kesalahan saat memproses akuntansi yang ditangguhkan untuk {0}
@@ -2735,9 +2744,9 @@
 DocType: Employee,HR-EMP-,HR-EMP-
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py,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: Quality Meeting Minutes,Quality Meeting Minutes,Risalah Rapat Kualitas
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Supplier &gt; Supplier Type,Pemasok&gt; Jenis Pemasok
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py,Employee Referral,Rujukan karyawan
 DocType: Student Group,Set 0 for no limit,Set 0 untuk tidak ada batas
+DocType: Cost Center,rgt,rgt
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py,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.
 DocType: Customer,Primary Address and Contact Detail,Alamat Utama dan Detail Kontak
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.js,Resend Payment Email,Kirim ulang Email Pembayaran
@@ -2847,7 +2856,6 @@
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py,Against Supplier Invoice {0} dated {1},Terhadap Faktur Supplier {0} di tanggal {1}
 DocType: Customer,Default Price List,Standar List Harga
 apps/erpnext/erpnext/assets/doctype/asset/asset.py,Asset Movement record {0} created,Gerakan aset catatan {0} dibuat
-apps/erpnext/erpnext/utilities/page/leaderboard/leaderboard.js,No items found.,Tidak ada item yang ditemukan.
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py,You cannot delete Fiscal Year {0}. Fiscal Year {0} is set as default in Global Settings,Anda tidak dapat menghapus Tahun Anggaran {0}. Tahun Fiskal {0} diatur sebagai default di Pengaturan Global
 DocType: Share Transfer,Equity/Liability Account,Akun Ekuitas / Kewajiban
 apps/erpnext/erpnext/setup/doctype/customer_group/customer_group.py,A customer with the same name already exists,Pelanggan dengan nama yang sama sudah ada
@@ -2863,6 +2871,7 @@
 apps/erpnext/erpnext/selling/doctype/customer/customer.py,Credit limit has been crossed for customer {0} ({1}/{2}),Batas kredit telah disilangkan untuk pelanggan {0} ({1} / {2})
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py,Customer required for 'Customerwise Discount',Pelanggan diperlukan untuk 'Diskon Pelanggan'
 apps/erpnext/erpnext/config/accounting.py,Update bank payment dates with journals.,Perbarui tanggal pembayaran bank dengan jurnal.
+,Billed Qty,Jumlah Tagihan
 apps/erpnext/erpnext/stock/doctype/item/item_dashboard.py,Pricing,harga
 DocType: Employee,Attendance Device ID (Biometric/RF tag ID),ID Perangkat Kehadiran (ID tag Biometrik / RF)
 DocType: Quotation,Term Details,Rincian Term
@@ -2884,6 +2893,7 @@
 DocType: Share Transfer,Asset Account,Akun Aset
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js,New release date should be in the future,Tanggal rilis baru harus di masa depan
 DocType: Purchase Invoice,End date of current invoice's period,Tanggal akhir periode faktur saat ini
+apps/erpnext/erpnext/hr/doctype/employee/employee.py,Please setup Employee Naming System in Human Resource &gt; HR Settings,Silakan atur Sistem Penamaan Karyawan di Sumber Daya Manusia&gt; Pengaturan SDM
 DocType: Lab Test,Technician Name,Nama teknisi
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py,"Cannot ensure delivery by Serial No as \
 					Item {0} is added with and without Ensure Delivery by \
@@ -2891,6 +2901,7 @@
 DocType: Accounts Settings,Unlink Payment on Cancellation of Invoice,Membatalkan tautan Pembayaran pada Pembatalan Faktur
 DocType: Bank Reconciliation,From Date,Dari Tanggal
 apps/erpnext/erpnext/hr/doctype/vehicle_log/vehicle_log.py,Current Odometer reading entered should be greater than initial Vehicle Odometer {0},Odometer membaca saat masuk harus lebih besar dari awal Kendaraan Odometer {0}
+,Purchase Order Items To Be Received or Billed,Beli Barang Pesanan Yang Akan Diterima atau Ditagih
 DocType: Restaurant Reservation,No Show,Tidak menunjukkan
 apps/erpnext/erpnext/regional/india/utils.py,You must be a registered supplier to generate e-Way Bill,Anda harus menjadi pemasok terdaftar untuk menghasilkan RUU e-Way
 DocType: Shipping Rule Country,Shipping Rule Country,Aturan Pengiriman – Negara
@@ -2933,6 +2944,7 @@
 apps/erpnext/erpnext/templates/generators/item/item_add_to_cart.html,View in Cart,Lihat Troli
 DocType: Employee Checkin,Shift Actual Start,Pergeseran Mulai Aktual
 DocType: Tally Migration,Is Day Book Data Imported,Apakah Data Buku Hari Diimpor
+,Purchase Order Items To Be Received or Billed1,Beli Barang Pesanan Yang Akan Diterima atau Ditagih1
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py,Marketing Expenses,Beban Pemasaran
 apps/erpnext/erpnext/stock/doctype/pick_list/pick_list.py,{0} units of {1} is not available.,{0} unit {1} tidak tersedia.
 ,Item Shortage Report,Laporan Kekurangan Barang / Item
@@ -3157,7 +3169,6 @@
 apps/erpnext/erpnext/public/js/call_popup/call_popup.js,View all issues from {0},Lihat semua masalah dari {0}
 DocType: Quality Inspection,MAT-QA-.YYYY.-,MAT-QA-.YYYY.-
 DocType: Quality Meeting Table,Quality Meeting Table,Tabel Rapat Kualitas
-apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,Silakan tentukan Seri Penamaan untuk {0} melalui Pengaturan&gt; Pengaturan&gt; Seri Penamaan
 apps/erpnext/erpnext/templates/pages/help.html,Visit the forums,Kunjungi forum
 DocType: Student,Student Mobile Number,Mahasiswa Nomor Ponsel
 DocType: Item,Has Variants,Memiliki Varian
@@ -3300,6 +3311,7 @@
 DocType: Homepage Section,Section Cards,Kartu Bagian
 ,Campaign Efficiency,Efisiensi Promosi
 DocType: Discussion,Discussion,Diskusi
+apps/erpnext/erpnext/setup/default_energy_point_rules.py,On Sales Order Submission,Pengajuan Pesanan Penjualan
 DocType: Bank Transaction,Transaction ID,ID transaksi
 DocType: Payroll Entry,Deduct Tax For Unsubmitted Tax Exemption Proof,Kurangi Pajak Untuk Bukti Pembebasan Pajak yang Tidak Diperbolehkan
 DocType: Volunteer,Anytime,Kapan saja
@@ -3307,7 +3319,6 @@
 DocType: Employee Tax Exemption Proof Submission,Employee Tax Exemption Proof Submission,Pengajuan Bukti Pembebasan Pajak Karyawan
 DocType: Patient,Surgical History,Sejarah Bedah
 DocType: Bank Statement Settings Item,Mapped Header,Header yang Dipetakan
-apps/erpnext/erpnext/hr/doctype/employee/employee.py,Please setup Employee Naming System in Human Resource &gt; HR Settings,Silakan atur Sistem Penamaan Karyawan di Sumber Daya Manusia&gt; Pengaturan SDM
 DocType: Employee,Resignation Letter Date,Tanggal Surat Pengunduran Diri
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Pricing Rules are further filtered based on quantity.,Aturan harga selanjutnya disaring berdasarkan kuantitas.
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py,Please set the Date Of Joining for employee {0},Harap atur tanggal bergabung untuk karyawan {0}
@@ -3321,6 +3332,7 @@
 DocType: Bank Statement Settings,Mapped Items,Item yang Dipetakan
 DocType: Amazon MWS Settings,IT,SAYA T
 DocType: Chapter,Chapter,Bab
+,Fixed Asset Register,Daftar Aset Tetap
 apps/erpnext/erpnext/utilities/user_progress.py,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,Select BOM and Qty for Production,Pilih BOM dan Qty untuk Produksi
@@ -3456,7 +3468,6 @@
 apps/erpnext/erpnext/templates/emails/reorder_item.html,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
 apps/erpnext/erpnext/controllers/accounts_controller.py,Account {0} is invalid. Account Currency must be {1},Akun {0} tidak berlaku. Mata Uang Akun harus {1}
 apps/erpnext/erpnext/hr/doctype/salary_structure_assignment/salary_structure_assignment.py,From Date {0} cannot be after employee's relieving Date {1},Dari Tanggal {0} tidak boleh setelah Tanggal Pelepasan karyawan {1}
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py,Debit Note {0} has been created automatically,Catatan Debit {0} telah dibuat secara otomatis
 apps/erpnext/erpnext/accounts/doctype/payment_order/payment_order.js,Create Payment Entries,Buat Entri Pembayaran
 DocType: Supplier,Is Internal Supplier,Apakah Pemasok Internal
 DocType: Employee,Create User Permission,Buat Izin Pengguna
@@ -4015,7 +4026,6 @@
 DocType: Project User,Project Status,Status proyek
 DocType: UOM,Check this to disallow fractions. (for Nos),Centang untuk melarang fraksi. (Untuk Nos)
 DocType: Student Admission Program,Naming Series (for Student Applicant),Penamaan Series (untuk Mahasiswa Pemohon)
-apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.py,UOM Conversion factor ({0} -&gt; {1}) not found for item: {2},Faktor Konversi UOM ({0} -&gt; {1}) tidak ditemukan untuk item: {2}
 apps/erpnext/erpnext/hr/doctype/retention_bonus/retention_bonus.py,Bonus Payment Date cannot be a past date,Tanggal Pembayaran Bonus tidak bisa menjadi tanggal yang lalu
 DocType: Travel Request,Copy of Invitation/Announcement,Salinan Undangan / Pengumuman
 DocType: Practitioner Service Unit Schedule,Practitioner Service Unit Schedule,Jadwal Unit Pelayanan Praktisi
@@ -4183,6 +4193,7 @@
 apps/erpnext/erpnext/utilities/user_progress.py,Setup Company,Penyiapan Perusahaan
 ,Lab Test Report,Laporan Uji Lab
 DocType: Employee Benefit Application,Employee Benefit Application,Aplikasi Manfaat Karyawan
+apps/erpnext/erpnext/accounts/doctype/invoice_discounting/invoice_discounting.py,Row({0}): {1} is already discounted in {2},Baris ({0}): {1} sudah didiskon dalam {2}
 apps/erpnext/erpnext/hr/doctype/additional_salary/additional_salary.py,Additional Salary Component Exists.,Komponen Gaji Tambahan Ada.
 DocType: Purchase Invoice,Unregistered,Tidak terdaftar
 DocType: Student Applicant,Application Date,Tanggal Aplikasi
@@ -4261,7 +4272,6 @@
 DocType: Journal Entry,Accounting Entries,Entri Akuntansi
 DocType: Job Card Time Log,Job Card Time Log,Log Waktu Kartu Pekerjaan
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,"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;."
-apps/erpnext/erpnext/education/doctype/instructor/instructor.py,Please setup Instructor Naming System in Education &gt; Education Settings,Silakan siapkan Sistem Penamaan Instruktur di Pendidikan&gt; Pengaturan Pendidikan
 DocType: Journal Entry,Paid Loan,Pinjaman Berbayar
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py,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
@@ -4278,7 +4288,6 @@
 apps/erpnext/erpnext/templates/pages/projects.html,No time sheets,Tidak ada lembar waktu
 DocType: GoCardless Mandate,GoCardless Customer,Pelanggan GoCardless
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py,Leave Type {0} cannot be carry-forwarded,Cuti Jenis {0} tidak dapat membawa-diteruskan
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Item Code &gt; Item Group &gt; Brand,Kode Barang&gt; Grup Barang&gt; Merek
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py,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
 DocType: Leave Encashment,Payroll,Daftar gaji
@@ -4393,7 +4402,6 @@
 DocType: Stock Ledger Entry,Actual Qty After Transaction,Jumlah Aktual Setelah Transaksi
 ,Pending SO Items For Purchase Request,Pending SO Items Untuk Pembelian Permintaan
 apps/erpnext/erpnext/education/doctype/student_admission/student_admission.py,Student Admissions,Penerimaan Mahasiswa
-apps/erpnext/erpnext/accounts/party.py,{0} {1} is disabled,{0} {1} dinonaktifkan
 DocType: Supplier,Billing Currency,Mata Uang Penagihan
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py,Extra Large,Ekstra Besar
 DocType: Loan,Loan Application,Permohonan pinjaman
@@ -4470,7 +4478,6 @@
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py,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/accounts/doctype/accounting_dimension/accounting_dimension.py,Creating Dimensions...,Membuat Dimensi ...
 apps/erpnext/erpnext/education/doctype/student_group_creation_tool/student_group_creation_tool.py,Student Group Name is mandatory in row {0},Mahasiswa Nama Group adalah wajib berturut-turut {0}
-DocType: Customer Credit Limit,Bypass credit limit_check,Abaikan limit_check kredit
 DocType: Homepage,Products to be shown on website homepage,Produk yang akan ditampilkan pada homepage website
 DocType: HR Settings,Password Policy,Kebijakan Kata Sandi
 apps/erpnext/erpnext/setup/doctype/customer_group/customer_group.js,This is a root customer group and cannot be edited.,Ini adalah kelompok pelanggan paling dasar dan tidak dapat diedit.
@@ -4762,6 +4769,7 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py,Row {0}: Advance against Customer must be credit,Baris {0}: Uang muka dari Pelanggan harus kredit
 DocType: Quality Meeting,Quality Meeting,Rapat Kualitas
 apps/erpnext/erpnext/accounts/doctype/account/account.js,Non-Group to Group,Non-Group untuk Grup
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,Silakan tentukan Seri Penamaan untuk {0} melalui Pengaturan&gt; Pengaturan&gt; Seri Penamaan
 DocType: Employee,ERPNext User,Pengguna ERPNext
 apps/erpnext/erpnext/education/doctype/student_group_creation_tool/student_group_creation_tool.py,Batch is mandatory in row {0},Batch wajib di baris {0}
 DocType: Company,Default Buying Terms,Ketentuan Pembelian Default
@@ -5056,6 +5064,7 @@
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py,No {0} found for Inter Company Transactions.,Tidak ada {0} ditemukan untuk Transaksi Perusahaan Inter.
 DocType: Travel Itinerary,Rented Car,Mobil sewaan
 apps/erpnext/erpnext/public/js/hub/components/profile_dialog.js,About your Company,Tentang Perusahaan Anda
+apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.js,Show Stock Ageing Data,Tampilkan Data Penuaan Stok
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py,Credit To account must be a Balance Sheet account,Kredit Untuk akun harus rekening Neraca
 DocType: Donor,Donor,Donatur
 DocType: Global Defaults,Disable In Words,Nonaktifkan Dalam Kata-kata
@@ -5070,8 +5079,10 @@
 DocType: Practitioner Schedule,Schedule Name,Nama Jadwal
 apps/erpnext/erpnext/regional/doctype/gstr_3b_report/gstr_3b_report.py,Please enter GSTIN and state for the Company Address {0},Silakan masukkan GSTIN dan sebutkan untuk Alamat Perusahaan {0}
 DocType: Currency Exchange,For Buying,Untuk Membeli
+apps/erpnext/erpnext/setup/default_energy_point_rules.py,On Purchase Order Submission,Pengajuan Pesanan Pembelian
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js,Add All Suppliers,Tambahkan Semua Pemasok
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py,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/accounts/doctype/pricing_rule/pricing_rule.js,Customer &gt; Customer Group &gt; Territory,Pelanggan&gt; Grup Pelanggan&gt; Wilayah
 DocType: Tally Migration,Parties,Pesta
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js,Browse BOM,Telusuri BOM
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py,Secured Loans,Pinjaman Aman
@@ -5103,6 +5114,7 @@
 apps/erpnext/erpnext/stock/doctype/item_alternative/item_alternative.py,Not allow to set alternative item for the item {0},Tidak memungkinkan untuk mengatur item alternatif untuk item {0}
 apps/erpnext/erpnext/hr/doctype/leave_block_list/leave_block_list.py,Date is repeated,Tanggal diulang
 apps/erpnext/erpnext/accounts/print_format/payment_receipt_voucher/payment_receipt_voucher.html,Authorized Signatory,Penandatangan yang Sah
+apps/erpnext/erpnext/education/doctype/instructor/instructor.py,Please setup Instructor Naming System in Education &gt; Education Settings,Silakan siapkan Sistem Penamaan Instruktur di Pendidikan&gt; Pengaturan Pendidikan
 apps/erpnext/erpnext/regional/doctype/gstr_3b_report/gstr_3b_report.html,Net ITC Available(A) - (B),Tersedia ITC Bersih (A) - (B)
 apps/erpnext/erpnext/education/doctype/fee_schedule/fee_schedule.js,Create Fees,Buat Biaya
 DocType: Project,Total Purchase Cost (via Purchase Invoice),Total Biaya Pembelian (Purchase Invoice via)
@@ -5123,6 +5135,7 @@
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.js,Message Sent,Pesan Terkirim
 apps/erpnext/erpnext/accounts/doctype/account/account.py,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/assets/report/fixed_asset_register/fixed_asset_register.py,Vendor Name,Nama pedagang
 DocType: Quiz Result,Wrong,Salah
 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)
@@ -5366,6 +5379,7 @@
 DocType: Stock Settings,Auto Material Request,Permintaan Material Otomatis
 DocType: Woocommerce Settings,API consumer secret,Rahasia konsumen API
 DocType: Delivery Note Item,Available Batch Qty at From Warehouse,Tersedia Batch Qty di Gudang Dari
+,Received Qty Amount,Menerima Jumlah Jumlah
 DocType: Salary Slip,Gross Pay - Total Deduction - Loan Repayment,Pay Gross - Jumlah Pengurangan - Pelunasan Pinjaman
 DocType: Bank Account,Last Integration Date,Tanggal Integrasi Terakhir
 DocType: Expense Claim,Expense Taxes and Charges,Pajak Biaya dan Beban
@@ -5824,6 +5838,8 @@
 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,Please select Qty against item {0},Silakan pilih Qty terhadap item {0}
+apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py,Latest Age,Zaman Terbaru
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js,Transfer Material to Supplier,Mentransfer Bahan untuk Pemasok
 apps/erpnext/erpnext/hr/report/loan_repayment/loan_repayment.py,EMI,EMI
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py,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
@@ -5847,7 +5863,6 @@
 apps/erpnext/erpnext/hr/doctype/employee_benefit_application/employee_benefit_application.py,"An amount of {0} already claimed for the component {1},\
 						 set the amount equal or greater than {2}","Sejumlah {0} sudah diklaim untuk komponen {1}, \ menetapkan jumlah yang sama atau lebih besar dari {2}"
 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
 DocType: BOM Update Tool,The new BOM after replacement,The BOM baru setelah penggantian
 ,Point of Sale,Point of Sale
@@ -5967,7 +5982,6 @@
 DocType: Purchase Order Item,Blanket Order Rate,Tingkat Pesanan Selimut
 ,Customer Ledger Summary,Ringkasan Buku Besar Pelanggan
 apps/erpnext/erpnext/hooks.py,Certification,Sertifikasi
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js,Are you sure you want to make debit note?,Anda yakin ingin membuat catatan debit?
 DocType: Bank Guarantee,Clauses and Conditions,Klausul dan Ketentuan
 DocType: Serial No,Creation Document Type,Pembuatan Dokumen Type
 DocType: Amazon MWS Settings,ES,ES
@@ -6005,8 +6019,6 @@
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py,Financial Services,Jasa Keuangan
 DocType: Student Sibling,Student ID,Identitas Siswa
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.js,For Quantity must be greater than zero,Untuk Kuantitas harus lebih besar dari nol
-apps/erpnext/erpnext/hr/doctype/employee_transfer/employee_transfer.py,"Please delete the Employee <a href=""#Form/Employee/{0}"">{0}</a>\
-					to cancel this document","Silakan hapus Karyawan <a href=""#Form/Employee/{0}"">{0}</a> \ untuk membatalkan dokumen ini"
 apps/erpnext/erpnext/config/projects.py,Types of activities for Time Logs,Jenis kegiatan untuk Waktu Log
 DocType: Opening Invoice Creation Tool,Sales,Penjualan
 DocType: Stock Entry Detail,Basic Amount,Nilai Dasar
@@ -6085,6 +6097,7 @@
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py,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,Send Supplier Emails,Kirim Email Pemasok
+DocType: Asset Movement,ACC-ASM-.YYYY.-,ACC-ASM-.YYYY.-
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py,"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
 apps/erpnext/erpnext/hr/doctype/employee_onboarding/employee_onboarding.py,Submit this to create the Employee record,Kirimkan ini untuk membuat catatan Karyawan
@@ -6162,7 +6175,6 @@
 DocType: Sales Team,Contact No.,Hubungi Nomor
 apps/erpnext/erpnext/templates/includes/cart/cart_address.html,Billing Address is same as Shipping Address,Alamat Penagihan sama dengan Alamat Pengiriman
 DocType: Bank Reconciliation,Payment Entries,Entries pembayaran
-apps/erpnext/erpnext/erpnext_integrations/doctype/shopify_settings/shopify_settings.py,Access token or Shopify URL missing,Akses token atau URL Shopify hilang
 DocType: Location,Latitude,Lintang
 DocType: Work Order,Scrap Warehouse,Gudang memo
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py,"Warehouse required at Row No {0}, please set default warehouse for the item {1} for the company {2}","Gudang yang diperlukan di Baris Tidak {0}, setel gudang default untuk item {1} untuk perusahaan {2}"
@@ -6205,7 +6217,6 @@
 DocType: Job Offer Term,Value / Description,Nilai / Keterangan
 apps/erpnext/erpnext/controllers/accounts_controller.py,"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
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js,Are you sure you want to make credit note?,Anda yakin ingin membuat catatan kredit?
 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,Debit and Credit not equal for {0} #{1}. Difference is {2}.,Debit dan Kredit tidak sama untuk {0} # {1}. Perbedaan adalah {2}.
@@ -6330,6 +6341,7 @@
 DocType: Purchase Invoice,Taxes and Charges Added,Pajak dan Biaya Ditambahkan
 apps/erpnext/erpnext/assets/doctype/asset/asset.py,Depreciation Row {0}: Next Depreciation Date cannot be before Available-for-use Date,Depreciation Row {0}: Next Depreciation Date tidak boleh sebelum Tersedia-untuk-digunakan Tanggal
 ,Sales Funnel,Penjualan Saluran
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Item Code &gt; Item Group &gt; Brand,Kode Barang&gt; Grup Barang&gt; Merek
 apps/erpnext/erpnext/setup/doctype/company/company.py,Abbreviation is mandatory,Singkatan wajib diisi
 DocType: Project,Task Progress,tugas Kemajuan
 apps/erpnext/erpnext/templates/includes/navbar/navbar_items.html,Cart,Troli
@@ -6573,6 +6585,7 @@
 DocType: Employee Grade,Employee Grade,Kelas Karyawan
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py,Piecework,Pekerjaan yg dibayar menurut hasil yg dikerjakan
 DocType: GSTR 3B Report,June,Juni
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Supplier &gt; Supplier Type,Pemasok&gt; Jenis Pemasok
 DocType: Share Balance,From No,Dari No
 DocType: Shift Type,Early Exit Grace Period,Periode Grace Keluar Awal
 DocType: Task,Actual Time (in Hours),Waktu Aktual (dalam Jam)
@@ -6857,6 +6870,7 @@
 DocType: Warehouse,Warehouse Name,Nama Gudang
 DocType: Naming Series,Select Transaction,Pilih Transaksi
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py,Please enter Approving Role or Approving User,Entrikan Menyetujui Peran atau Menyetujui Pengguna
+apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.py,UOM Conversion factor ({0} -&gt; {1}) not found for item: {2},Faktor Konversi UOM ({0} -&gt; {1}) tidak ditemukan untuk item: {2}
 apps/erpnext/erpnext/support/doctype/service_level_agreement/service_level_agreement.py,Service Level Agreement with Entity Type {0} and Entity {1} already exists.,Perjanjian Tingkat Layanan dengan Jenis Entitas {0} dan Entitas {1} sudah ada.
 DocType: Journal Entry,Write Off Entry,Menulis Off Entri
 DocType: BOM,Rate Of Materials Based On,Laju Bahan Berbasis On
@@ -7047,6 +7061,7 @@
 DocType: Quality Inspection Reading,Quality Inspection Reading,Nilai Inspeksi Mutu
 apps/erpnext/erpnext/stock/doctype/stock_settings/stock_settings.py,`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/stock/report/stock_balance/stock_balance.py,Earliest Age,Usia paling awal
 apps/erpnext/erpnext/utilities/user_progress.py,Set a sales goal you'd like to achieve for your company.,Tetapkan sasaran penjualan yang ingin Anda capai untuk perusahaan Anda.
 DocType: Quality Goal,Revision,Revisi
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js,Healthcare Services,Layanan Kesehatan
@@ -7090,6 +7105,7 @@
 apps/erpnext/erpnext/healthcare/doctype/patient_encounter/patient_encounter.js,Schedule Discharge,Jadwal Pengiriman
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py,Cheques and Deposits incorrectly cleared,Cek dan Deposit tidak benar dibersihkan
 DocType: Homepage Section Card,Homepage Section Card,Kartu Bagian Beranda
+,Amount To Be Billed,Jumlah Yang Akan Ditagih
 apps/erpnext/erpnext/accounts/doctype/account/account.py,Account {0}: You can not assign itself as parent account,Akun {0}: Anda tidak dapat menetapkanya sebagai Akun Induk
 DocType: Purchase Invoice Item,Price List Rate,Daftar Harga Tingkat
 apps/erpnext/erpnext/utilities/activation.py,Create customer quotes,Buat kutipan pelanggan
@@ -7142,6 +7158,7 @@
 DocType: Supplier Scorecard Criteria,Supplier Scorecard Criteria,Kriteria Scorecard Pemasok
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py,Please select Start Date and End Date for Item {0},Silakan pilih Tanggal Mulai dan Tanggal Akhir untuk Item {0}
 DocType: Maintenance Schedule,MAT-MSH-.YYYY.-,MAT-MSH-.YYYY.-
+,Amount to Receive,Jumlah yang Diterima
 apps/erpnext/erpnext/education/doctype/student_group_creation_tool/student_group_creation_tool.py,Course is mandatory in row {0},Tentu saja adalah wajib berturut-turut {0}
 apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py,From date can not be greater than than To date,Dari tanggal tidak boleh lebih dari dari Tanggal
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py,To date cannot be before from date,Sampai saat ini tidak dapat sebelumnya dari tanggal
@@ -7390,7 +7407,6 @@
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js,BOM and Manufacturing Quantity are required,BOM dan Kuantitas Manufaktur diperlukan
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js,Ageing Range 2,Rentang Umur 2
 DocType: SG Creation Tool Course,Max Strength,Max Kekuatan
-apps/erpnext/erpnext/accounts/doctype/account/account.py,"Account {0} already exists in child company {1}. The following fields have different values, they should be same:<ul><li>{2}</li></ul>","Akun {0} sudah ada di perusahaan anak {1}. Bidang-bidang berikut memiliki nilai yang berbeda, harus sama: <ul><li> {2} </li></ul>"
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py,Installing presets,Menginstal preset
 DocType: Fee Schedule,EDU-FSH-.YYYY.-,EDU-FSH-.YYYY.-
 apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js,No Delivery Note selected for Customer {},Tidak ada Catatan Pengiriman yang dipilih untuk Pelanggan {}
@@ -7598,6 +7614,7 @@
 DocType: Delivery Note,Print Without Amount,Cetak Tanpa Jumlah
 apps/erpnext/erpnext/accounts/report/asset_depreciation_ledger/asset_depreciation_ledger.py,Depreciation Date,penyusutan Tanggal
 ,Work Orders in Progress,Perintah Kerja Sedang Berlangsung
+DocType: Customer Credit Limit,Bypass Credit Limit Check,Cek Batas Kredit Bypass
 DocType: Issue,Support Team,Tim Support
 apps/erpnext/erpnext/stock/report/batch_item_expiry_status/batch_item_expiry_status.py,Expiry (In Days),Kadaluwarsa (Dalam Days)
 DocType: Appraisal,Total Score (Out of 5),Skor Total (Out of 5)
@@ -7781,6 +7798,7 @@
 DocType: Sales Invoice,Customer GSTIN,Pelanggan GSTIN
 DocType: Crop Cycle,List of diseases detected on the field. When selected it'll automatically add a list of tasks to deal with the disease ,Daftar penyakit yang terdeteksi di lapangan. Bila dipilih maka secara otomatis akan menambahkan daftar tugas untuk mengatasi penyakit tersebut
 apps/erpnext/erpnext/manufacturing/page/bom_comparison_tool/bom_comparison_tool.js,BOM 1,BOM 1
+apps/erpnext/erpnext/assets/report/fixed_asset_register/fixed_asset_register.py,Asset Id,Id Aset
 apps/erpnext/erpnext/healthcare/doctype/healthcare_service_unit/healthcare_service_unit.js,This is a root healthcare service unit and cannot be edited.,Ini adalah unit layanan perawatan akar dan tidak dapat diedit.
 DocType: Asset Repair,Repair Status,Status perbaikan
 apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.js,"Requested Qty: Quantity requested for purchase, but not ordered.","Diminta Qty: Jumlah yang diminta untuk pembelian, tetapi tidak memerintahkan."
diff --git a/erpnext/translations/is.csv b/erpnext/translations/is.csv
index 869fb88..e2ce118 100644
--- a/erpnext/translations/is.csv
+++ b/erpnext/translations/is.csv
@@ -289,7 +289,6 @@
 DocType: Loan,Repay Over Number of Periods,Endurgreiða yfir fjölda tímum
 apps/erpnext/erpnext/manufacturing/report/bom_stock_report/bom_stock_report.py,Quantity to Produce can not be less than Zero,Magn til að framleiða getur ekki verið minna en núll
 DocType: Stock Entry,Additional Costs,viðbótarkostnað
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Customer &gt; Customer Group &gt; Territory,Viðskiptavinur&gt; viðskiptavinahópur&gt; landsvæði
 apps/erpnext/erpnext/accounts/doctype/account/account.py,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
@@ -586,6 +585,7 @@
 DocType: Healthcare Settings,Create documents for sample collection,Búðu til skjöl til að safna sýni
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py,Payment against {0} {1} cannot be greater than Outstanding Amount {2},Greiðsla gegn {0} {1} getur ekki verið meiri en Kröfuvirði {2}
 apps/erpnext/erpnext/patches/v11_0/add_healthcare_service_unit_tree_root.py,All Healthcare Service Units,Allir heilbrigðisþjónustudeildir
+apps/erpnext/erpnext/setup/default_energy_point_rules.py,On Converting Opportunity,Um umbreytingu tækifærisins
 DocType: Bank Account,Address HTML,Heimilisfang HTML
 DocType: Lead,Mobile No.,Mobile No.
 apps/erpnext/erpnext/selling/doctype/pos_closing_voucher/closing_voucher_details.html,Mode of Payments,Greiðslumáti
@@ -650,7 +650,6 @@
 DocType: Accounting Dimension,Dimension Name,Víddarheiti
 apps/erpnext/erpnext/healthcare/setup.py,Resistant,Þola
 apps/erpnext/erpnext/hotels/doctype/hotel_room_reservation/hotel_room_reservation.py,Please set Hotel Room Rate on {},Vinsamlegast settu herbergi fyrir herbergi á {}
-apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py,Please setup numbering series for Attendance via Setup &gt; Numbering Series,Vinsamlegast settu upp númeraröð fyrir mætingu með uppsetningu&gt; Númeraröð
 DocType: Journal Entry,Multi Currency,multi Gjaldmiðill
 DocType: Bank Statement Transaction Invoice Item,Invoice Type,Reikningar Type
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py,Valid from date must be less than valid upto date,Gildir frá dagsetningu verða að vera minni en gildir fram til dagsetninga
@@ -765,6 +764,7 @@
 apps/erpnext/erpnext/accounts/page/pos/pos.js,Create a new Customer,Búa til nýja viðskiptavini
 apps/erpnext/erpnext/non_profit/report/expiring_memberships/expiring_memberships.py,Expiring On,Rennur út á
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,"If multiple Pricing Rules continue to prevail, users are asked to set Priority manually to resolve conflict.","Ef margir Verðlagning Reglur halda áfram að sigra, eru notendur beðnir um að setja Forgangur höndunum til að leysa deiluna."
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js,Purchase Return,kaup Return
 apps/erpnext/erpnext/utilities/activation.py,Create Purchase Orders,Búa innkaupapantana
 ,Purchase Register,kaup Register
 apps/erpnext/erpnext/healthcare/doctype/patient/patient.py,Patient not found,Sjúklingur fannst ekki
@@ -780,7 +780,6 @@
 DocType: Location,Area UOM,Svæði UOM
 apps/erpnext/erpnext/manufacturing/doctype/workstation/workstation.py,Workstation is closed on the following dates as per Holiday List: {0},Vinnustöð er lokað á eftirfarandi dögum eins og á Holiday List: {0}
 apps/erpnext/erpnext/selling/page/sales_funnel/sales_funnel.py,Opportunities,tækifæri
-apps/erpnext/erpnext/www/all-products/index.html,Clear filters,Hreinsaðu síur
 DocType: Lab Test Template,Single,Single
 DocType: Compensatory Leave Request,Work From Date,Vinna frá degi
 DocType: Salary Slip,Total Loan Repayment,Alls Loan Endurgreiðsla
@@ -823,6 +822,7 @@
 DocType: Account,Old Parent,Old Parent
 apps/erpnext/erpnext/education/doctype/program_enrollment_tool/program_enrollment_tool.py,Mandatory field - Academic Year,Skyldanlegt námskeið - námsár
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py,{0} {1} is not associated with {2} {3},{0} {1} tengist ekki {2} {3}
+DocType: Opportunity,Converted By,Umbreytt af
 apps/erpnext/erpnext/public/js/hub/components/ReviewArea.vue,You need to login as a Marketplace User before you can add any reviews.,Þú verður að skrá þig inn sem markaðsnotandi áður en þú getur bætt við umsögnum.
 apps/erpnext/erpnext/manufacturing/doctype/job_card/job_card.py,Row {0} : Operation is required against the raw material item {1},Row {0}: Aðgerð er krafist gegn hráefnishlutanum {1}
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py,Please set default payable account for the company {0},Vinsamlegast settu sjálfgefinn greiðslureikning fyrir fyrirtækið {0}
@@ -848,6 +848,8 @@
 DocType: BOM,Work Order,Vinna fyrirmæli
 DocType: Sales Invoice,Total Qty,Total Magn
 apps/erpnext/erpnext/education/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py,Guardian2 Email ID,Guardian2 Netfang
+apps/erpnext/erpnext/hr/doctype/employee_transfer/employee_transfer.py,"Please delete the Employee <a href=""#Form/Employee/{0}"">{0}</a>\
+					to cancel this document","Vinsamlegast eytt starfsmanninum <a href=""#Form/Employee/{0}"">{0}</a> \ til að hætta við þetta skjal"
 DocType: Item,Show in Website (Variant),Sýna í Website (Variant)
 DocType: Employee,Health Concerns,Heilsa Áhyggjuefni
 DocType: Payroll Entry,Select Payroll Period,Veldu Launaskrá Tímabil
@@ -907,7 +909,6 @@
 DocType: Codification Table,Codification Table,Codification Table
 DocType: Timesheet Detail,Hrs,Hrs
 apps/erpnext/erpnext/manufacturing/page/bom_comparison_tool/bom_comparison_tool.js,Changes in {0},Breytingar á {0}
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js,Please select Company,Vinsamlegast veldu Company
 DocType: Employee Skill,Employee Skill,Hæfni starfsmanna
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.js,Difference Account,munurinn Reikningur
 DocType: Pricing Rule,Discount on Other Item,Afsláttur af öðrum hlut
@@ -975,6 +976,7 @@
 DocType: BOM,Operating Cost,Rekstrarkostnaður
 DocType: Crop,Produced Items,Framleiddir hlutir
 DocType: Bank Statement Transaction Entry,Match Transaction to Invoices,Samsvörun við reikninga
+apps/erpnext/erpnext/erpnext_integrations/exotel_integration.py,Error in Exotel incoming call,Villa við innhringingu Exotel
 DocType: Sales Order Item,Gross Profit,Framlegð
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js,Unblock Invoice,Aflokkaðu innheimtu
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py,Increment cannot be 0,Vöxtur getur ekki verið 0
@@ -1188,6 +1190,7 @@
 DocType: Activity Cost,Activity Type,virkni Type
 DocType: Request for Quotation,For individual supplier,Fyrir einstaka birgi
 DocType: BOM Operation,Base Hour Rate(Company Currency),Base Hour Rate (Company Gjaldmiðill)
+,Qty To Be Billed,Magn sem þarf að greiða
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py,Delivered Amount,Skilað Upphæð
 apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.js,Reserved Qty for Production: Raw materials quantity to make manufacturing items.,Frátekið magn til framleiðslu: Magn hráefna til að framleiða hluti.
 DocType: Loyalty Point Entry Redemption,Redemption Date,Innlausnardagur
@@ -1306,7 +1309,7 @@
 DocType: Sales Invoice,Commission Rate (%),Þóknun Rate (%)
 apps/erpnext/erpnext/education/doctype/student_group/student_group.py,Please select Program,Vinsamlegast veldu Forrit
 DocType: Project,Estimated Cost,áætlaður kostnaður
-DocType: Request for Quotation,Link to material requests,Tengill á efni beiðna
+DocType: Supplier Quotation,Link to material requests,Tengill á efni beiðna
 apps/erpnext/erpnext/public/js/hub/pages/Publish.vue,Publish,Birta
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py,Aerospace,Aerospace
 ,Fichier des Ecritures Comptables [FEC],Fichier des Ecritures Comptables [FEC]
@@ -1319,6 +1322,7 @@
 apps/erpnext/erpnext/utilities/transaction_base.py,Invalid Posting Time,Ógildur póstur
 DocType: Salary Component,Condition and Formula,Ástand og formúla
 DocType: Lead,Campaign Name,Heiti herferðar
+apps/erpnext/erpnext/setup/default_energy_point_rules.py,On Task Completion,Í lok verkefnis
 apps/erpnext/erpnext/hr/doctype/compensatory_leave_request/compensatory_leave_request.py,There is no leave period in between {0} and {1},Engin leyfi er á milli {0} og {1}
 DocType: Fee Validity,Healthcare Practitioner,Heilbrigðisstarfsmaður
 DocType: Hotel Room,Capacity,Stærð
@@ -1663,7 +1667,6 @@
 DocType: Quality Feedback Template,Quality Feedback Template,Sniðmát fyrir gæði gæða
 apps/erpnext/erpnext/config/education.py,LMS Activity,LMS virkni
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py,Internet Publishing,internet Publishing
-DocType: Prescription Duration,Number,Númer
 apps/erpnext/erpnext/accounts/doctype/opening_invoice_creation_tool/opening_invoice_creation_tool.js,Creating {0} Invoice,Búa til {0} Reikningur
 DocType: Medical Code,Medical Code Standard,Læknisfræðileg staðal
 DocType: Soil Texture,Clay Composition (%),Leir Samsetning (%)
@@ -1738,6 +1741,7 @@
 DocType: Support Settings,Get Started Sections,Byrjaðu kafla
 DocType: Lead,CRM-LEAD-.YYYY.-,CRM-LEAD-.YYYY.-
 DocType: Invoice Discounting,Sanctioned,bundnar
+,Base Amount,Grunnmagn
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.js,Total Contribution Amount: {0},Samtals Framlagsmagn: {0}
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py,Row #{0}: Please specify Serial No for Item {1},Row # {0}: Vinsamlegast tilgreinið Serial Nei fyrir lið {1}
 DocType: Payroll Entry,Salary Slips Submitted,Launasamningar lögð fram
@@ -1955,6 +1959,7 @@
 apps/erpnext/erpnext/utilities/user_progress.py,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.
 DocType: Accounting Dimension,Dimension Defaults,Vanskil víddar
 apps/erpnext/erpnext/crm/report/prospects_engaged_but_not_converted/prospects_engaged_but_not_converted.js,Minimum Lead Age (Days),Lágmarksstigleiki (dagar)
+apps/erpnext/erpnext/assets/report/fixed_asset_register/fixed_asset_register.py,Available For Use Date,Laus til notkunar dagsetningar
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py,All BOMs,Allir BOMs
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js,Create Inter Company Journal Entry,Búðu til færslu Inter Company Journal
 DocType: Company,Parent Company,Móðurfélag
@@ -2019,6 +2024,7 @@
 ,IRS 1099,IRS 1099
 DocType: Salary Slip,Leave Without Pay,Leyfi án launa
 DocType: Payment Request,Outward,Utan
+apps/erpnext/erpnext/setup/default_energy_point_rules.py,On {0} Creation,Í {0} sköpun
 apps/erpnext/erpnext/regional/doctype/gstr_3b_report/gstr_3b_report.html,State/UT Tax,Ríki / UT skattur
 ,Trial Balance for Party,Trial Balance fyrir aðila
 ,Gross and Net Profit Report,Hagnaður og hagnaður
@@ -2134,6 +2140,7 @@
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js,Make Stock Entry,Gerðu hlutabréfafærslu
 DocType: Hotel Room Reservation,Hotel Reservation User,Hotel Reservation User
 apps/erpnext/erpnext/projects/doctype/project/project.js,Set Status,Stilla stöðu
+apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py,Please setup numbering series for Attendance via Setup &gt; Numbering Series,Vinsamlegast settu upp númeraröð fyrir mætingu með uppsetningu&gt; Númeraröð
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py,Please select prefix first,Vinsamlegast veldu forskeyti fyrst
 DocType: Contract,Fulfilment Deadline,Uppfyllingardagur
 apps/erpnext/erpnext/public/js/hub/pages/Home.vue,Near you,Nálægt þér
@@ -2149,6 +2156,7 @@
 DocType: Announcement,All Students,Allir nemendur
 apps/erpnext/erpnext/assets/doctype/asset/asset.py,Item {0} must be a non-stock item,Liður {0} verður að a non-birgðir atriði
 apps/erpnext/erpnext/stock/doctype/batch/batch.js,View Ledger,Skoða Ledger
+DocType: Cost Center,Lft,Lft
 DocType: Grading Scale,Intervals,millibili
 DocType: Bank Statement Transaction Entry,Reconciled Transactions,Samræmd viðskipti
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py,Earliest,elstu
@@ -2264,6 +2272,7 @@
 apps/erpnext/erpnext/hr/doctype/employee_benefit_application/employee_benefit_application.py,As per your assigned Salary Structure you cannot apply for benefits,Eins og á úthlutað launasamningi þínum er ekki hægt að sækja um bætur
 apps/erpnext/erpnext/stock/doctype/item/item.py,Website Image should be a public file or website URL,Vefsíða Image ætti að vera opinber skrá eða vefslóð
 DocType: Purchase Invoice Item,BOM,BOM
+apps/erpnext/erpnext/stock/doctype/item/item.py,Duplicate entry in Manufacturers table,Afrita færslu í töflu framleiðenda
 apps/erpnext/erpnext/setup/doctype/item_group/item_group.js,This is a root item group and cannot be edited.,Þetta er rót atriði hóp og ekki hægt að breyta.
 apps/erpnext/erpnext/accounts/doctype/account/account.js,Merge,Sameina
 DocType: Journal Entry Account,Purchase Order,Pöntun
@@ -2408,7 +2417,6 @@
 DocType: Asset,Depreciation Schedules,afskriftir Skrár
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.js,Create Sales Invoice,Búa til sölureikning
 apps/erpnext/erpnext/regional/doctype/gstr_3b_report/gstr_3b_report.html,Ineligible ITC,Óhæfur ITC
-apps/erpnext/erpnext/erpnext_integrations/doctype/shopify_settings/shopify_settings.py,"Support for public app is deprecated. Please setup private app, for more details refer user manual","Stuðningur við opinbera forritið er úr gildi. Vinsamlegast settu upp einkaforrit, til að fá frekari upplýsingar, sjáðu notendahandbók"
 DocType: Task,Dependent Tasks,Ósjálfstætt verkefni
 apps/erpnext/erpnext/regional/report/gstr_1/gstr_1.py,Following accounts might be selected in GST Settings:,Eftirfarandi reikningar gætu verið valin í GST stillingum:
 apps/erpnext/erpnext/manufacturing/report/bom_stock_report/bom_stock_report.js,Quantity to Produce,Magn til að framleiða
@@ -2660,6 +2668,7 @@
 DocType: Water Analysis,Container,Ílát
 apps/erpnext/erpnext/regional/report/gstr_1/gstr_1.py,Please set valid GSTIN No. in Company Address,Vinsamlegast stillið gilt GSTIN nr í heimilisfang fyrirtækisins
 apps/erpnext/erpnext/education/utils.py,Student {0} - {1} appears Multiple times in row {2} & {3},Student {0} - {1} birtist mörgum sinnum á röð {2} &amp; {3}
+apps/erpnext/erpnext/selling/doctype/customer/customer.py,Following fields are mandatory to create address:,Eftirfarandi reiti er skylt að búa til heimilisfang:
 DocType: Item Alternative,Two-way,Tveir-vegur
 DocType: Item,Manufacturers,Framleiðendur
 apps/erpnext/erpnext/accounts/deferred_revenue.py,Error while processing deferred accounting for {0},Villa við vinnslu frestaðs bókhalds fyrir {0}
@@ -2734,9 +2743,9 @@
 DocType: Employee,HR-EMP-,HR-EMP-
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py,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: Quality Meeting Minutes,Quality Meeting Minutes,Fundargerðir gæða fundar
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Supplier &gt; Supplier Type,Birgir&gt; Gerð birgis
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py,Employee Referral,Tilvísun starfsmanna
 DocType: Student Group,Set 0 for no limit,Setja 0. engin takmörk
+DocType: Cost Center,rgt,rgt
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py,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.
 DocType: Customer,Primary Address and Contact Detail,Aðal heimilisfang og tengiliðaval
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.js,Resend Payment Email,Endursenda Greiðsla tölvupóst
@@ -2846,7 +2855,6 @@
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py,Against Supplier Invoice {0} dated {1},Gegn Birgir Invoice {0} dagsett {1}
 DocType: Customer,Default Price List,Sjálfgefið Verðskrá
 apps/erpnext/erpnext/assets/doctype/asset/asset.py,Asset Movement record {0} created,Eignastýring Hreyfing met {0} búin
-apps/erpnext/erpnext/utilities/page/leaderboard/leaderboard.js,No items found.,Engar vörur fundust.
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py,You cannot delete Fiscal Year {0}. Fiscal Year {0} is set as default in Global Settings,Þú getur ekki eytt Fiscal Year {0}. Reikningsár {0} er sett sem sjálfgefið í Global Settings
 DocType: Share Transfer,Equity/Liability Account,Eigið / ábyrgðareikningur
 apps/erpnext/erpnext/setup/doctype/customer_group/customer_group.py,A customer with the same name already exists,Viðskiptavinur með sama nafni er þegar til
@@ -2862,6 +2870,7 @@
 apps/erpnext/erpnext/selling/doctype/customer/customer.py,Credit limit has been crossed for customer {0} ({1}/{2}),Lánshæfismat hefur verið farið fyrir viðskiptavininn {0} ({1} / {2})
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py,Customer required for 'Customerwise Discount',Viðskiptavinur þarf að &#39;Customerwise Afsláttur&#39;
 apps/erpnext/erpnext/config/accounting.py,Update bank payment dates with journals.,Uppfæra banka greiðslu dagsetningar með tímaritum.
+,Billed Qty,Innheimt magn
 apps/erpnext/erpnext/stock/doctype/item/item_dashboard.py,Pricing,verðlagning
 DocType: Employee,Attendance Device ID (Biometric/RF tag ID),Auðkenni aðsóknartækja (líffræðileg tölfræðileg / RF merki)
 DocType: Quotation,Term Details,Term Upplýsingar
@@ -2883,6 +2892,7 @@
 DocType: Share Transfer,Asset Account,Eignareikningur
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js,New release date should be in the future,Nýr útgáfudagur ætti að vera í framtíðinni
 DocType: Purchase Invoice,End date of current invoice's period,Lokadagur tímabils núverandi reikningi er
+apps/erpnext/erpnext/hr/doctype/employee/employee.py,Please setup Employee Naming System in Human Resource &gt; HR Settings,Vinsamlegast settu upp nafnakerfi starfsmanna í mannauði&gt; HR stillingar
 DocType: Lab Test,Technician Name,Nafn tæknimanns
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py,"Cannot ensure delivery by Serial No as \
 					Item {0} is added with and without Ensure Delivery by \
@@ -2890,6 +2900,7 @@
 DocType: Accounts Settings,Unlink Payment on Cancellation of Invoice,Aftengja greiðsla á niðurfellingar Invoice
 DocType: Bank Reconciliation,From Date,frá Dagsetning
 apps/erpnext/erpnext/hr/doctype/vehicle_log/vehicle_log.py,Current Odometer reading entered should be greater than initial Vehicle Odometer {0},Núverandi kílómetramæli lestur inn ætti að vera hærri en upphaflega Ökutæki Kílómetrastaða {0}
+,Purchase Order Items To Be Received or Billed,Innkaupapöntunarhlutir sem berast eða innheimtir
 DocType: Restaurant Reservation,No Show,Engin sýning
 apps/erpnext/erpnext/regional/india/utils.py,You must be a registered supplier to generate e-Way Bill,Þú verður að vera skráður birgir til að búa til e-Way Bill
 DocType: Shipping Rule Country,Shipping Rule Country,Sendingar Regla Country
@@ -2932,6 +2943,7 @@
 apps/erpnext/erpnext/templates/generators/item/item_add_to_cart.html,View in Cart,Skoða í körfu
 DocType: Employee Checkin,Shift Actual Start,Vaktu raunverulega byrjun
 DocType: Tally Migration,Is Day Book Data Imported,Er dagbókargögn flutt inn
+,Purchase Order Items To Be Received or Billed1,Innkaupapöntunarhlutir sem berast eða greiðast1
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py,Marketing Expenses,markaðskostnaður
 apps/erpnext/erpnext/stock/doctype/pick_list/pick_list.py,{0} units of {1} is not available.,{0} einingar af {1} eru ekki tiltækar.
 ,Item Shortage Report,Liður Skortur Report
@@ -3156,7 +3168,6 @@
 apps/erpnext/erpnext/public/js/call_popup/call_popup.js,View all issues from {0},Skoða öll mál frá {0}
 DocType: Quality Inspection,MAT-QA-.YYYY.-,MAT-QA-.YYYY.-
 DocType: Quality Meeting Table,Quality Meeting Table,Gæðafundarborð
-apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,Vinsamlegast stilltu Naming Series fyrir {0} með Setup&gt; Settings&gt; Naming Series
 apps/erpnext/erpnext/templates/pages/help.html,Visit the forums,Heimsókn á umræðunum
 DocType: Student,Student Mobile Number,Student Mobile Number
 DocType: Item,Has Variants,hefur Afbrigði
@@ -3298,6 +3309,7 @@
 DocType: Homepage Section,Section Cards,Hlutakort
 ,Campaign Efficiency,Virkni herferðar
 DocType: Discussion,Discussion,umræða
+apps/erpnext/erpnext/setup/default_energy_point_rules.py,On Sales Order Submission,Í afhendingu sölupöntunar
 DocType: Bank Transaction,Transaction ID,Færsla ID
 DocType: Payroll Entry,Deduct Tax For Unsubmitted Tax Exemption Proof,Tregðu skatt vegna óskráðs skattfrelsis
 DocType: Volunteer,Anytime,Hvenær sem er
@@ -3305,7 +3317,6 @@
 DocType: Employee Tax Exemption Proof Submission,Employee Tax Exemption Proof Submission,Skattfrelsi frá starfsmanni
 DocType: Patient,Surgical History,Skurðaðgerðarsaga
 DocType: Bank Statement Settings Item,Mapped Header,Mapped Header
-apps/erpnext/erpnext/hr/doctype/employee/employee.py,Please setup Employee Naming System in Human Resource &gt; HR Settings,Vinsamlegast settu upp nafnakerfi starfsmanna í mannauð&gt; HR stillingar
 DocType: Employee,Resignation Letter Date,Störfum Letter Dagsetning
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Pricing Rules are further filtered based on quantity.,Verðlagning Reglurnar eru frekar síuð miðað við magn.
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py,Please set the Date Of Joining for employee {0},Vinsamlegast settu Dagsetning Tengingar fyrir starfsmann {0}
@@ -3319,6 +3330,7 @@
 DocType: Bank Statement Settings,Mapped Items,Mapped Items
 DocType: Amazon MWS Settings,IT,ÞAÐ
 DocType: Chapter,Chapter,Kafli
+,Fixed Asset Register,Fast eignaskrá
 apps/erpnext/erpnext/utilities/user_progress.py,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,Select BOM and Qty for Production,Veldu BOM og Magn fyrir framleiðslu
@@ -3454,7 +3466,6 @@
 apps/erpnext/erpnext/templates/emails/reorder_item.html,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
 apps/erpnext/erpnext/controllers/accounts_controller.py,Account {0} is invalid. Account Currency must be {1},Reikningur {0} er ógild. Reikningur Gjaldmiðill verður að vera {1}
 apps/erpnext/erpnext/hr/doctype/salary_structure_assignment/salary_structure_assignment.py,From Date {0} cannot be after employee's relieving Date {1},Frá degi {0} er ekki hægt að losa starfsmanninn dagsetningu {1}
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py,Debit Note {0} has been created automatically,Debet athugasemd {0} hefur verið gerð sjálfkrafa
 apps/erpnext/erpnext/accounts/doctype/payment_order/payment_order.js,Create Payment Entries,Búðu til greiðslufærslur
 DocType: Supplier,Is Internal Supplier,Er innri birgir
 DocType: Employee,Create User Permission,Búðu til notendaleyfi
@@ -4013,7 +4024,6 @@
 DocType: Project User,Project Status,Project Status
 DocType: UOM,Check this to disallow fractions. (for Nos),Hakaðu við þetta til að banna broti. (NOS)
 DocType: Student Admission Program,Naming Series (for Student Applicant),Nafngiftir Series (fyrir námsmanna umsækjanda)
-apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.py,UOM Conversion factor ({0} -&gt; {1}) not found for item: {2},UOM viðskiptaþáttur ({0} -&gt; {1}) fannst ekki fyrir hlutinn: {2}
 apps/erpnext/erpnext/hr/doctype/retention_bonus/retention_bonus.py,Bonus Payment Date cannot be a past date,Bónus Greiðsludagur getur ekki verið síðasta dagsetning
 DocType: Travel Request,Copy of Invitation/Announcement,Afrit af boðskorti / tilkynningu
 DocType: Practitioner Service Unit Schedule,Practitioner Service Unit Schedule,Hagnýtar þjónustudeildaráætlun
@@ -4161,6 +4171,7 @@
 apps/erpnext/erpnext/utilities/user_progress.py,Setup Company,Uppsetningarfyrirtæki
 ,Lab Test Report,Lab Test Report
 DocType: Employee Benefit Application,Employee Benefit Application,Umsóknarfrestur starfsmanna
+apps/erpnext/erpnext/accounts/doctype/invoice_discounting/invoice_discounting.py,Row({0}): {1} is already discounted in {2},Röð ({0}): {1} er nú þegar afsláttur af {2}
 apps/erpnext/erpnext/hr/doctype/additional_salary/additional_salary.py,Additional Salary Component Exists.,Viðbótarupplýsingar um launahluta eru til.
 DocType: Purchase Invoice,Unregistered,Óskráður
 DocType: Student Applicant,Application Date,Umsókn Dagsetning
@@ -4239,7 +4250,6 @@
 DocType: Journal Entry,Accounting Entries,Bókhalds Færslur
 DocType: Job Card Time Log,Job Card Time Log,Tímaskrá yfir starfskort
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,"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."
-apps/erpnext/erpnext/education/doctype/instructor/instructor.py,Please setup Instructor Naming System in Education &gt; Education Settings,Vinsamlegast settu upp kennslukerfi fyrir kennara í menntun&gt; Menntunarstillingar
 DocType: Journal Entry,Paid Loan,Greiddur lán
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py,Duplicate Entry. Please check Authorization Rule {0},Afrit Entry. Vinsamlegast athugaðu Heimild Rule {0}
 DocType: Journal Entry Account,Reference Due Date,Tilvísunardagsetning
@@ -4256,7 +4266,6 @@
 apps/erpnext/erpnext/templates/pages/projects.html,No time sheets,Enginn tími blöð
 DocType: GoCardless Mandate,GoCardless Customer,GoCardless viðskiptavinur
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py,Leave Type {0} cannot be carry-forwarded,Skildu Tegund {0} Ekki er hægt að bera-send
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Item Code &gt; Item Group &gt; Brand,Atriðakóði&gt; Vöruflokkur&gt; Vörumerki
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py,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
 DocType: Leave Encashment,Payroll,launaskrá
@@ -4371,7 +4380,6 @@
 DocType: Stock Ledger Entry,Actual Qty After Transaction,Raunveruleg Magn eftir viðskipti
 ,Pending SO Items For Purchase Request,Bíður SO Hlutir til kaupa Beiðni
 apps/erpnext/erpnext/education/doctype/student_admission/student_admission.py,Student Admissions,Student Innlagnir
-apps/erpnext/erpnext/accounts/party.py,{0} {1} is disabled,{0} {1} er óvirk
 DocType: Supplier,Billing Currency,Innheimta Gjaldmiðill
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py,Extra Large,Auka stór
 DocType: Loan,Loan Application,Lán umsókn
@@ -4448,7 +4456,6 @@
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py,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/accounts/doctype/accounting_dimension/accounting_dimension.py,Creating Dimensions...,Býr til víddir ...
 apps/erpnext/erpnext/education/doctype/student_group_creation_tool/student_group_creation_tool.py,Student Group Name is mandatory in row {0},Student Group Name er skylda í röð {0}
-DocType: Customer Credit Limit,Bypass credit limit_check,Framhjá lánamörkum
 DocType: Homepage,Products to be shown on website homepage,Vörur birtist á heimasíðu heimasíðuna
 DocType: HR Settings,Password Policy,Lykilorðastefna
 apps/erpnext/erpnext/setup/doctype/customer_group/customer_group.js,This is a root customer group and cannot be edited.,Þetta er rót viðskiptavinur hóp og ekki hægt að breyta.
@@ -4740,6 +4747,7 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py,Row {0}: Advance against Customer must be credit,Row {0}: Advance gegn Viðskiptavinur verður að vera trúnaður
 DocType: Quality Meeting,Quality Meeting,Gæðafundur
 apps/erpnext/erpnext/accounts/doctype/account/account.js,Non-Group to Group,Non-Group til Group
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,Vinsamlegast stilltu Naming Series fyrir {0} með Setup&gt; Settings&gt; Naming Series
 DocType: Employee,ERPNext User,ERPNext User
 apps/erpnext/erpnext/education/doctype/student_group_creation_tool/student_group_creation_tool.py,Batch is mandatory in row {0},Hópur er nauðsynlegur í röð {0}
 DocType: Company,Default Buying Terms,Sjálfgefnir kaupsskilmálar
@@ -5034,6 +5042,7 @@
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py,No {0} found for Inter Company Transactions.,Engin {0} fundust fyrir millifærsluviðskipti.
 DocType: Travel Itinerary,Rented Car,Leigðu bíl
 apps/erpnext/erpnext/public/js/hub/components/profile_dialog.js,About your Company,Um fyrirtækið þitt
+apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.js,Show Stock Ageing Data,Sýna gögn um öldrun hlutabréfa
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py,Credit To account must be a Balance Sheet account,Inneign á reikninginn verður að vera Efnahagur reikning
 DocType: Donor,Donor,Gjafa
 DocType: Global Defaults,Disable In Words,Slökkva á í orðum
@@ -5048,8 +5057,10 @@
 DocType: Practitioner Schedule,Schedule Name,Stundaskrá Nafn
 apps/erpnext/erpnext/regional/doctype/gstr_3b_report/gstr_3b_report.py,Please enter GSTIN and state for the Company Address {0},Vinsamlegast sláðu inn GSTIN og gefðu upp heimilisfang fyrirtækisins {0}
 DocType: Currency Exchange,For Buying,Til kaupa
+apps/erpnext/erpnext/setup/default_energy_point_rules.py,On Purchase Order Submission,Við afhendingu innkaupapöntunar
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js,Add All Suppliers,Bæta við öllum birgjum
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py,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/accounts/doctype/pricing_rule/pricing_rule.js,Customer &gt; Customer Group &gt; Territory,Viðskiptavinur&gt; viðskiptavinahópur&gt; landsvæði
 DocType: Tally Migration,Parties,Teiti
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js,Browse BOM,Fletta BOM
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py,Secured Loans,Veðlán
@@ -5081,6 +5092,7 @@
 apps/erpnext/erpnext/stock/doctype/item_alternative/item_alternative.py,Not allow to set alternative item for the item {0},Ekki leyfa að setja aðra hluti fyrir hlutinn {0}
 apps/erpnext/erpnext/hr/doctype/leave_block_list/leave_block_list.py,Date is repeated,Dagsetning er endurtekin
 apps/erpnext/erpnext/accounts/print_format/payment_receipt_voucher/payment_receipt_voucher.html,Authorized Signatory,Leyft Undirritaður
+apps/erpnext/erpnext/education/doctype/instructor/instructor.py,Please setup Instructor Naming System in Education &gt; Education Settings,Vinsamlegast settu upp kennslukerfi fyrir kennara í menntun&gt; Menntunarstillingar
 apps/erpnext/erpnext/regional/doctype/gstr_3b_report/gstr_3b_report.html,Net ITC Available(A) - (B),Net ITC í boði (A) - (B)
 apps/erpnext/erpnext/education/doctype/fee_schedule/fee_schedule.js,Create Fees,Búðu til gjöld
 DocType: Project,Total Purchase Cost (via Purchase Invoice),Total Kaup Kostnaður (í gegnum kaupa Reikningar)
@@ -5101,6 +5113,7 @@
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.js,Message Sent,skilaboð send
 apps/erpnext/erpnext/accounts/doctype/account/account.py,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/assets/report/fixed_asset_register/fixed_asset_register.py,Vendor Name,Nafn seljanda
 DocType: Quiz Result,Wrong,Rangt
 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)
@@ -5344,6 +5357,7 @@
 DocType: Stock Settings,Auto Material Request,Auto Efni Beiðni
 DocType: Woocommerce Settings,API consumer secret,API neytenda leyndarmál
 DocType: Delivery Note Item,Available Batch Qty at From Warehouse,Laus Hópur Magn á frá vöruhúsi
+,Received Qty Amount,Móttekið magn fjárhæðar
 DocType: Salary Slip,Gross Pay - Total Deduction - Loan Repayment,Gross Pay - Total Frádráttur - Lán Endurgreiðsla
 DocType: Bank Account,Last Integration Date,Síðasti samþættingardagur
 DocType: Expense Claim,Expense Taxes and Charges,Gjalda skatta og gjöld
@@ -5802,6 +5816,8 @@
 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,Please select Qty against item {0},Vinsamlegast veldu Magn á hlut {0}
+apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py,Latest Age,Síðasta aldur
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js,Transfer Material to Supplier,Flytja efni til birgis
 apps/erpnext/erpnext/hr/report/loan_repayment/loan_repayment.py,EMI,EMI
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py,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
@@ -5825,7 +5841,6 @@
 apps/erpnext/erpnext/hr/doctype/employee_benefit_application/employee_benefit_application.py,"An amount of {0} already claimed for the component {1},\
 						 set the amount equal or greater than {2}","Magn {0} sem þegar er krafist fyrir hluti {1}, \ stilla magnið sem er jafnt eða stærra en {2}"
 DocType: Shipping Rule,Shipping Rule Conditions,Shipping regla Skilyrði
-DocType: Purchase Invoice,Export Type,Útflutningsgerð
 DocType: Salary Slip Loan,Salary Slip Loan,Launasala
 DocType: BOM Update Tool,The new BOM after replacement,Hin nýja BOM eftir skipti
 ,Point of Sale,Sölustaður
@@ -5945,7 +5960,6 @@
 DocType: Purchase Order Item,Blanket Order Rate,Teppisverð fyrir teppi
 ,Customer Ledger Summary,Yfirlit viðskiptavinarbókar
 apps/erpnext/erpnext/hooks.py,Certification,Vottun
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js,Are you sure you want to make debit note?,Ertu viss um að þú viljir gera debet athugasemd?
 DocType: Bank Guarantee,Clauses and Conditions,Skilmálar og skilyrði
 DocType: Serial No,Creation Document Type,Creation Document Type
 DocType: Amazon MWS Settings,ES,ES
@@ -5983,8 +5997,6 @@
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py,Financial Services,Financial Services
 DocType: Student Sibling,Student ID,Student ID
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.js,For Quantity must be greater than zero,Fyrir Magn verður að vera meiri en núll
-apps/erpnext/erpnext/hr/doctype/employee_transfer/employee_transfer.py,"Please delete the Employee <a href=""#Form/Employee/{0}"">{0}</a>\
-					to cancel this document","Vinsamlegast eytt starfsmanninum <a href=""#Form/Employee/{0}"">{0}</a> \ til að hætta við þetta skjal"
 apps/erpnext/erpnext/config/projects.py,Types of activities for Time Logs,Tegundir starfsemi fyrir Time Logs
 DocType: Opening Invoice Creation Tool,Sales,velta
 DocType: Stock Entry Detail,Basic Amount,grunnfjárhæð
@@ -6063,6 +6075,7 @@
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py,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,Send Supplier Emails,Senda Birgir póst
+DocType: Asset Movement,ACC-ASM-.YYYY.-,ACC-ASM-.ÁÁÁÁ.-
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py,"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
 apps/erpnext/erpnext/hr/doctype/employee_onboarding/employee_onboarding.py,Submit this to create the Employee record,Sendu inn þetta til að búa til starfsmannaskrá
@@ -6140,7 +6153,6 @@
 DocType: Sales Team,Contact No.,Viltu samband við No.
 apps/erpnext/erpnext/templates/includes/cart/cart_address.html,Billing Address is same as Shipping Address,Innheimtu heimilisfang er það sama og póstfang
 DocType: Bank Reconciliation,Payment Entries,Greiðsla Entries
-apps/erpnext/erpnext/erpnext_integrations/doctype/shopify_settings/shopify_settings.py,Access token or Shopify URL missing,Aðgangseinkenni eða Shopify URL vantar
 DocType: Location,Latitude,Breidd
 DocType: Work Order,Scrap Warehouse,rusl Warehouse
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py,"Warehouse required at Row No {0}, please set default warehouse for the item {1} for the company {2}","Vöruhús krafist á röð nr. {0}, vinsamlegast stilltu sjálfgefið vörugeymsla fyrir hlutinn {1} fyrir fyrirtækið {2}"
@@ -6183,7 +6195,6 @@
 DocType: Job Offer Term,Value / Description,Gildi / Lýsing
 apps/erpnext/erpnext/controllers/accounts_controller.py,"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
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js,Are you sure you want to make credit note?,Ertu viss um að þú viljir gera kreditbréf?
 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,Debit and Credit not equal for {0} #{1}. Difference is {2}.,Greiðslu- ekki jafnir fyrir {0} # {1}. Munurinn er {2}.
@@ -6308,6 +6319,7 @@
 DocType: Purchase Invoice,Taxes and Charges Added,Skattar og gjöld bætt
 apps/erpnext/erpnext/assets/doctype/asset/asset.py,Depreciation Row {0}: Next Depreciation Date cannot be before Available-for-use Date,Afskriftir Rauða {0}: Næsta Afskriftir Dagsetning má ekki vera fyrr en hægt er að nota Dagsetning
 ,Sales Funnel,velta trekt
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Item Code &gt; Item Group &gt; Brand,Atriðakóði&gt; Vöruflokkur&gt; Vörumerki
 apps/erpnext/erpnext/setup/doctype/company/company.py,Abbreviation is mandatory,Skammstöfun er nauðsynlegur
 DocType: Project,Task Progress,verkefni Progress
 apps/erpnext/erpnext/templates/includes/navbar/navbar_items.html,Cart,Körfu
@@ -6551,6 +6563,7 @@
 DocType: Employee Grade,Employee Grade,Starfsmaður
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py,Piecework,ákvæðisvinnu
 DocType: GSTR 3B Report,June,Júní
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Supplier &gt; Supplier Type,Birgir&gt; Gerð birgis
 DocType: Share Balance,From No,Frá nr
 DocType: Shift Type,Early Exit Grace Period,Náðartímabil snemma útgöngu
 DocType: Task,Actual Time (in Hours),Tíminn (í klst)
@@ -6835,6 +6848,7 @@
 DocType: Warehouse,Warehouse Name,Warehouse Name
 DocType: Naming Series,Select Transaction,Veldu Transaction
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py,Please enter Approving Role or Approving User,Vinsamlegast sláðu inn Samþykkir hlutverki eða samþykkir notandi
+apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.py,UOM Conversion factor ({0} -&gt; {1}) not found for item: {2},UOM viðskiptaþáttur ({0} -&gt; {1}) fannst ekki fyrir hlutinn: {2}
 apps/erpnext/erpnext/support/doctype/service_level_agreement/service_level_agreement.py,Service Level Agreement with Entity Type {0} and Entity {1} already exists.,Samningur um þjónustustig með einingategund {0} og eining {1} er þegar til.
 DocType: Journal Entry,Write Off Entry,Skrifaðu Off færslu
 DocType: BOM,Rate Of Materials Based On,Hlutfall af efni byggt á
@@ -7025,6 +7039,7 @@
 DocType: Quality Inspection Reading,Quality Inspection Reading,Quality Inspection Reading
 apps/erpnext/erpnext/stock/doctype/stock_settings/stock_settings.py,`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/stock/report/stock_balance/stock_balance.py,Earliest Age,Elstu aldur
 apps/erpnext/erpnext/utilities/user_progress.py,Set a sales goal you'd like to achieve for your company.,Settu velta markmið sem þú vilt ná fyrir fyrirtækið þitt.
 DocType: Quality Goal,Revision,Endurskoðun
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js,Healthcare Services,Heilbrigðisþjónusta
@@ -7068,6 +7083,7 @@
 apps/erpnext/erpnext/healthcare/doctype/patient_encounter/patient_encounter.js,Schedule Discharge,Áætlun losun
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py,Cheques and Deposits incorrectly cleared,Tékkar og Innlán rangt hreinsaðar
 DocType: Homepage Section Card,Homepage Section Card,Hlutasíðu heimasíðunnar
+,Amount To Be Billed,Upphæð sem þarf að innheimta
 apps/erpnext/erpnext/accounts/doctype/account/account.py,Account {0}: You can not assign itself as parent account,Reikningur {0}: Þú getur ekki framselt sig sem foreldri reikning
 DocType: Purchase Invoice Item,Price List Rate,Verðskrá Rate
 apps/erpnext/erpnext/utilities/activation.py,Create customer quotes,Búa viðskiptavina tilvitnanir
@@ -7120,6 +7136,7 @@
 DocType: Supplier Scorecard Criteria,Supplier Scorecard Criteria,Birgir Scorecard Criteria
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py,Please select Start Date and End Date for Item {0},Vinsamlegast veldu Ræsa og lokadag fyrir lið {0}
 DocType: Maintenance Schedule,MAT-MSH-.YYYY.-,MAT-MSH-.YYYY.-
+,Amount to Receive,Upphæð til að fá
 apps/erpnext/erpnext/education/doctype/student_group_creation_tool/student_group_creation_tool.py,Course is mandatory in row {0},Auðvitað er skylda í röð {0}
 apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py,From date can not be greater than than To date,Frá dagsetningu getur ekki verið meira en til þessa
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py,To date cannot be before from date,Hingað til er ekki hægt að áður frá dagsetningu
@@ -7367,7 +7384,6 @@
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js,BOM and Manufacturing Quantity are required,BOM og framleiðsla Magn þarf
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js,Ageing Range 2,Ageing Range 2
 DocType: SG Creation Tool Course,Max Strength,max Strength
-apps/erpnext/erpnext/accounts/doctype/account/account.py,"Account {0} already exists in child company {1}. The following fields have different values, they should be same:<ul><li>{2}</li></ul>","Reikningur {0} er þegar til hjá barnafyrirtækinu {1}. Eftirfarandi reitir hafa mismunandi gildi, þeir ættu að vera eins: <ul><li> {2} </li></ul>"
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py,Installing presets,Uppsetning forstillingar
 DocType: Fee Schedule,EDU-FSH-.YYYY.-,EDU-FSH-.YYYY.-
 apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js,No Delivery Note selected for Customer {},Engin afhendingartilkynning valin fyrir viðskiptavini {}
@@ -7575,6 +7591,7 @@
 DocType: Delivery Note,Print Without Amount,Prenta Án Upphæð
 apps/erpnext/erpnext/accounts/report/asset_depreciation_ledger/asset_depreciation_ledger.py,Depreciation Date,Afskriftir Dagsetning
 ,Work Orders in Progress,Vinna Pantanir í gangi
+DocType: Customer Credit Limit,Bypass Credit Limit Check,Hliðarbraut á lánamörkum
 DocType: Issue,Support Team,Stuðningur Team
 apps/erpnext/erpnext/stock/report/batch_item_expiry_status/batch_item_expiry_status.py,Expiry (In Days),Fyrning (í dögum)
 DocType: Appraisal,Total Score (Out of 5),Total Score (af 5)
@@ -7758,6 +7775,7 @@
 DocType: Sales Invoice,Customer GSTIN,Viðskiptavinur GSTIN
 DocType: Crop Cycle,List of diseases detected on the field. When selected it'll automatically add a list of tasks to deal with the disease ,Listi yfir sjúkdóma sem finnast á þessu sviði. Þegar það er valið mun það bæta sjálfkrafa lista yfir verkefni til að takast á við sjúkdóminn
 apps/erpnext/erpnext/manufacturing/page/bom_comparison_tool/bom_comparison_tool.js,BOM 1,BOM 1
+apps/erpnext/erpnext/assets/report/fixed_asset_register/fixed_asset_register.py,Asset Id,Auðkenni eigna
 apps/erpnext/erpnext/healthcare/doctype/healthcare_service_unit/healthcare_service_unit.js,This is a root healthcare service unit and cannot be edited.,Þetta er rót heilbrigðisþjónustudeild og er ekki hægt að breyta.
 DocType: Asset Repair,Repair Status,Viðgerðarstaða
 apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.js,"Requested Qty: Quantity requested for purchase, but not ordered.","Umbeðin magn: Magn sem óskað er eftir að kaupa, en ekki pantað."
diff --git a/erpnext/translations/it.csv b/erpnext/translations/it.csv
index 6095a53..f4ff5ef 100644
--- a/erpnext/translations/it.csv
+++ b/erpnext/translations/it.csv
@@ -289,7 +289,6 @@
 DocType: Loan,Repay Over Number of Periods,Rimborsare corso Numero di periodi
 apps/erpnext/erpnext/manufacturing/report/bom_stock_report/bom_stock_report.py,Quantity to Produce can not be less than Zero,La quantità da produrre non può essere inferiore a zero
 DocType: Stock Entry,Additional Costs,Costi aggiuntivi
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Customer &gt; Customer Group &gt; Territory,Cliente&gt; Gruppo di clienti&gt; Territorio
 apps/erpnext/erpnext/accounts/doctype/account/account.py,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
@@ -586,6 +585,7 @@
 DocType: Healthcare Settings,Create documents for sample collection,Crea documenti per la raccolta di campioni
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py,Payment against {0} {1} cannot be greater than Outstanding Amount {2},Il pagamento contro {0} {1} non può essere maggiore dell'importo dovuto {2}
 apps/erpnext/erpnext/patches/v11_0/add_healthcare_service_unit_tree_root.py,All Healthcare Service Units,Tutte le unità di assistenza sanitaria
+apps/erpnext/erpnext/setup/default_energy_point_rules.py,On Converting Opportunity,Sulla conversione di opportunità
 DocType: Bank Account,Address HTML,Indirizzo HTML
 DocType: Lead,Mobile No.,Num. Cellulare
 apps/erpnext/erpnext/selling/doctype/pos_closing_voucher/closing_voucher_details.html,Mode of Payments,Modalità di pagamento
@@ -650,7 +650,6 @@
 DocType: Accounting Dimension,Dimension Name,Nome dimensione
 apps/erpnext/erpnext/healthcare/setup.py,Resistant,Resistente
 apps/erpnext/erpnext/hotels/doctype/hotel_room_reservation/hotel_room_reservation.py,Please set Hotel Room Rate on {},Si prega di impostare la tariffa della camera dell&#39;hotel su {}
-apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py,Please setup numbering series for Attendance via Setup &gt; Numbering Series,Impostare le serie di numerazione per la partecipazione tramite Impostazione&gt; Serie di numerazione
 DocType: Journal Entry,Multi Currency,Multi valuta
 DocType: Bank Statement Transaction Invoice Item,Invoice Type,Tipo Fattura
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py,Valid from date must be less than valid upto date,Valido dalla data deve essere inferiore a valido fino alla data
@@ -765,6 +764,7 @@
 apps/erpnext/erpnext/accounts/page/pos/pos.js,Create a new Customer,Creare un nuovo cliente
 apps/erpnext/erpnext/non_profit/report/expiring_memberships/expiring_memberships.py,Expiring On,In scadenza
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,"If multiple Pricing Rules continue to prevail, users are asked to set Priority manually to resolve conflict.","Se più regole dei prezzi continuano a prevalere, gli utenti sono invitati a impostare manualmente la priorità per risolvere il conflitto."
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js,Purchase Return,Acquisto Ritorno
 apps/erpnext/erpnext/utilities/activation.py,Create Purchase Orders,Creare ordini d&#39;acquisto
 ,Purchase Register,Registro Acquisti
 apps/erpnext/erpnext/healthcare/doctype/patient/patient.py,Patient not found,Paziente non trovato
@@ -780,7 +780,6 @@
 DocType: Location,Area UOM,Area UOM
 apps/erpnext/erpnext/manufacturing/doctype/workstation/workstation.py,Workstation is closed on the following dates as per Holiday List: {0},Stazione di lavoro chiusa nei seguenti giorni secondo la lista delle vacanze: {0}
 apps/erpnext/erpnext/selling/page/sales_funnel/sales_funnel.py,Opportunities,Opportunità
-apps/erpnext/erpnext/www/all-products/index.html,Clear filters,Cancella filtri
 DocType: Lab Test Template,Single,Singolo
 DocType: Compensatory Leave Request,Work From Date,Lavoro dalla data
 DocType: Salary Slip,Total Loan Repayment,Totale Rimborso prestito
@@ -823,6 +822,7 @@
 DocType: Account,Old Parent,Vecchio genitore
 apps/erpnext/erpnext/education/doctype/program_enrollment_tool/program_enrollment_tool.py,Mandatory field - Academic Year,Campo obbligatorio - Anno Accademico
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py,{0} {1} is not associated with {2} {3},{0} {1} non è associato a {2} {3}
+DocType: Opportunity,Converted By,Convertito da
 apps/erpnext/erpnext/public/js/hub/components/ReviewArea.vue,You need to login as a Marketplace User before you can add any reviews.,Devi accedere come utente del marketplace prima di poter aggiungere recensioni.
 apps/erpnext/erpnext/manufacturing/doctype/job_card/job_card.py,Row {0} : Operation is required against the raw material item {1},Riga {0}: l&#39;operazione è necessaria per l&#39;articolo di materie prime {1}
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py,Please set default payable account for the company {0},Imposta il conto pagabile in default per la società {0}
@@ -848,6 +848,8 @@
 DocType: BOM,Work Order,Ordine di lavoro
 DocType: Sales Invoice,Total Qty,Totale Quantità
 apps/erpnext/erpnext/education/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py,Guardian2 Email ID,Email ID Guardian2
+apps/erpnext/erpnext/hr/doctype/employee_transfer/employee_transfer.py,"Please delete the Employee <a href=""#Form/Employee/{0}"">{0}</a>\
+					to cancel this document","Elimina il dipendente <a href=""#Form/Employee/{0}"">{0}</a> \ per annullare questo documento"
 DocType: Item,Show in Website (Variant),Show di Sito web (Variant)
 DocType: Employee,Health Concerns,Preoccupazioni per la salute
 DocType: Payroll Entry,Select Payroll Period,Seleziona Periodo Busta Paga
@@ -907,7 +909,6 @@
 DocType: Codification Table,Codification Table,Tabella di codificazione
 DocType: Timesheet Detail,Hrs,Ore
 apps/erpnext/erpnext/manufacturing/page/bom_comparison_tool/bom_comparison_tool.js,Changes in {0},Modifiche in {0}
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js,Please select Company,Selezionare prego
 DocType: Employee Skill,Employee Skill,Abilità dei dipendenti
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.js,Difference Account,account differenza
 DocType: Pricing Rule,Discount on Other Item,Sconto su altro articolo
@@ -975,6 +976,7 @@
 DocType: BOM,Operating Cost,Costo di gestione
 DocType: Crop,Produced Items,Articoli prodotti
 DocType: Bank Statement Transaction Entry,Match Transaction to Invoices,Abbina la transazione alle fatture
+apps/erpnext/erpnext/erpnext_integrations/exotel_integration.py,Error in Exotel incoming call,Errore nella chiamata in arrivo Exotel
 DocType: Sales Order Item,Gross Profit,Utile lordo
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js,Unblock Invoice,Sblocca fattura
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py,Increment cannot be 0,Incremento non può essere 0
@@ -1188,6 +1190,7 @@
 DocType: Activity Cost,Activity Type,Tipo attività
 DocType: Request for Quotation,For individual supplier,Per singolo fornitore
 DocType: BOM Operation,Base Hour Rate(Company Currency),Base Hour Rate (Società di valuta)
+,Qty To Be Billed,Quantità da fatturare
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py,Delivered Amount,Importo Consegnato
 apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.js,Reserved Qty for Production: Raw materials quantity to make manufacturing items.,Qtà riservata per la produzione: quantità di materie prime per la produzione di articoli.
 DocType: Loyalty Point Entry Redemption,Redemption Date,Data di rimborso
@@ -1306,7 +1309,7 @@
 DocType: Sales Invoice,Commission Rate (%),Tasso Commissione (%)
 apps/erpnext/erpnext/education/doctype/student_group/student_group.py,Please select Program,Seleziona Programma
 DocType: Project,Estimated Cost,Costo stimato
-DocType: Request for Quotation,Link to material requests,Collegamento alle richieste di materiale
+DocType: Supplier Quotation,Link to material requests,Collegamento alle richieste di materiale
 apps/erpnext/erpnext/public/js/hub/pages/Publish.vue,Publish,Pubblicare
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py,Aerospace,Aerospaziale
 ,Fichier des Ecritures Comptables [FEC],Fichier des Ecritures Comptables [FEC]
@@ -1319,6 +1322,7 @@
 apps/erpnext/erpnext/utilities/transaction_base.py,Invalid Posting Time,Tempo di pubblicazione non valido
 DocType: Salary Component,Condition and Formula,Condizione e Formula
 DocType: Lead,Campaign Name,Nome Campagna
+apps/erpnext/erpnext/setup/default_energy_point_rules.py,On Task Completion,Al completamento dell&#39;attività
 apps/erpnext/erpnext/hr/doctype/compensatory_leave_request/compensatory_leave_request.py,There is no leave period in between {0} and {1},Non c&#39;è periodo di ferie tra {0} e {1}
 DocType: Fee Validity,Healthcare Practitioner,Operatore sanitario
 DocType: Hotel Room,Capacity,Capacità
@@ -1682,7 +1686,6 @@
 DocType: Quality Feedback Template,Quality Feedback Template,Modello di feedback sulla qualità
 apps/erpnext/erpnext/config/education.py,LMS Activity,Attività LMS
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py,Internet Publishing,Internet Publishing
-DocType: Prescription Duration,Number,Numero
 apps/erpnext/erpnext/accounts/doctype/opening_invoice_creation_tool/opening_invoice_creation_tool.js,Creating {0} Invoice,Creazione di {0} fattura
 DocType: Medical Code,Medical Code Standard,Codice medico standard
 DocType: Soil Texture,Clay Composition (%),Composizione di argilla (%)
@@ -1757,6 +1760,7 @@
 DocType: Support Settings,Get Started Sections,Inizia sezioni
 DocType: Lead,CRM-LEAD-.YYYY.-,CRM-LEAD-.YYYY.-
 DocType: Invoice Discounting,Sanctioned,sanzionato
+,Base Amount,Importo base
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.js,Total Contribution Amount: {0},Importo totale del contributo: {0}
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py,Row #{0}: Please specify Serial No for Item {1},Row # {0}: Si prega di specificare Numero d'ordine per la voce {1}
 DocType: Payroll Entry,Salary Slips Submitted,Salary Slips Submitted
@@ -1974,6 +1978,7 @@
 apps/erpnext/erpnext/utilities/user_progress.py,List a few of your suppliers. They could be organizations or individuals.,Elencare alcuni dei vostri fornitori . Potrebbero essere società o persone fisiche
 DocType: Accounting Dimension,Dimension Defaults,Valori predefiniti
 apps/erpnext/erpnext/crm/report/prospects_engaged_but_not_converted/prospects_engaged_but_not_converted.js,Minimum Lead Age (Days),Età di piombo minima (giorni)
+apps/erpnext/erpnext/assets/report/fixed_asset_register/fixed_asset_register.py,Available For Use Date,Disponibile per l&#39;uso Data
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py,All BOMs,Tutte le Distinte Base
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js,Create Inter Company Journal Entry,Crea voce di diario interaziendale
 DocType: Company,Parent Company,Società madre
@@ -2038,6 +2043,7 @@
 ,IRS 1099,IRS 1099
 DocType: Salary Slip,Leave Without Pay,Lascia senza stipendio
 DocType: Payment Request,Outward,esterno
+apps/erpnext/erpnext/setup/default_energy_point_rules.py,On {0} Creation,Su {0} Creazione
 apps/erpnext/erpnext/regional/doctype/gstr_3b_report/gstr_3b_report.html,State/UT Tax,Imposta statale / UT
 ,Trial Balance for Party,Bilancio di verifica per Partner
 ,Gross and Net Profit Report,Rapporto sugli utili lordi e netti
@@ -2153,6 +2159,7 @@
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js,Make Stock Entry,Effettuare una registrazione di magazzino
 DocType: Hotel Room Reservation,Hotel Reservation User,Utente prenotazione hotel
 apps/erpnext/erpnext/projects/doctype/project/project.js,Set Status,Imposta stato
+apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py,Please setup numbering series for Attendance via Setup &gt; Numbering Series,Impostare le serie di numerazione per la partecipazione tramite Impostazione&gt; Serie di numerazione
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py,Please select prefix first,Si prega di selezionare il prefisso prima
 DocType: Contract,Fulfilment Deadline,Scadenza di adempimento
 apps/erpnext/erpnext/public/js/hub/pages/Home.vue,Near you,Vicino a te
@@ -2168,6 +2175,7 @@
 DocType: Announcement,All Students,Tutti gli studenti
 apps/erpnext/erpnext/assets/doctype/asset/asset.py,Item {0} must be a non-stock item,Voce {0} deve essere un elemento non-azione
 apps/erpnext/erpnext/stock/doctype/batch/batch.js,View Ledger,vista Ledger
+DocType: Cost Center,Lft,LFT
 DocType: Grading Scale,Intervals,intervalli
 DocType: Bank Statement Transaction Entry,Reconciled Transactions,Transazioni riconciliate
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py,Earliest,La prima
@@ -2283,6 +2291,7 @@
 apps/erpnext/erpnext/hr/doctype/employee_benefit_application/employee_benefit_application.py,As per your assigned Salary Structure you cannot apply for benefits,In base alla struttura retributiva assegnata non è possibile richiedere prestazioni
 apps/erpnext/erpnext/stock/doctype/item/item.py,Website Image should be a public file or website URL,Website Immagine dovrebbe essere un file o URL del sito web pubblico
 DocType: Purchase Invoice Item,BOM,Distinta Base
+apps/erpnext/erpnext/stock/doctype/item/item.py,Duplicate entry in Manufacturers table,Voce duplicata nella tabella Produttori
 apps/erpnext/erpnext/setup/doctype/item_group/item_group.js,This is a root item group and cannot be edited.,Questo è un gruppo elemento principale e non può essere modificato .
 apps/erpnext/erpnext/accounts/doctype/account/account.js,Merge,Unisci
 DocType: Journal Entry Account,Purchase Order,Ordine di acquisto
@@ -2427,7 +2436,6 @@
 DocType: Asset,Depreciation Schedules,piani di ammortamento
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.js,Create Sales Invoice,Crea fattura di vendita
 apps/erpnext/erpnext/regional/doctype/gstr_3b_report/gstr_3b_report.html,Ineligible ITC,ITC non idoneo
-apps/erpnext/erpnext/erpnext_integrations/doctype/shopify_settings/shopify_settings.py,"Support for public app is deprecated. Please setup private app, for more details refer user manual","Il supporto per l&#39;app pubblica è deprecato. Si prega di configurare l&#39;app privata, per maggiori dettagli consultare il manuale utente"
 DocType: Task,Dependent Tasks,Attività dipendenti
 apps/erpnext/erpnext/regional/report/gstr_1/gstr_1.py,Following accounts might be selected in GST Settings:,Gli account seguenti potrebbero essere selezionati nelle impostazioni GST:
 apps/erpnext/erpnext/manufacturing/report/bom_stock_report/bom_stock_report.js,Quantity to Produce,Quantità da produrre
@@ -2680,6 +2688,7 @@
 DocType: Water Analysis,Container,Contenitore
 apps/erpnext/erpnext/regional/report/gstr_1/gstr_1.py,Please set valid GSTIN No. in Company Address,Si prega di impostare il numero GSTIN valido nell&#39;indirizzo dell&#39;azienda
 apps/erpnext/erpnext/education/utils.py,Student {0} - {1} appears Multiple times in row {2} & {3},Studente {0} - {1} compare più volte nella riga {2} e {3}
+apps/erpnext/erpnext/selling/doctype/customer/customer.py,Following fields are mandatory to create address:,I seguenti campi sono obbligatori per creare l&#39;indirizzo:
 DocType: Item Alternative,Two-way,A doppio senso
 DocType: Item,Manufacturers,Produttori
 apps/erpnext/erpnext/accounts/deferred_revenue.py,Error while processing deferred accounting for {0},Errore durante l&#39;elaborazione della contabilità differita per {0}
@@ -2754,9 +2763,9 @@
 DocType: Employee,HR-EMP-,HR-EMP-
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py,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: Quality Meeting Minutes,Quality Meeting Minutes,Verbale della riunione di qualità
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Supplier &gt; Supplier Type,Fornitore&gt; Tipo di fornitore
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py,Employee Referral,Referral dei dipendenti
 DocType: Student Group,Set 0 for no limit,Impostare 0 per nessun limite
+DocType: Cost Center,rgt,rgt
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py,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.
 DocType: Customer,Primary Address and Contact Detail,Indirizzo primario e dettagli di contatto
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.js,Resend Payment Email,Invia di nuovo pagamento Email
@@ -2866,7 +2875,6 @@
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py,Against Supplier Invoice {0} dated {1},Al ricevimento della Fattura Fornitore {0} datata {1}
 DocType: Customer,Default Price List,Listino Prezzi Predefinito
 apps/erpnext/erpnext/assets/doctype/asset/asset.py,Asset Movement record {0} created,record di Asset Movimento {0} creato
-apps/erpnext/erpnext/utilities/page/leaderboard/leaderboard.js,No items found.,Nessun articolo trovato.
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py,You cannot delete Fiscal Year {0}. Fiscal Year {0} is set as default in Global Settings,Non è possibile cancellare l&#39;anno fiscale {0}. Anno fiscale {0} è impostato in modo predefinito in Impostazioni globali
 DocType: Share Transfer,Equity/Liability Account,Equity / Liability Account
 apps/erpnext/erpnext/setup/doctype/customer_group/customer_group.py,A customer with the same name already exists,Esiste già un cliente con lo stesso nome
@@ -2882,6 +2890,7 @@
 apps/erpnext/erpnext/selling/doctype/customer/customer.py,Credit limit has been crossed for customer {0} ({1}/{2}),Il limite di credito è stato superato per il cliente {0} ({1} / {2})
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py,Customer required for 'Customerwise Discount',Cliente richiesto per ' Customerwise Discount '
 apps/erpnext/erpnext/config/accounting.py,Update bank payment dates with journals.,Aggiorna le date di pagamento bancario con il Giornale.
+,Billed Qty,Qtà fatturata
 apps/erpnext/erpnext/stock/doctype/item/item_dashboard.py,Pricing,Prezzi
 DocType: Employee,Attendance Device ID (Biometric/RF tag ID),ID dispositivo presenze (ID tag biometrico / RF)
 DocType: Quotation,Term Details,Dettagli Termini
@@ -2903,6 +2912,7 @@
 DocType: Share Transfer,Asset Account,Conto cespiti
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js,New release date should be in the future,La nuova data di uscita dovrebbe essere in futuro
 DocType: Purchase Invoice,End date of current invoice's period,Data di fine del periodo di fatturazione corrente
+apps/erpnext/erpnext/hr/doctype/employee/employee.py,Please setup Employee Naming System in Human Resource &gt; HR Settings,Si prega di impostare il sistema di denominazione dei dipendenti in Risorse umane&gt; Impostazioni risorse umane
 DocType: Lab Test,Technician Name,Nome tecnico
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py,"Cannot ensure delivery by Serial No as \
 					Item {0} is added with and without Ensure Delivery by \
@@ -2910,6 +2920,7 @@
 DocType: Accounts Settings,Unlink Payment on Cancellation of Invoice,Scollegare il pagamento per la cancellazione della fattura
 DocType: Bank Reconciliation,From Date,Da Data
 apps/erpnext/erpnext/hr/doctype/vehicle_log/vehicle_log.py,Current Odometer reading entered should be greater than initial Vehicle Odometer {0},lettura corrente dell&#39;odometro inserito deve essere maggiore di contachilometri iniziale veicolo {0}
+,Purchase Order Items To Be Received or Billed,Articoli dell&#39;ordine d&#39;acquisto da ricevere o fatturare
 DocType: Restaurant Reservation,No Show,Nessuno spettacolo
 apps/erpnext/erpnext/regional/india/utils.py,You must be a registered supplier to generate e-Way Bill,Devi essere un fornitore registrato per generare la fattura elettronica
 DocType: Shipping Rule Country,Shipping Rule Country,Tipo di Spedizione per Nazione
@@ -2952,6 +2963,7 @@
 apps/erpnext/erpnext/templates/generators/item/item_add_to_cart.html,View in Cart,Vedi Carrello
 DocType: Employee Checkin,Shift Actual Start,Sposta Avvio effettivo
 DocType: Tally Migration,Is Day Book Data Imported,Vengono importati i dati del Day Book
+,Purchase Order Items To Be Received or Billed1,Articoli dell&#39;ordine d&#39;acquisto da ricevere o fatturare1
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py,Marketing Expenses,Spese di Marketing
 apps/erpnext/erpnext/stock/doctype/pick_list/pick_list.py,{0} units of {1} is not available.,{0} unità di {1} non sono disponibili.
 ,Item Shortage Report,Report Carenza Articolo
@@ -3176,7 +3188,6 @@
 apps/erpnext/erpnext/public/js/call_popup/call_popup.js,View all issues from {0},Visualizza tutti i problemi da {0}
 DocType: Quality Inspection,MAT-QA-.YYYY.-,MAT-QA-.YYYY.-
 DocType: Quality Meeting Table,Quality Meeting Table,Tavolo riunioni di qualità
-apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,Impostare Naming Series per {0} tramite Setup&gt; Impostazioni&gt; Naming Series
 apps/erpnext/erpnext/templates/pages/help.html,Visit the forums,Visita i forum
 DocType: Student,Student Mobile Number,Student Mobile Number
 DocType: Item,Has Variants,Ha varianti
@@ -3319,6 +3330,7 @@
 DocType: Homepage Section,Section Cards,Schede di sezione
 ,Campaign Efficiency,Efficienza della campagna
 DocType: Discussion,Discussion,Discussione
+apps/erpnext/erpnext/setup/default_energy_point_rules.py,On Sales Order Submission,All&#39;invio dell&#39;ordine cliente
 DocType: Bank Transaction,Transaction ID,ID transazione
 DocType: Payroll Entry,Deduct Tax For Unsubmitted Tax Exemption Proof,Tassa di deduzione per prova di esenzione fiscale non presentata
 DocType: Volunteer,Anytime,In qualsiasi momento
@@ -3326,7 +3338,6 @@
 DocType: Employee Tax Exemption Proof Submission,Employee Tax Exemption Proof Submission,Presentazione della prova di esenzione fiscale dei dipendenti
 DocType: Patient,Surgical History,Storia chirurgica
 DocType: Bank Statement Settings Item,Mapped Header,Intestazione mappata
-apps/erpnext/erpnext/hr/doctype/employee/employee.py,Please setup Employee Naming System in Human Resource &gt; HR Settings,Configurare il sistema di denominazione dei dipendenti in Risorse umane&gt; Impostazioni risorse umane
 DocType: Employee,Resignation Letter Date,Lettera di dimissioni Data
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Pricing Rules are further filtered based on quantity.,Regole dei prezzi sono ulteriormente filtrati in base alla quantità.
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py,Please set the Date Of Joining for employee {0},Imposta la data di assunzione del dipendente {0}
@@ -3340,6 +3351,7 @@
 DocType: Bank Statement Settings,Mapped Items,Elementi mappati
 DocType: Amazon MWS Settings,IT,IT
 DocType: Chapter,Chapter,Capitolo
+,Fixed Asset Register,Registro delle attività fisse
 apps/erpnext/erpnext/utilities/user_progress.py,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,Select BOM and Qty for Production,Selezionare Distinta Materiali e Quantità per la  Produzione
@@ -3475,7 +3487,6 @@
 apps/erpnext/erpnext/templates/emails/reorder_item.html,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
 apps/erpnext/erpnext/controllers/accounts_controller.py,Account {0} is invalid. Account Currency must be {1},Account {0} non valido. La valuta del conto deve essere {1}
 apps/erpnext/erpnext/hr/doctype/salary_structure_assignment/salary_structure_assignment.py,From Date {0} cannot be after employee's relieving Date {1},Dalla data {0} non può essere successiva alla Data di rilascio del dipendente {1}
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py,Debit Note {0} has been created automatically,Nota di addebito {0} è stata creata automaticamente
 apps/erpnext/erpnext/accounts/doctype/payment_order/payment_order.js,Create Payment Entries,Crea voci di pagamento
 DocType: Supplier,Is Internal Supplier,È un fornitore interno
 DocType: Employee,Create User Permission,Crea autorizzazione utente
@@ -4034,7 +4045,6 @@
 DocType: Project User,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)
-apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.py,UOM Conversion factor ({0} -&gt; {1}) not found for item: {2},Fattore di conversione UOM ({0} -&gt; {1}) non trovato per l&#39;articolo: {2}
 apps/erpnext/erpnext/hr/doctype/retention_bonus/retention_bonus.py,Bonus Payment Date cannot be a past date,La data di pagamento bonus non può essere una data passata
 DocType: Travel Request,Copy of Invitation/Announcement,Copia dell&#39;invito / annuncio
 DocType: Practitioner Service Unit Schedule,Practitioner Service Unit Schedule,Programma dell&#39;unità di servizio del praticante
@@ -4202,6 +4212,7 @@
 apps/erpnext/erpnext/utilities/user_progress.py,Setup Company,Configura società
 ,Lab Test Report,Report dei test di laboratorio
 DocType: Employee Benefit Application,Employee Benefit Application,Applicazione per il beneficio dei dipendenti
+apps/erpnext/erpnext/accounts/doctype/invoice_discounting/invoice_discounting.py,Row({0}): {1} is already discounted in {2},Riga ({0}): {1} è già scontato in {2}
 apps/erpnext/erpnext/hr/doctype/additional_salary/additional_salary.py,Additional Salary Component Exists.,Esiste un componente di stipendio aggiuntivo.
 DocType: Purchase Invoice,Unregistered,non registrato
 DocType: Student Applicant,Application Date,Data di applicazione
@@ -4280,7 +4291,6 @@
 DocType: Journal Entry,Accounting Entries,Scritture contabili
 DocType: Job Card Time Log,Job Card Time Log,Registro tempo scheda lavoro
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,"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 viene selezionata la regola di determinazione dei prezzi per &quot;Tariffa&quot;, sovrascriverà il listino prezzi. Prezzi Il tasso di regola è il tasso finale, quindi non è necessario applicare ulteriori sconti. Pertanto, nelle transazioni come Ordine di vendita, Ordine di acquisto, ecc., Verrà recuperato nel campo &quot;Tariffa&quot;, piuttosto che nel campo &quot;Tariffa di listino prezzi&quot;."
-apps/erpnext/erpnext/education/doctype/instructor/instructor.py,Please setup Instructor Naming System in Education &gt; Education Settings,Installa il sistema di denominazione dell&#39;istruttore in Istruzione&gt; Impostazioni istruzione
 DocType: Journal Entry,Paid Loan,Prestito a pagamento
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py,Duplicate Entry. Please check Authorization Rule {0},Duplicate Entry. Si prega di controllare Autorizzazione Regola {0}
 DocType: Journal Entry Account,Reference Due Date,Data di scadenza di riferimento
@@ -4297,7 +4307,6 @@
 apps/erpnext/erpnext/templates/pages/projects.html,No time sheets,Non ci sono fogli di presenza
 DocType: GoCardless Mandate,GoCardless Customer,Cliente GoCardless
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py,Leave Type {0} cannot be carry-forwarded,Lascia tipo {0} non può essere trasmessa carry-
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Item Code &gt; Item Group &gt; Brand,Codice articolo&gt; Gruppo articoli&gt; Marchio
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py,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
 DocType: Leave Encashment,Payroll,Libro paga
@@ -4412,7 +4421,6 @@
 DocType: Stock Ledger Entry,Actual Qty After Transaction,Q.tà reale post-transazione
 ,Pending SO Items For Purchase Request,Elementi in sospeso così per Richiesta di Acquisto
 apps/erpnext/erpnext/education/doctype/student_admission/student_admission.py,Student Admissions,Ammissioni di studenti
-apps/erpnext/erpnext/accounts/party.py,{0} {1} is disabled,{0} {1} è disabilitato
 DocType: Supplier,Billing Currency,Valuta di fatturazione
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py,Extra Large,Extra Large
 DocType: Loan,Loan Application,Domanda di prestito
@@ -4489,7 +4497,6 @@
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py,Only Leave Applications with status 'Approved' and 'Rejected' can be submitted,Solo le autorizzazioni con lo stato 'Approvato' o 'Rifiutato' possono essere confermate
 apps/erpnext/erpnext/accounts/doctype/accounting_dimension/accounting_dimension.py,Creating Dimensions...,Creazione di quote ...
 apps/erpnext/erpnext/education/doctype/student_group_creation_tool/student_group_creation_tool.py,Student Group Name is mandatory in row {0},Student Nome gruppo è obbligatoria in riga {0}
-DocType: Customer Credit Limit,Bypass credit limit_check,Bypass credit limit_check
 DocType: Homepage,Products to be shown on website homepage,Prodotti da mostrare sulla home page del sito
 DocType: HR Settings,Password Policy,Politica sulla password
 apps/erpnext/erpnext/setup/doctype/customer_group/customer_group.js,This is a root customer group and cannot be edited.,Si tratta di un gruppo di clienti root e non può essere modificato .
@@ -4793,6 +4800,7 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py,Row {0}: Advance against Customer must be credit,Riga {0}: Advance contro il Cliente deve essere di credito
 DocType: Quality Meeting,Quality Meeting,Riunione di qualità
 apps/erpnext/erpnext/accounts/doctype/account/account.js,Non-Group to Group,Non-gruppo a gruppo
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,Impostare Naming Series per {0} tramite Setup&gt; Impostazioni&gt; Naming Series
 DocType: Employee,ERPNext User,ERPNext Utente
 apps/erpnext/erpnext/education/doctype/student_group_creation_tool/student_group_creation_tool.py,Batch is mandatory in row {0},Il lotto è obbligatorio nella riga {0}
 DocType: Company,Default Buying Terms,Termini di acquisto predefiniti
@@ -5087,6 +5095,7 @@
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py,No {0} found for Inter Company Transactions.,Nessun {0} trovato per transazioni interaziendali.
 DocType: Travel Itinerary,Rented Car,Auto a noleggio
 apps/erpnext/erpnext/public/js/hub/components/profile_dialog.js,About your Company,Informazioni sulla tua azienda
+apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.js,Show Stock Ageing Data,Mostra dati di invecchiamento stock
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py,Credit To account must be a Balance Sheet account,Credito Per account deve essere un account di Stato Patrimoniale
 DocType: Donor,Donor,Donatore
 DocType: Global Defaults,Disable In Words,Disattiva in parole
@@ -5101,8 +5110,10 @@
 DocType: Practitioner Schedule,Schedule Name,Nome Schedule
 apps/erpnext/erpnext/regional/doctype/gstr_3b_report/gstr_3b_report.py,Please enter GSTIN and state for the Company Address {0},Inserisci GSTIN e indica l&#39;indirizzo dell&#39;azienda {0}
 DocType: Currency Exchange,For Buying,Per l&#39;acquisto
+apps/erpnext/erpnext/setup/default_energy_point_rules.py,On Purchase Order Submission,Alla presentazione dell&#39;ordine d&#39;acquisto
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js,Add All Suppliers,Aggiungi tutti i fornitori
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py,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/accounts/doctype/pricing_rule/pricing_rule.js,Customer &gt; Customer Group &gt; Territory,Cliente&gt; Gruppo di clienti&gt; Territorio
 DocType: Tally Migration,Parties,parti
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js,Browse BOM,Sfoglia Distinta Base
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py,Secured Loans,Prestiti garantiti
@@ -5134,6 +5145,7 @@
 apps/erpnext/erpnext/stock/doctype/item_alternative/item_alternative.py,Not allow to set alternative item for the item {0},Non consentire di impostare articoli alternativi per l&#39;articolo {0}
 apps/erpnext/erpnext/hr/doctype/leave_block_list/leave_block_list.py,Date is repeated,La Data si Ripete
 apps/erpnext/erpnext/accounts/print_format/payment_receipt_voucher/payment_receipt_voucher.html,Authorized Signatory,Firma autorizzata
+apps/erpnext/erpnext/education/doctype/instructor/instructor.py,Please setup Instructor Naming System in Education &gt; Education Settings,Configura il sistema di denominazione dell&#39;istruttore in Istruzione&gt; Impostazioni istruzione
 apps/erpnext/erpnext/regional/doctype/gstr_3b_report/gstr_3b_report.html,Net ITC Available(A) - (B),Net ITC disponibile (A) - (B)
 apps/erpnext/erpnext/education/doctype/fee_schedule/fee_schedule.js,Create Fees,Crea tariffe
 DocType: Project,Total Purchase Cost (via Purchase Invoice),Costo totale di acquisto (tramite acquisto fattura)
@@ -5154,6 +5166,7 @@
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.js,Message Sent,Messaggio Inviato
 apps/erpnext/erpnext/accounts/doctype/account/account.py,Account with child nodes cannot be set as ledger,Il conto con nodi figli non può essere impostato come libro mastro
 DocType: C-Form,II,II
+apps/erpnext/erpnext/assets/report/fixed_asset_register/fixed_asset_register.py,Vendor Name,Nome del fornitore
 DocType: Quiz Result,Wrong,Sbagliato
 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)
@@ -5397,6 +5410,7 @@
 DocType: Stock Settings,Auto Material Request,Richiesta Automatica Materiale
 DocType: Woocommerce Settings,API consumer secret,Password API
 DocType: Delivery Note Item,Available Batch Qty at From Warehouse,Disponibile Quantità batch a partire Warehouse
+,Received Qty Amount,Importo quantità ricevuta
 DocType: Salary Slip,Gross Pay - Total Deduction - Loan Repayment,Pay Gross - Deduzione totale - Rimborso prestito
 DocType: Bank Account,Last Integration Date,Ultima data di integrazione
 DocType: Expense Claim,Expense Taxes and Charges,Tasse e spese
@@ -5856,6 +5870,8 @@
 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,Please select Qty against item {0},Seleziona Qtà rispetto all&#39;articolo {0}
+apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py,Latest Age,Fase avanzata
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js,Transfer Material to Supplier,Trasferire il materiale al Fornitore
 apps/erpnext/erpnext/hr/report/loan_repayment/loan_repayment.py,EMI,EMI
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py,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
@@ -5879,7 +5895,6 @@
 apps/erpnext/erpnext/hr/doctype/employee_benefit_application/employee_benefit_application.py,"An amount of {0} already claimed for the component {1},\
 						 set the amount equal or greater than {2}","Una quantità di {0} già richiesta per il componente {1}, \ impostare l&#39;importo uguale o maggiore di {2}"
 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,La nuova Distinta Base dopo la sostituzione
 ,Point of Sale,Punto di vendita
@@ -5999,7 +6014,6 @@
 DocType: Purchase Order Item,Blanket Order Rate,Tariffa ordine coperta
 ,Customer Ledger Summary,Riepilogo libro mastro cliente
 apps/erpnext/erpnext/hooks.py,Certification,Certificazione
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js,Are you sure you want to make debit note?,Sei sicuro di voler prendere nota di addebito?
 DocType: Bank Guarantee,Clauses and Conditions,Clausole e condizioni
 DocType: Serial No,Creation Document Type,Creazione tipo di documento
 DocType: Amazon MWS Settings,ES,ES
@@ -6037,8 +6051,6 @@
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py,Financial Services,Servizi finanziari
 DocType: Student Sibling,Student ID,Student ID
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.js,For Quantity must be greater than zero,Per Quantità deve essere maggiore di zero
-apps/erpnext/erpnext/hr/doctype/employee_transfer/employee_transfer.py,"Please delete the Employee <a href=""#Form/Employee/{0}"">{0}</a>\
-					to cancel this document","Elimina il dipendente <a href=""#Form/Employee/{0}"">{0}</a> \ per annullare questo documento"
 apps/erpnext/erpnext/config/projects.py,Types of activities for Time Logs,Tipi di attività per i registri di tempo
 DocType: Opening Invoice Creation Tool,Sales,Vendite
 DocType: Stock Entry Detail,Basic Amount,Importo di base
@@ -6117,6 +6129,7 @@
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py,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,Send Supplier Emails,Inviare e-mail del fornitore
+DocType: Asset Movement,ACC-ASM-.YYYY.-,ACC-ASM-.YYYY.-
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py,"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: Fiscal Year,Auto Created,Creato automaticamente
 apps/erpnext/erpnext/hr/doctype/employee_onboarding/employee_onboarding.py,Submit this to create the Employee record,Invia questo per creare il record Dipendente
@@ -6194,7 +6207,6 @@
 DocType: Sales Team,Contact No.,Contatto N.
 apps/erpnext/erpnext/templates/includes/cart/cart_address.html,Billing Address is same as Shipping Address,L&#39;indirizzo di fatturazione è uguale all&#39;indirizzo di spedizione
 DocType: Bank Reconciliation,Payment Entries,Pagamenti
-apps/erpnext/erpnext/erpnext_integrations/doctype/shopify_settings/shopify_settings.py,Access token or Shopify URL missing,Token di accesso o URL di Shopify mancante
 DocType: Location,Latitude,Latitudine
 DocType: Work Order,Scrap Warehouse,Scrap Magazzino
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py,"Warehouse required at Row No {0}, please set default warehouse for the item {1} for the company {2}","Magazzino richiesto alla riga n. {0}, impostare il magazzino predefinito per l&#39;articolo {1} per la società {2}"
@@ -6237,7 +6249,6 @@
 DocType: Job Offer Term,Value / Description,Valore / Descrizione
 apps/erpnext/erpnext/controllers/accounts_controller.py,"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
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js,Are you sure you want to make credit note?,Sei sicuro di voler prendere nota del credito?
 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,Debit and Credit not equal for {0} #{1}. Difference is {2}.,Dare e Avere non uguale per {0} # {1}. La differenza è {2}.
@@ -6362,6 +6373,7 @@
 DocType: Purchase Invoice,Taxes and Charges Added,Tasse e spese aggiuntive
 apps/erpnext/erpnext/assets/doctype/asset/asset.py,Depreciation Row {0}: Next Depreciation Date cannot be before Available-for-use Date,Riga di ammortamento {0}: la successiva Data di ammortamento non può essere precedente alla Data disponibile per l&#39;uso
 ,Sales Funnel,imbuto di vendita
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Item Code &gt; Item Group &gt; Brand,Codice articolo&gt; Gruppo articoli&gt; Marchio
 apps/erpnext/erpnext/setup/doctype/company/company.py,Abbreviation is mandatory,L'abbreviazione è obbligatoria
 DocType: Project,Task Progress,Avanzamento attività
 apps/erpnext/erpnext/templates/includes/navbar/navbar_items.html,Cart,Carrello
@@ -6605,6 +6617,7 @@
 DocType: Employee Grade,Employee Grade,Grado del dipendente
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py,Piecework,lavoro a cottimo
 DocType: GSTR 3B Report,June,giugno
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Supplier &gt; Supplier Type,Fornitore&gt; Tipo di fornitore
 DocType: Share Balance,From No,Dal n
 DocType: Shift Type,Early Exit Grace Period,Periodo di tolleranza dell&#39;uscita anticipata
 DocType: Task,Actual Time (in Hours),Tempo reale (in ore)
@@ -6889,6 +6902,7 @@
 DocType: Warehouse,Warehouse Name,Nome Magazzino
 DocType: Naming Series,Select Transaction,Selezionare Transaction
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py,Please enter Approving Role or Approving User,Inserisci Approvazione ruolo o Approvazione utente
+apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.py,UOM Conversion factor ({0} -&gt; {1}) not found for item: {2},Fattore di conversione UOM ({0} -&gt; {1}) non trovato per l&#39;articolo: {2}
 apps/erpnext/erpnext/support/doctype/service_level_agreement/service_level_agreement.py,Service Level Agreement with Entity Type {0} and Entity {1} already exists.,Accordo sul livello di servizio con il tipo di entità {0} e l&#39;entità {1} esiste già.
 DocType: Journal Entry,Write Off Entry,Entry di Svalutazione
 DocType: BOM,Rate Of Materials Based On,Tasso di materiali a base di
@@ -7079,6 +7093,7 @@
 DocType: Quality Inspection Reading,Quality Inspection Reading,Lettura Controllo Qualità
 apps/erpnext/erpnext/stock/doctype/stock_settings/stock_settings.py,`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/stock/report/stock_balance/stock_balance.py,Earliest Age,Prima età
 apps/erpnext/erpnext/utilities/user_progress.py,Set a sales goal you'd like to achieve for your company.,Imposta un obiettivo di vendita che desideri conseguire per la tua azienda.
 DocType: Quality Goal,Revision,Revisione
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js,Healthcare Services,Servizi di assistenza sanitaria
@@ -7122,6 +7137,7 @@
 apps/erpnext/erpnext/healthcare/doctype/patient_encounter/patient_encounter.js,Schedule Discharge,Schedule Discharge
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py,Cheques and Deposits incorrectly cleared,Assegni e depositi cancellati in modo non corretto
 DocType: Homepage Section Card,Homepage Section Card,Home page Sezione Card
+,Amount To Be Billed,Importo da fatturare
 apps/erpnext/erpnext/accounts/doctype/account/account.py,Account {0}: You can not assign itself as parent account,Account {0}: non è possibile assegnare se stesso come conto principale
 DocType: Purchase Invoice Item,Price List Rate,Prezzo di Listino
 apps/erpnext/erpnext/utilities/activation.py,Create customer quotes,Creare le citazioni dei clienti
@@ -7174,6 +7190,7 @@
 DocType: Supplier Scorecard Criteria,Supplier Scorecard Criteria,Criteri di valutazione dei fornitori
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py,Please select Start Date and End Date for Item {0},Scegliere una data di inizio e di fine per la voce {0}
 DocType: Maintenance Schedule,MAT-MSH-.YYYY.-,MAT-MSH-.YYYY.-
+,Amount to Receive,Importo da ricevere
 apps/erpnext/erpnext/education/doctype/student_group_creation_tool/student_group_creation_tool.py,Course is mandatory in row {0},Corso è obbligatoria in riga {0}
 apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py,From date can not be greater than than To date,Da data non può essere maggiore di Fino a data
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py,To date cannot be before from date,'A Data' deve essere successiva a 'Da Data'
@@ -7421,7 +7438,6 @@
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js,BOM and Manufacturing Quantity are required,Distinta Base e Quantità Produzione richieste
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js,Ageing Range 2,Gamma invecchiamento 2
 DocType: SG Creation Tool Course,Max Strength,Forza Max
-apps/erpnext/erpnext/accounts/doctype/account/account.py,"Account {0} already exists in child company {1}. The following fields have different values, they should be same:<ul><li>{2}</li></ul>","L&#39;account {0} esiste già nell&#39;azienda figlio {1}. I seguenti campi hanno valori diversi, dovrebbero essere uguali: <ul><li> {2} </li></ul>"
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py,Installing presets,Installare i preset
 DocType: Fee Schedule,EDU-FSH-.YYYY.-,EDU-FSH-.YYYY.-
 apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js,No Delivery Note selected for Customer {},Nessuna nota di consegna selezionata per il cliente {}
@@ -7629,6 +7645,7 @@
 DocType: Delivery Note,Print Without Amount,Stampare senza Importo
 apps/erpnext/erpnext/accounts/report/asset_depreciation_ledger/asset_depreciation_ledger.py,Depreciation Date,Ammortamenti Data
 ,Work Orders in Progress,Ordini di lavoro in corso
+DocType: Customer Credit Limit,Bypass Credit Limit Check,Bypass Controllo limite credito
 DocType: Issue,Support Team,Support Team
 apps/erpnext/erpnext/stock/report/batch_item_expiry_status/batch_item_expiry_status.py,Expiry (In Days),Scadenza (in giorni)
 DocType: Appraisal,Total Score (Out of 5),Punteggio totale (i 5)
@@ -7812,6 +7829,7 @@
 DocType: Sales Invoice,Customer GSTIN,Cliente GSTIN
 DocType: Crop Cycle,List of diseases detected on the field. When selected it'll automatically add a list of tasks to deal with the disease ,"Elenco delle malattie rilevate sul campo. Quando selezionato, aggiungerà automaticamente un elenco di compiti per affrontare la malattia"
 apps/erpnext/erpnext/manufacturing/page/bom_comparison_tool/bom_comparison_tool.js,BOM 1,DBA 1
+apps/erpnext/erpnext/assets/report/fixed_asset_register/fixed_asset_register.py,Asset Id,ID risorsa
 apps/erpnext/erpnext/healthcare/doctype/healthcare_service_unit/healthcare_service_unit.js,This is a root healthcare service unit and cannot be edited.,Questa è un&#39;unità di assistenza sanitaria di root e non può essere modificata.
 DocType: Asset Repair,Repair Status,Stato di riparazione
 apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.js,"Requested Qty: Quantity requested for purchase, but not ordered.","Richiesto Quantità : Quantità richiesto per l'acquisto , ma non ordinato."
diff --git a/erpnext/translations/ja.csv b/erpnext/translations/ja.csv
index 65086ef..795129d 100644
--- a/erpnext/translations/ja.csv
+++ b/erpnext/translations/ja.csv
@@ -289,7 +289,6 @@
 DocType: Loan,Repay Over Number of Periods,期間数を超える返済
 apps/erpnext/erpnext/manufacturing/report/bom_stock_report/bom_stock_report.py,Quantity to Produce can not be less than Zero,生産する数量はゼロより小さくすることはできません
 DocType: Stock Entry,Additional Costs,追加費用
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Customer &gt; Customer Group &gt; Territory,顧客&gt;顧客グループ&gt;テリトリー
 apps/erpnext/erpnext/accounts/doctype/account/account.py,Account with existing transaction can not be converted to group.,既存の取引を持つアカウントをグループに変換することはできません。
 DocType: Lead,Product Enquiry,製品のお問い合わせ
 DocType: Education Settings,Validate Batch for Students in Student Group,生徒グループ内の生徒のバッチを検証する
@@ -586,6 +585,7 @@
 DocType: Healthcare Settings,Create documents for sample collection,サンプル収集のためのドキュメントの作成
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py,Payment against {0} {1} cannot be greater than Outstanding Amount {2},{0} {1} に対する支払は残高 {2} より大きくすることができません
 apps/erpnext/erpnext/patches/v11_0/add_healthcare_service_unit_tree_root.py,All Healthcare Service Units,すべてのヘルスケアサービスユニット
+apps/erpnext/erpnext/setup/default_energy_point_rules.py,On Converting Opportunity,機会の転換について
 DocType: Bank Account,Address HTML,住所のHTML
 DocType: Lead,Mobile No.,携帯番号
 apps/erpnext/erpnext/selling/doctype/pos_closing_voucher/closing_voucher_details.html,Mode of Payments,支払い方法
@@ -650,7 +650,6 @@
 DocType: Accounting Dimension,Dimension Name,ディメンション名
 apps/erpnext/erpnext/healthcare/setup.py,Resistant,耐性
 apps/erpnext/erpnext/hotels/doctype/hotel_room_reservation/hotel_room_reservation.py,Please set Hotel Room Rate on {},{}にホテルの客室料金を設定してください
-apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py,Please setup numbering series for Attendance via Setup &gt; Numbering Series,[設定]&gt; [ナンバリングシリーズ]から出席のナンバリングシリーズを設定してください
 DocType: Journal Entry,Multi Currency,複数通貨
 DocType: Bank Statement Transaction Invoice Item,Invoice Type,請求書タイプ
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py,Valid from date must be less than valid upto date,有効開始日は有効更新日よりも短くなければなりません
@@ -766,6 +765,7 @@
 apps/erpnext/erpnext/accounts/page/pos/pos.js,Create a new Customer,新しい顧客を作成します。
 apps/erpnext/erpnext/non_profit/report/expiring_memberships/expiring_memberships.py,Expiring On,有効期限切れ
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,"If multiple Pricing Rules continue to prevail, users are asked to set Priority manually to resolve conflict.",複数の価格設定ルールが優先しあった場合、ユーザーは、競合を解決するために、手動で優先度を設定するように求められます。
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js,Purchase Return,仕入返品
 apps/erpnext/erpnext/utilities/activation.py,Create Purchase Orders,発注書を作成します
 ,Purchase Register,仕入帳
 apps/erpnext/erpnext/healthcare/doctype/patient/patient.py,Patient not found,患者が見つかりません
@@ -781,7 +781,6 @@
 DocType: Location,Area UOM,エリアUOM
 apps/erpnext/erpnext/manufacturing/doctype/workstation/workstation.py,Workstation is closed on the following dates as per Holiday List: {0},作業所は、休日リストに従って、次の日に休業します：{0}
 apps/erpnext/erpnext/selling/page/sales_funnel/sales_funnel.py,Opportunities,機会
-apps/erpnext/erpnext/www/all-products/index.html,Clear filters,フィルターをクリア
 DocType: Lab Test Template,Single,シングル
 DocType: Compensatory Leave Request,Work From Date,日付からの作業
 DocType: Salary Slip,Total Loan Repayment,合計ローンの返済
@@ -824,6 +823,7 @@
 DocType: Account,Old Parent,古い親
 apps/erpnext/erpnext/education/doctype/program_enrollment_tool/program_enrollment_tool.py,Mandatory field - Academic Year,必須項目 - 学年
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py,{0} {1} is not associated with {2} {3},{0} {1}は{2} {3}に関連付けられていません
+DocType: Opportunity,Converted By,変換者
 apps/erpnext/erpnext/public/js/hub/components/ReviewArea.vue,You need to login as a Marketplace User before you can add any reviews.,レビューを追加する前に、Marketplaceユーザーとしてログインする必要があります。
 apps/erpnext/erpnext/manufacturing/doctype/job_card/job_card.py,Row {0} : Operation is required against the raw material item {1},行{0}：原材料項目{1}に対して操作が必要です
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py,Please set default payable account for the company {0},{0}社のデフォルト支払い可能口座を設定してください
@@ -849,6 +849,8 @@
 DocType: BOM,Work Order,作業命令
 DocType: Sales Invoice,Total Qty,合計数量
 apps/erpnext/erpnext/education/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py,Guardian2 Email ID,保護者2 メールID
+apps/erpnext/erpnext/hr/doctype/employee_transfer/employee_transfer.py,"Please delete the Employee <a href=""#Form/Employee/{0}"">{0}</a>\
+					to cancel this document","このドキュメントをキャンセルするには、従業員<a href=""#Form/Employee/{0}"">{0}</a> \を削除してください"
 DocType: Item,Show in Website (Variant),ウェブサイトに表示（バリエーション）
 DocType: Employee,Health Concerns,健康への懸念
 DocType: Payroll Entry,Select Payroll Period,給与計算期間を選択
@@ -908,7 +910,6 @@
 DocType: Codification Table,Codification Table,コード化表
 DocType: Timesheet Detail,Hrs,時間
 apps/erpnext/erpnext/manufacturing/page/bom_comparison_tool/bom_comparison_tool.js,Changes in {0},{0}の変更
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js,Please select Company,会社を選択してください
 DocType: Employee Skill,Employee Skill,従業員のスキル
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.js,Difference Account,差損益
 DocType: Pricing Rule,Discount on Other Item,他のアイテムの割引
@@ -976,6 +977,7 @@
 DocType: BOM,Operating Cost,運用費
 DocType: Crop,Produced Items,プロダクトアイテム
 DocType: Bank Statement Transaction Entry,Match Transaction to Invoices,請求書と取引照合
+apps/erpnext/erpnext/erpnext_integrations/exotel_integration.py,Error in Exotel incoming call,Exotel着信コールのエラー
 DocType: Sales Order Item,Gross Profit,粗利益
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js,Unblock Invoice,請求書のブロックを解除する
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py,Increment cannot be 0,増分は0にすることはできません
@@ -1189,6 +1191,7 @@
 DocType: Activity Cost,Activity Type,活動タイプ
 DocType: Request for Quotation,For individual supplier,個々のサプライヤーのため
 DocType: BOM Operation,Base Hour Rate(Company Currency),基本時間単価（会社通貨）
+,Qty To Be Billed,請求される数量
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py,Delivered Amount,納品済額
 apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.js,Reserved Qty for Production: Raw materials quantity to make manufacturing items.,生産予約数量：製造品目を製造するための原料数量。
 DocType: Loyalty Point Entry Redemption,Redemption Date,償還日
@@ -1307,7 +1310,7 @@
 DocType: Sales Invoice,Commission Rate (%),手数料率（％）
 apps/erpnext/erpnext/education/doctype/student_group/student_group.py,Please select Program,プログラムを選択してください
 DocType: Project,Estimated Cost,推定費用
-DocType: Request for Quotation,Link to material requests,資材要求へのリンク
+DocType: Supplier Quotation,Link to material requests,資材要求へのリンク
 apps/erpnext/erpnext/public/js/hub/pages/Publish.vue,Publish,公開
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py,Aerospace,航空宇宙
 ,Fichier des Ecritures Comptables [FEC],Fichier des Ecritures Comptables [FEC]
@@ -1320,6 +1323,7 @@
 apps/erpnext/erpnext/utilities/transaction_base.py,Invalid Posting Time,転記時間が無効です
 DocType: Salary Component,Condition and Formula,条件と数式
 DocType: Lead,Campaign Name,キャンペーン名
+apps/erpnext/erpnext/setup/default_energy_point_rules.py,On Task Completion,タスク完了時
 apps/erpnext/erpnext/hr/doctype/compensatory_leave_request/compensatory_leave_request.py,There is no leave period in between {0} and {1},{0}と{1}の間に休暇期間はありません。
 DocType: Fee Validity,Healthcare Practitioner,医療従事者
 DocType: Hotel Room,Capacity,容量
@@ -1690,7 +1694,6 @@
 DocType: Quality Feedback Template,Quality Feedback Template,品質フィードバックテンプレート
 apps/erpnext/erpnext/config/education.py,LMS Activity,LMSの活動
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py,Internet Publishing,インターネット出版
-DocType: Prescription Duration,Number,数
 apps/erpnext/erpnext/accounts/doctype/opening_invoice_creation_tool/opening_invoice_creation_tool.js,Creating {0} Invoice,{0}請求書の作成
 DocType: Medical Code,Medical Code Standard,医療コード標準
 DocType: Soil Texture,Clay Composition (%),粘土組成（％）
@@ -1765,6 +1768,7 @@
 DocType: Support Settings,Get Started Sections,開始セクション
 DocType: Lead,CRM-LEAD-.YYYY.-,CRM-LEAD-.YYYY.-
 DocType: Invoice Discounting,Sanctioned,認可済
+,Base Amount,基準額
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.js,Total Contribution Amount: {0},総拠出額：{0}
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py,Row #{0}: Please specify Serial No for Item {1},行 {0}：アイテム{1}のシリアル番号を指定してください
 DocType: Payroll Entry,Salary Slips Submitted,提出された給与明細
@@ -1982,6 +1986,7 @@
 apps/erpnext/erpnext/utilities/user_progress.py,List a few of your suppliers. They could be organizations or individuals.,サプライヤーの一部を一覧表示します。彼らは、組織や個人である可能性があります。
 DocType: Accounting Dimension,Dimension Defaults,寸法のデフォルト
 apps/erpnext/erpnext/crm/report/prospects_engaged_but_not_converted/prospects_engaged_but_not_converted.js,Minimum Lead Age (Days),最小リード年齢（日）
+apps/erpnext/erpnext/assets/report/fixed_asset_register/fixed_asset_register.py,Available For Use Date,使用可能日
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py,All BOMs,すべてのBOM
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js,Create Inter Company Journal Entry,会社間仕訳伝票の登録
 DocType: Company,Parent Company,親会社
@@ -2046,6 +2051,7 @@
 ,IRS 1099,IRS 1099
 DocType: Salary Slip,Leave Without Pay,無給休暇
 DocType: Payment Request,Outward,外向き
+apps/erpnext/erpnext/setup/default_energy_point_rules.py,On {0} Creation,{0}作成時
 apps/erpnext/erpnext/regional/doctype/gstr_3b_report/gstr_3b_report.html,State/UT Tax,州/ユタ州税
 ,Trial Balance for Party,当事者用の試算表
 ,Gross and Net Profit Report,総利益および純利益レポート
@@ -2161,6 +2167,7 @@
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js,Make Stock Entry,在庫登録
 DocType: Hotel Room Reservation,Hotel Reservation User,ホテル予約ユーザー
 apps/erpnext/erpnext/projects/doctype/project/project.js,Set Status,ステータス設定
+apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py,Please setup numbering series for Attendance via Setup &gt; Numbering Series,[設定]&gt; [ナンバリングシリーズ]から出席のナンバリングシリーズを設定してください
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py,Please select prefix first,接頭辞を選択してください
 DocType: Contract,Fulfilment Deadline,フルフィルメントの締め切り
 apps/erpnext/erpnext/public/js/hub/pages/Home.vue,Near you,あなたの近く
@@ -2176,6 +2183,7 @@
 DocType: Announcement,All Students,全生徒
 apps/erpnext/erpnext/assets/doctype/asset/asset.py,Item {0} must be a non-stock item,アイテム{0}は非在庫アイテムでなければなりません
 apps/erpnext/erpnext/stock/doctype/batch/batch.js,View Ledger,元帳の表示
+DocType: Cost Center,Lft,左
 DocType: Grading Scale,Intervals,インターバル
 DocType: Bank Statement Transaction Entry,Reconciled Transactions,調停された取引
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py,Earliest,最初
@@ -2291,6 +2299,7 @@
 apps/erpnext/erpnext/hr/doctype/employee_benefit_application/employee_benefit_application.py,As per your assigned Salary Structure you cannot apply for benefits,あなたの割り当てられた給与構造に従って、給付を申請することはできません
 apps/erpnext/erpnext/stock/doctype/item/item.py,Website Image should be a public file or website URL,ウェブサイト画像は、公開ファイルまたはウェブサイトのURLを指定する必要があります
 DocType: Purchase Invoice Item,BOM,BOM
+apps/erpnext/erpnext/stock/doctype/item/item.py,Duplicate entry in Manufacturers table,製造元テーブルのエントリが重複しています
 apps/erpnext/erpnext/setup/doctype/item_group/item_group.js,This is a root item group and cannot be edited.,これは、ルートアイテムグループであり、編集することはできません。
 apps/erpnext/erpnext/accounts/doctype/account/account.js,Merge,マージ
 DocType: Journal Entry Account,Purchase Order,発注
@@ -2435,7 +2444,6 @@
 DocType: Asset,Depreciation Schedules,減価償却スケジュール
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.js,Create Sales Invoice,売上請求書を作成する
 apps/erpnext/erpnext/regional/doctype/gstr_3b_report/gstr_3b_report.html,Ineligible ITC,対象外ITC
-apps/erpnext/erpnext/erpnext_integrations/doctype/shopify_settings/shopify_settings.py,"Support for public app is deprecated. Please setup private app, for more details refer user manual",公開アプリのサポートは廃止されました。プライベートアプリを設定してください。詳細はユーザーマニュアルを参照してください
 DocType: Task,Dependent Tasks,依存タスク
 apps/erpnext/erpnext/regional/report/gstr_1/gstr_1.py,Following accounts might be selected in GST Settings:,以下のアカウントは、GST設定で選択することができます：
 apps/erpnext/erpnext/manufacturing/report/bom_stock_report/bom_stock_report.js,Quantity to Produce,生産する数量
@@ -2689,6 +2697,7 @@
 DocType: Water Analysis,Container,コンテナ
 apps/erpnext/erpnext/regional/report/gstr_1/gstr_1.py,Please set valid GSTIN No. in Company Address,会社の住所に有効なGSTIN番号を設定してください
 apps/erpnext/erpnext/education/utils.py,Student {0} - {1} appears Multiple times in row {2} & {3},生徒 {0}  - 行 {2}・{3}内に {1} が複数存在しています
+apps/erpnext/erpnext/selling/doctype/customer/customer.py,Following fields are mandatory to create address:,アドレスを作成するには、次のフィールドが必須です。
 DocType: Item Alternative,Two-way,双方向
 DocType: Item,Manufacturers,メーカー
 apps/erpnext/erpnext/accounts/deferred_revenue.py,Error while processing deferred accounting for {0},{0}の繰延アカウンティングの処理中にエラーが発生しました
@@ -2763,9 +2772,9 @@
 DocType: Employee,HR-EMP-,HR-EMP-
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py,User {0} doesn't have any default POS Profile. Check Default at Row {1} for this User.,ユーザー{0}にはデフォルトのPOSプロファイルがありません。行{1}でこのユーザーのデフォルトを確認してください。
 DocType: Quality Meeting Minutes,Quality Meeting Minutes,質の高い会議議事録
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Supplier &gt; Supplier Type,サプライヤ&gt;サプライヤタイプ
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py,Employee Referral,従業員の紹介
 DocType: Student Group,Set 0 for no limit,制限なしの場合は0を設定します
+DocType: Cost Center,rgt,右
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py,The day(s) on which you are applying for leave are holidays. You need not apply for leave.,あなたは休暇を申請された日（複数可）は祝日です。あなたは休暇を申請する必要はありません。
 DocType: Customer,Primary Address and Contact Detail,プライマリアドレスと連絡先の詳細
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.js,Resend Payment Email,支払メールを再送信
@@ -2875,7 +2884,6 @@
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py,Against Supplier Invoice {0} dated {1},対サプライヤー請求書{0} 日付{1}
 DocType: Customer,Default Price List,デフォルト価格表
 apps/erpnext/erpnext/assets/doctype/asset/asset.py,Asset Movement record {0} created,資産移動レコード{0}を作成
-apps/erpnext/erpnext/utilities/page/leaderboard/leaderboard.js,No items found.,項目は見つかりませんでした。
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py,You cannot delete Fiscal Year {0}. Fiscal Year {0} is set as default in Global Settings,年度{0}を削除することはできません。年度{0}はグローバル設定でデフォルトとして設定されています
 DocType: Share Transfer,Equity/Liability Account,株式/責任勘定
 apps/erpnext/erpnext/setup/doctype/customer_group/customer_group.py,A customer with the same name already exists,同名の顧客が既に存在します
@@ -2891,6 +2899,7 @@
 apps/erpnext/erpnext/selling/doctype/customer/customer.py,Credit limit has been crossed for customer {0} ({1}/{2}),顧客{0}（{1} / {2}）の与信限度を超えています
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py,Customer required for 'Customerwise Discount',「顧客ごと割引」には顧客が必要です
 apps/erpnext/erpnext/config/accounting.py,Update bank payment dates with journals.,銀行支払日と履歴を更新
+,Billed Qty,請求済み数量
 apps/erpnext/erpnext/stock/doctype/item/item_dashboard.py,Pricing,価格設定
 DocType: Employee,Attendance Device ID (Biometric/RF tag ID),出席デバイスID（バイオメトリック/ RFタグID）
 DocType: Quotation,Term Details,用語解説
@@ -2912,6 +2921,7 @@
 DocType: Share Transfer,Asset Account,アセットアカウント
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js,New release date should be in the future,新しいリリース日は将来になるはずです
 DocType: Purchase Invoice,End date of current invoice's period,現在の請求書の期間の終了日
+apps/erpnext/erpnext/hr/doctype/employee/employee.py,Please setup Employee Naming System in Human Resource &gt; HR Settings,人事管理&gt; HR設定で従業員命名システムを設定してください
 DocType: Lab Test,Technician Name,技術者名
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py,"Cannot ensure delivery by Serial No as \
 					Item {0} is added with and without Ensure Delivery by \
@@ -2919,6 +2929,7 @@
 DocType: Accounts Settings,Unlink Payment on Cancellation of Invoice,請求書のキャンセルにお支払いのリンクを解除
 DocType: Bank Reconciliation,From Date,開始日
 apps/erpnext/erpnext/hr/doctype/vehicle_log/vehicle_log.py,Current Odometer reading entered should be greater than initial Vehicle Odometer {0},入力された現在の走行距離計の読みは、初期の車両走行距離よりも大きくなければなりません{0}
+,Purchase Order Items To Be Received or Billed,受領または請求される発注書アイテム
 DocType: Restaurant Reservation,No Show,非表示
 apps/erpnext/erpnext/regional/india/utils.py,You must be a registered supplier to generate e-Way Bill,あなたはe-Way Billを生成するために登録サプライヤでなければなりません
 DocType: Shipping Rule Country,Shipping Rule Country,国の出荷ルール
@@ -2961,6 +2972,7 @@
 apps/erpnext/erpnext/templates/generators/item/item_add_to_cart.html,View in Cart,カート内を表示
 DocType: Employee Checkin,Shift Actual Start,実績開始シフト
 DocType: Tally Migration,Is Day Book Data Imported,Day Bookのデータがインポートされたか
+,Purchase Order Items To Be Received or Billed1,受領または請求される注文書項目1
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py,Marketing Expenses,マーケティング費用
 apps/erpnext/erpnext/stock/doctype/pick_list/pick_list.py,{0} units of {1} is not available.,{0}ユニットの{1}は使用できません。
 ,Item Shortage Report,アイテム不足レポート
@@ -3186,7 +3198,6 @@
 apps/erpnext/erpnext/public/js/call_popup/call_popup.js,View all issues from {0},{0}からのすべての問題を見る
 DocType: Quality Inspection,MAT-QA-.YYYY.-,MAT-QA-.YYYY.-
 DocType: Quality Meeting Table,Quality Meeting Table,品質会議テーブル
-apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,[設定]&gt; [設定]&gt; [命名シリーズ]で{0}の命名シリーズを設定してください
 apps/erpnext/erpnext/templates/pages/help.html,Visit the forums,フォーラムにアクセス
 DocType: Student,Student Mobile Number,生徒携帯電話番号
 DocType: Item,Has Variants,バリエーションあり
@@ -3328,6 +3339,7 @@
 DocType: Homepage Section,Section Cards,セクションカード
 ,Campaign Efficiency,キャンペーンの効率
 DocType: Discussion,Discussion,討論
+apps/erpnext/erpnext/setup/default_energy_point_rules.py,On Sales Order Submission,受注の提出について
 DocType: Bank Transaction,Transaction ID,取引ID
 DocType: Payroll Entry,Deduct Tax For Unsubmitted Tax Exemption Proof,未払税免除証明書の控除税
 DocType: Volunteer,Anytime,どんなときも
@@ -3335,7 +3347,6 @@
 DocType: Employee Tax Exemption Proof Submission,Employee Tax Exemption Proof Submission,従業員税免除証明書の提出
 DocType: Patient,Surgical History,外科の歴史
 DocType: Bank Statement Settings Item,Mapped Header,マップされたヘッダー
-apps/erpnext/erpnext/hr/doctype/employee/employee.py,Please setup Employee Naming System in Human Resource &gt; HR Settings,人事管理&gt; HR設定で従業員命名システムを設定してください
 DocType: Employee,Resignation Letter Date,辞表提出日
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Pricing Rules are further filtered based on quantity.,価格設定ルールは量に基づいてさらにフィルタリングされます
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py,Please set the Date Of Joining for employee {0},従業員{0}の参加日を設定してください
@@ -3349,6 +3360,7 @@
 DocType: Bank Statement Settings,Mapped Items,マップされたアイテム
 DocType: Amazon MWS Settings,IT,それ
 DocType: Chapter,Chapter,章
+,Fixed Asset Register,固定資産台帳
 apps/erpnext/erpnext/utilities/user_progress.py,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,Select BOM and Qty for Production,生産のためのBOMと数量を選択
@@ -3484,7 +3496,6 @@
 apps/erpnext/erpnext/templates/emails/reorder_item.html,Following Material Requests have been raised automatically based on Item's re-order level,以下の資材要求は、アイテムの再注文レベルに基づいて自動的に提出されています
 apps/erpnext/erpnext/controllers/accounts_controller.py,Account {0} is invalid. Account Currency must be {1},アカウント{0}は無効です。アカウントの通貨は{1}でなければなりません
 apps/erpnext/erpnext/hr/doctype/salary_structure_assignment/salary_structure_assignment.py,From Date {0} cannot be after employee's relieving Date {1},従業員の日付{1}を救済した後の日付{0}以降はできません
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py,Debit Note {0} has been created automatically,デビットノート{0}が自動的に作成されました
 apps/erpnext/erpnext/accounts/doctype/payment_order/payment_order.js,Create Payment Entries,支払エントリの作成
 DocType: Supplier,Is Internal Supplier,内部サプライヤ
 DocType: Employee,Create User Permission,ユーザー権限の作成
@@ -4044,7 +4055,6 @@
 DocType: Project User,Project Status,プロジェクトステータス
 DocType: UOM,Check this to disallow fractions. (for Nos),数に小数を許可しない場合チェック
 DocType: Student Admission Program,Naming Series (for Student Applicant),シリーズ命名（生徒出願用）
-apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.py,UOM Conversion factor ({0} -&gt; {1}) not found for item: {2},アイテムのUOM換算係数（{0}-&gt; {1}）が見つかりません：{2}
 apps/erpnext/erpnext/hr/doctype/retention_bonus/retention_bonus.py,Bonus Payment Date cannot be a past date,ボーナス支払日は過去の日付ではありません
 DocType: Travel Request,Copy of Invitation/Announcement,招待状/発表のコピー
 DocType: Practitioner Service Unit Schedule,Practitioner Service Unit Schedule,プラクティショナーサービスユニットスケジュール
@@ -4219,6 +4229,7 @@
 apps/erpnext/erpnext/utilities/user_progress.py,Setup Company,セットアップ会社
 ,Lab Test Report,ラボテストレポート
 DocType: Employee Benefit Application,Employee Benefit Application,従業員給付申請書
+apps/erpnext/erpnext/accounts/doctype/invoice_discounting/invoice_discounting.py,Row({0}): {1} is already discounted in {2},行（{0}）：{1}はすでに{2}で割引されています
 apps/erpnext/erpnext/hr/doctype/additional_salary/additional_salary.py,Additional Salary Component Exists.,追加の給与コンポーネントが存在します。
 DocType: Purchase Invoice,Unregistered,未登録
 DocType: Student Applicant,Application Date,出願日
@@ -4295,7 +4306,6 @@
 DocType: Journal Entry,Accounting Entries,会計エントリー
 DocType: Job Card Time Log,Job Card Time Log,ジョブカードのタイムログ
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,"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;に対して行われた場合、価格リストが上書きされます。価格設定ルールレートは最終レートなので、これ以上の割引は適用されません。したがって、受注、購買発注などの取引では、[価格リスト]フィールドではなく[レート]フィールドで取得されます。
-apps/erpnext/erpnext/education/doctype/instructor/instructor.py,Please setup Instructor Naming System in Education &gt; Education Settings,[教育]&gt; [教育設定]でインストラクターの命名システムを設定してください
 DocType: Journal Entry,Paid Loan,有料ローン
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py,Duplicate Entry. Please check Authorization Rule {0},エントリーが重複しています。認証ルール{0}を確認してください
 DocType: Journal Entry Account,Reference Due Date,参照期限
@@ -4312,7 +4322,6 @@
 apps/erpnext/erpnext/templates/pages/projects.html,No time sheets,勤務表がありません
 DocType: GoCardless Mandate,GoCardless Customer,GoCardlessカスタマー
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py,Leave Type {0} cannot be carry-forwarded,{0}キャリー転送できないタイプを残します
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Item Code &gt; Item Group &gt; Brand,商品コード&gt;商品グループ&gt;ブランド
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py,Maintenance Schedule is not generated for all the items. Please click on 'Generate Schedule',保守スケジュールが全てのアイテムに生成されていません。「スケジュールを生成」をクリックしてください
 ,To Produce,製造
 DocType: Leave Encashment,Payroll,給与
@@ -4427,7 +4436,6 @@
 DocType: Stock Ledger Entry,Actual Qty After Transaction,トランザクションの後、実際の数量
 ,Pending SO Items For Purchase Request,仕入依頼のため保留中の受注アイテム
 apps/erpnext/erpnext/education/doctype/student_admission/student_admission.py,Student Admissions,生徒入学
-apps/erpnext/erpnext/accounts/party.py,{0} {1} is disabled,{0} {1} は無効になっています
 DocType: Supplier,Billing Currency,請求通貨
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py,Extra Large,XL
 DocType: Loan,Loan Application,ローン申し込み
@@ -4504,7 +4512,6 @@
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py,Only Leave Applications with status 'Approved' and 'Rejected' can be submitted,「承認済み」と「拒否」に提出することができる状態でアプリケーションをのみを残します
 apps/erpnext/erpnext/accounts/doctype/accounting_dimension/accounting_dimension.py,Creating Dimensions...,ディメンションを作成しています...
 apps/erpnext/erpnext/education/doctype/student_group_creation_tool/student_group_creation_tool.py,Student Group Name is mandatory in row {0},行 {0} には生徒グループ名が必須です
-DocType: Customer Credit Limit,Bypass credit limit_check,クレジットlimit_checkをバイパス
 DocType: Homepage,Products to be shown on website homepage,ウェブサイトのホームページに表示される製品
 DocType: HR Settings,Password Policy,パスワードポリシー
 apps/erpnext/erpnext/setup/doctype/customer_group/customer_group.js,This is a root customer group and cannot be edited.,ルート（大元の）顧客グループなので編集できません
@@ -4807,6 +4814,7 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py,Row {0}: Advance against Customer must be credit,行{0}：お客様に対する事前クレジットでなければなりません
 DocType: Quality Meeting,Quality Meeting,質の高い会議
 apps/erpnext/erpnext/accounts/doctype/account/account.js,Non-Group to Group,グループに非グループ
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,[設定]&gt; [設定]&gt; [命名シリーズ]で{0}の命名シリーズを設定してください
 DocType: Employee,ERPNext User,ERPNextユーザー
 apps/erpnext/erpnext/education/doctype/student_group_creation_tool/student_group_creation_tool.py,Batch is mandatory in row {0},行{0}にバッチが必須です
 DocType: Company,Default Buying Terms,デフォルトの購入条件
@@ -5101,6 +5109,7 @@
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py,No {0} found for Inter Company Transactions.,会社間取引で{0}は見つかりませんでした。
 DocType: Travel Itinerary,Rented Car,レンタカー
 apps/erpnext/erpnext/public/js/hub/components/profile_dialog.js,About your Company,あなたの会社について
+apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.js,Show Stock Ageing Data,ストックのエージングデータを表示
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py,Credit To account must be a Balance Sheet account,貸方アカウントは貸借対照表アカウントである必要があります
 DocType: Donor,Donor,ドナー
 DocType: Global Defaults,Disable In Words,文字表記無効
@@ -5115,8 +5124,10 @@
 DocType: Practitioner Schedule,Schedule Name,スケジュール名
 apps/erpnext/erpnext/regional/doctype/gstr_3b_report/gstr_3b_report.py,Please enter GSTIN and state for the Company Address {0},会社の住所{0}にGSTINと州を入力してください
 DocType: Currency Exchange,For Buying,買い物
+apps/erpnext/erpnext/setup/default_energy_point_rules.py,On Purchase Order Submission,発注書提出時
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js,Add All Suppliers,すべてのサプライヤーを追加
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py,Row #{0}: Allocated Amount cannot be greater than outstanding amount.,行番号{0}：割り当て金額は未払い金額より大きくすることはできません。
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Customer &gt; Customer Group &gt; Territory,顧客&gt;顧客グループ&gt;テリトリー
 DocType: Tally Migration,Parties,締約国
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js,Browse BOM,部品表（BOM）を表示
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py,Secured Loans,担保ローン
@@ -5148,6 +5159,7 @@
 apps/erpnext/erpnext/stock/doctype/item_alternative/item_alternative.py,Not allow to set alternative item for the item {0},アイテム{0}の代替アイテムを設定できません
 apps/erpnext/erpnext/hr/doctype/leave_block_list/leave_block_list.py,Date is repeated,日付が繰り返されます
 apps/erpnext/erpnext/accounts/print_format/payment_receipt_voucher/payment_receipt_voucher.html,Authorized Signatory,決裁者
+apps/erpnext/erpnext/education/doctype/instructor/instructor.py,Please setup Instructor Naming System in Education &gt; Education Settings,[教育]&gt; [教育設定]でインストラクターの命名システムを設定してください
 apps/erpnext/erpnext/regional/doctype/gstr_3b_report/gstr_3b_report.html,Net ITC Available(A) - (B),利用可能な純ITC（A） - （B）
 apps/erpnext/erpnext/education/doctype/fee_schedule/fee_schedule.js,Create Fees,料金の作成
 DocType: Project,Total Purchase Cost (via Purchase Invoice),総仕入費用（仕入請求書経由）
@@ -5168,6 +5180,7 @@
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.js,Message Sent,送信されたメッセージ
 apps/erpnext/erpnext/accounts/doctype/account/account.py,Account with child nodes cannot be set as ledger,子ノードを持つアカウントは元帳に設定することはできません
 DocType: C-Form,II,II
+apps/erpnext/erpnext/assets/report/fixed_asset_register/fixed_asset_register.py,Vendor Name,業者名
 DocType: Quiz Result,Wrong,違う
 DocType: Sales Invoice,Rate at which Price list currency is converted to customer's base currency,価格表の通貨が顧客の基本通貨に換算されるレート
 DocType: Purchase Invoice Item,Net Amount (Company Currency),正味金額（会社通貨）
@@ -5411,6 +5424,7 @@
 DocType: Stock Settings,Auto Material Request,自動資材要求
 DocType: Woocommerce Settings,API consumer secret,APIコンシューマーシークレット
 DocType: Delivery Note Item,Available Batch Qty at From Warehouse,倉庫内利用可能バッチ数量
+,Received Qty Amount,受け取った数量
 DocType: Salary Slip,Gross Pay - Total Deduction - Loan Repayment,グロスペイ - 合計控除 - ローン返済
 DocType: Bank Account,Last Integration Date,最終統合日
 DocType: Expense Claim,Expense Taxes and Charges,経費税金
@@ -5869,6 +5883,8 @@
 DocType: Drug Prescription,Hour,時
 DocType: Restaurant Order Entry,Last Sales Invoice,最新請求書
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py,Please select Qty against item {0},アイテム{0}に対して数量を選択してください
+apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py,Latest Age,最新の年齢
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js,Transfer Material to Supplier,サプライヤーに資材を配送
 apps/erpnext/erpnext/hr/report/loan_repayment/loan_repayment.py,EMI,EMI
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py,New Serial No cannot have Warehouse. Warehouse must be set by Stock Entry or Purchase Receipt,新しいシリアル番号には倉庫を指定することができません。倉庫は在庫エントリーか領収書によって設定する必要があります
 DocType: Lead,Lead Type,リードタイプ
@@ -5892,7 +5908,6 @@
 apps/erpnext/erpnext/hr/doctype/employee_benefit_application/employee_benefit_application.py,"An amount of {0} already claimed for the component {1},\
 						 set the amount equal or greater than {2}",コンポーネント{1}に対して既に請求されている{0}の額、{2}以上の額を設定する、
 DocType: Shipping Rule,Shipping Rule Conditions,出荷ルール条件
-DocType: Purchase Invoice,Export Type,輸出タイプ
 DocType: Salary Slip Loan,Salary Slip Loan,給与スリップローン
 DocType: BOM Update Tool,The new BOM after replacement,交換後の新しい部品表
 ,Point of Sale,POS
@@ -6012,7 +6027,6 @@
 DocType: Purchase Order Item,Blanket Order Rate,ブランケット注文率
 ,Customer Ledger Summary,顧客元帳サマリー
 apps/erpnext/erpnext/hooks.py,Certification,認証
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js,Are you sure you want to make debit note?,借方メモを作成してよろしいですか？
 DocType: Bank Guarantee,Clauses and Conditions,条項および条項
 DocType: Serial No,Creation Document Type,作成ドキュメントの種類
 DocType: Amazon MWS Settings,ES,ES
@@ -6050,8 +6064,6 @@
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py,Financial Services,金融サービス
 DocType: Student Sibling,Student ID,生徒ID
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.js,For Quantity must be greater than zero,数量はゼロより大きくなければならない
-apps/erpnext/erpnext/hr/doctype/employee_transfer/employee_transfer.py,"Please delete the Employee <a href=""#Form/Employee/{0}"">{0}</a>\
-					to cancel this document","このドキュメントをキャンセルするには、従業員<a href=""#Form/Employee/{0}"">{0}</a> \を削除してください"
 apps/erpnext/erpnext/config/projects.py,Types of activities for Time Logs,時間ログの活動の種類
 DocType: Opening Invoice Creation Tool,Sales,販売
 DocType: Stock Entry Detail,Basic Amount,基本額
@@ -6130,6 +6142,7 @@
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py,Print and Stationery,印刷と文房具
 DocType: Stock Settings,Show Barcode Field,バーコードフィールド表示
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js,Send Supplier Emails,サプライヤーメールを送信
+DocType: Asset Movement,ACC-ASM-.YYYY.-,ACC-ASM-.YYYY.-
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py,"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,自動作成
 apps/erpnext/erpnext/hr/doctype/employee_onboarding/employee_onboarding.py,Submit this to create the Employee record,これを送信して従業員レコードを作成する
@@ -6207,7 +6220,6 @@
 DocType: Sales Team,Contact No.,連絡先番号
 apps/erpnext/erpnext/templates/includes/cart/cart_address.html,Billing Address is same as Shipping Address,請求先住所は配送先住所と同じです
 DocType: Bank Reconciliation,Payment Entries,支払エントリ
-apps/erpnext/erpnext/erpnext_integrations/doctype/shopify_settings/shopify_settings.py,Access token or Shopify URL missing,アクセストークンまたはShopify URLがありません
 DocType: Location,Latitude,緯度
 DocType: Work Order,Scrap Warehouse,スクラップ倉庫
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py,"Warehouse required at Row No {0}, please set default warehouse for the item {1} for the company {2}",行番号{0}に倉庫が必要です。会社{2}のアイテム{1}のデフォルト倉庫を設定してください。
@@ -6250,7 +6262,6 @@
 DocType: Job Offer Term,Value / Description,値／説明
 apps/erpnext/erpnext/controllers/accounts_controller.py,"Row #{0}: Asset {1} cannot be submitted, it is already {2}",行#{0}：資産{1}は{2}であるため提出することができません
 DocType: Tax Rule,Billing Country,請求先の国
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js,Are you sure you want to make credit note?,クレジットメモを作成してもよろしいですか？
 DocType: Purchase Order Item,Expected Delivery Date,配送予定日
 DocType: Restaurant Order Entry,Restaurant Order Entry,レストランオーダーエントリー
 apps/erpnext/erpnext/accounts/general_ledger.py,Debit and Credit not equal for {0} #{1}. Difference is {2}.,{0} #{1}の借方と貸方が等しくありません。差は{2} です。
@@ -6375,6 +6386,7 @@
 DocType: Purchase Invoice,Taxes and Charges Added,租税公課が追加されました。
 apps/erpnext/erpnext/assets/doctype/asset/asset.py,Depreciation Row {0}: Next Depreciation Date cannot be before Available-for-use Date,減価償却行{0}：次の減価償却日は、使用可能日前にすることはできません
 ,Sales Funnel,セールスファネル
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Item Code &gt; Item Group &gt; Brand,商品コード&gt;商品グループ&gt;ブランド
 apps/erpnext/erpnext/setup/doctype/company/company.py,Abbreviation is mandatory,略称は必須です
 DocType: Project,Task Progress,タスクの進捗状況
 apps/erpnext/erpnext/templates/includes/navbar/navbar_items.html,Cart,カート
@@ -6619,6 +6631,7 @@
 DocType: Employee Grade,Employee Grade,従業員グレード
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py,Piecework,出来高制
 DocType: GSTR 3B Report,June,六月
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Supplier &gt; Supplier Type,サプライヤ&gt;サプライヤタイプ
 DocType: Share Balance,From No,〜から
 DocType: Shift Type,Early Exit Grace Period,早期終了猶予期間
 DocType: Task,Actual Time (in Hours),実際の時間（時）
@@ -6901,6 +6914,7 @@
 DocType: Warehouse,Warehouse Name,倉庫名
 DocType: Naming Series,Select Transaction,取引を選択
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py,Please enter Approving Role or Approving User,「役割承認」または「ユーザー承認」を入力してください
+apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.py,UOM Conversion factor ({0} -&gt; {1}) not found for item: {2},アイテムのUOM換算係数（{0}-&gt; {1}）が見つかりません：{2}
 apps/erpnext/erpnext/support/doctype/service_level_agreement/service_level_agreement.py,Service Level Agreement with Entity Type {0} and Entity {1} already exists.,エンティティタイプ{0}とエンティティ{1}のサービスレベル契約が既に存在します。
 DocType: Journal Entry,Write Off Entry,償却エントリ
 DocType: BOM,Rate Of Materials Based On,資材単価基準
@@ -7091,6 +7105,7 @@
 DocType: Quality Inspection Reading,Quality Inspection Reading,品質検査報告要素
 apps/erpnext/erpnext/stock/doctype/stock_settings/stock_settings.py,`Freeze Stocks Older Than` should be smaller than %d days.,「〜より古い在庫を凍結する」は %d 日よりも小さくしなくてはなりません
 DocType: Tax Rule,Purchase Tax Template,購入税テンプレート
+apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py,Earliest Age,最古の時代
 apps/erpnext/erpnext/utilities/user_progress.py,Set a sales goal you'd like to achieve for your company.,あなたの会社に達成したいセールス目標を設定します。
 DocType: Quality Goal,Revision,リビジョン
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js,Healthcare Services,ヘルスケアサービス
@@ -7134,6 +7149,7 @@
 apps/erpnext/erpnext/healthcare/doctype/patient_encounter/patient_encounter.js,Schedule Discharge,放電のスケジュール
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py,Cheques and Deposits incorrectly cleared,小切手及び預金が不正にクリア
 DocType: Homepage Section Card,Homepage Section Card,ホームページ課カード
+,Amount To Be Billed,請求額
 apps/erpnext/erpnext/accounts/doctype/account/account.py,Account {0}: You can not assign itself as parent account,アカウント{0}：自身を親アカウントに割当することはできません
 DocType: Purchase Invoice Item,Price List Rate,価格表単価
 apps/erpnext/erpnext/utilities/activation.py,Create customer quotes,顧客の引用符を作成します。
@@ -7186,6 +7202,7 @@
 DocType: Supplier Scorecard Criteria,Supplier Scorecard Criteria,サプライヤのスコアカード基準
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py,Please select Start Date and End Date for Item {0},アイテム{0}の開始日と終了日を選択してください
 DocType: Maintenance Schedule,MAT-MSH-.YYYY.-,MAT-MSH-.YYYY.-
+,Amount to Receive,受け取る量
 apps/erpnext/erpnext/education/doctype/student_group_creation_tool/student_group_creation_tool.py,Course is mandatory in row {0},コースは、行{0}に必須です
 apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py,From date can not be greater than than To date,開始日は終了日より大きくすることはできません
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py,To date cannot be before from date,終了日を開始日の前にすることはできません
@@ -7435,7 +7452,6 @@
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js,BOM and Manufacturing Quantity are required,部品表と生産数量が必要です
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js,Ageing Range 2,エイジングレンジ２
 DocType: SG Creation Tool Course,Max Strength,最大強度
-apps/erpnext/erpnext/accounts/doctype/account/account.py,"Account {0} already exists in child company {1}. The following fields have different values, they should be same:<ul><li>{2}</li></ul>",アカウント{0}は既に子会社{1}に存在します。次のフィールドには異なる値があり、同じである必要があります。 <ul><li> {2} </li></ul>
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py,Installing presets,プリセットのインストール
 DocType: Fee Schedule,EDU-FSH-.YYYY.-,EDU-FSH-.YYYY.-
 apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js,No Delivery Note selected for Customer {},顧客{}の配達メモが選択されていません
@@ -7643,6 +7659,7 @@
 DocType: Delivery Note,Print Without Amount,金額なしで印刷
 apps/erpnext/erpnext/accounts/report/asset_depreciation_ledger/asset_depreciation_ledger.py,Depreciation Date,減価償却日
 ,Work Orders in Progress,作業オーダーの進行中
+DocType: Customer Credit Limit,Bypass Credit Limit Check,与信限度確認のバイパス
 DocType: Issue,Support Team,サポートチーム
 apps/erpnext/erpnext/stock/report/batch_item_expiry_status/batch_item_expiry_status.py,Expiry (In Days),有効期限（日数）
 DocType: Appraisal,Total Score (Out of 5),総得点（5点満点）
@@ -7826,6 +7843,7 @@
 DocType: Sales Invoice,Customer GSTIN,顧客GSTIN
 DocType: Crop Cycle,List of diseases detected on the field. When selected it'll automatically add a list of tasks to deal with the disease ,フィールドで検出された病気のリスト。選択すると、病気に対処するためのタスクのリストが自動的に追加されます
 apps/erpnext/erpnext/manufacturing/page/bom_comparison_tool/bom_comparison_tool.js,BOM 1,BOM 1
+apps/erpnext/erpnext/assets/report/fixed_asset_register/fixed_asset_register.py,Asset Id,資産ID
 apps/erpnext/erpnext/healthcare/doctype/healthcare_service_unit/healthcare_service_unit.js,This is a root healthcare service unit and cannot be edited.,これは根本的な医療サービス単位であり、編集することはできません。
 DocType: Asset Repair,Repair Status,修理状況
 apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.js,"Requested Qty: Quantity requested for purchase, but not ordered.",要求数量：仕入のために数量が要求されましたが、注文されていません。
diff --git a/erpnext/translations/km.csv b/erpnext/translations/km.csv
index af4c1b3..ca381fd 100644
--- a/erpnext/translations/km.csv
+++ b/erpnext/translations/km.csv
@@ -287,7 +287,6 @@
 DocType: Loan,Repay Over Number of Periods,សងចំនួនជាងនៃរយៈពេល
 apps/erpnext/erpnext/manufacturing/report/bom_stock_report/bom_stock_report.py,Quantity to Produce can not be less than Zero,បរិមាណនៃការផលិតមិនអាចតិចជាងសូន្យទេ។
 DocType: Stock Entry,Additional Costs,ការចំណាយបន្ថែមទៀត
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Customer &gt; Customer Group &gt; Territory,អតិថិជន&gt; ក្រុមអតិថិជន&gt; ទឹកដី។
 apps/erpnext/erpnext/accounts/doctype/account/account.py,Account with existing transaction can not be converted to group.,គណនីប្រតិបត្តិការដែលមានស្រាប់ដែលមិនអាចត្រូវបានបម្លែងទៅជាក្រុម។
 DocType: Lead,Product Enquiry,ផលិតផលសំណួរ
 DocType: Education Settings,Validate Batch for Students in Student Group,ធ្វើឱ្យមានសុពលភាពបាច់សម្រាប់សិស្សនិស្សិតនៅក្នុងពូល
@@ -584,6 +583,7 @@
 DocType: Healthcare Settings,Create documents for sample collection,បង្កើតឯកសារសម្រាប់ការប្រមូលគំរូ
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py,Payment against {0} {1} cannot be greater than Outstanding Amount {2},ការទូទាត់ប្រឆាំងនឹង {0} {1} មិនអាចត្រូវបានធំជាងឆ្នើមចំនួន {2}
 apps/erpnext/erpnext/patches/v11_0/add_healthcare_service_unit_tree_root.py,All Healthcare Service Units,គ្រប់អង្គភាពសេវាកម្មសុខភាព
+apps/erpnext/erpnext/setup/default_energy_point_rules.py,On Converting Opportunity,ស្តីពីការផ្លាស់ប្តូរឱកាស។
 DocType: Bank Account,Address HTML,អាសយដ្ឋានរបស់ HTML
 DocType: Lead,Mobile No.,លេខទូរស័ព្ទចល័ត
 apps/erpnext/erpnext/selling/doctype/pos_closing_voucher/closing_voucher_details.html,Mode of Payments,របៀបបង់ប្រាក់
@@ -648,7 +648,6 @@
 DocType: Accounting Dimension,Dimension Name,ឈ្មោះវិមាត្រ។
 apps/erpnext/erpnext/healthcare/setup.py,Resistant,មានភាពធន់ទ្រាំ
 apps/erpnext/erpnext/hotels/doctype/hotel_room_reservation/hotel_room_reservation.py,Please set Hotel Room Rate on {},សូមកំណត់តម្លៃបន្ទប់សណ្ឋាគារលើ {}
-apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py,Please setup numbering series for Attendance via Setup &gt; Numbering Series,សូមរៀបចំស៊េរីលេខរៀងសម្រាប់ការចូលរួមតាមរយៈតំឡើង&gt; លេខរៀង។
 DocType: Journal Entry,Multi Currency,រូបិយប័ណ្ណពហុ
 DocType: Bank Statement Transaction Invoice Item,Invoice Type,ប្រភេទវិក័យប័ត្រ
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py,Valid from date must be less than valid upto date,មានសុពលភាពចាប់ពីកាលបរិច្ឆេទត្រូវតែតិចជាងកាលបរិច្ឆេទដែលមានសុពលភាព។
@@ -762,6 +761,7 @@
 apps/erpnext/erpnext/accounts/page/pos/pos.js,Create a new Customer,បង្កើតអតិថិជនថ្មី
 apps/erpnext/erpnext/non_profit/report/expiring_memberships/expiring_memberships.py,Expiring On,ផុតកំណត់នៅថ្ងៃទី
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,"If multiple Pricing Rules continue to prevail, users are asked to set Priority manually to resolve conflict.","បើសិនជាវិធានការបន្តតម្លៃជាច្រើនដែលមានជ័យជំនះ, អ្នកប្រើត្រូវបានសួរដើម្បីកំណត់អាទិភាពដោយដៃដើម្បីដោះស្រាយជម្លោះ។"
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js,Purchase Return,ត្រឡប់ទិញ
 apps/erpnext/erpnext/utilities/activation.py,Create Purchase Orders,បង្កើតបញ្ជាទិញ
 ,Purchase Register,ទិញចុះឈ្មោះ
 apps/erpnext/erpnext/healthcare/doctype/patient/patient.py,Patient not found,រកមិនឃើញអ្នកជម្ងឺ
@@ -777,7 +777,6 @@
 DocType: Location,Area UOM,តំបន់ UOM
 apps/erpnext/erpnext/manufacturing/doctype/workstation/workstation.py,Workstation is closed on the following dates as per Holiday List: {0},ស្ថានីយការងារត្រូវបានបិទនៅលើកាលបរិច្ឆេទដូចខាងក្រោមដូចជាក្នុងបញ្ជីថ្ងៃឈប់សម្រាក: {0}
 apps/erpnext/erpnext/selling/page/sales_funnel/sales_funnel.py,Opportunities,ឱកាសការងារ
-apps/erpnext/erpnext/www/all-products/index.html,Clear filters,សម្អាតតម្រង។
 DocType: Lab Test Template,Single,នៅលីវ
 DocType: Compensatory Leave Request,Work From Date,ធ្វើការពីកាលបរិច្ឆេទ
 DocType: Salary Slip,Total Loan Repayment,សងប្រាក់កម្ចីសរុប
@@ -820,6 +819,7 @@
 DocType: Account,Old Parent,ឪពុកម្តាយចាស់
 apps/erpnext/erpnext/education/doctype/program_enrollment_tool/program_enrollment_tool.py,Mandatory field - Academic Year,វាលដែលចាំបាច់ - ឆ្នាំសិក្សា
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py,{0} {1} is not associated with {2} {3},{0} {1} មិនត្រូវបានភ្ជាប់ជាមួយនឹង {2} {3}
+DocType: Opportunity,Converted By,បំលែងដោយ។
 apps/erpnext/erpnext/public/js/hub/components/ReviewArea.vue,You need to login as a Marketplace User before you can add any reviews.,អ្នកត្រូវចូលជាអ្នកប្រើប្រាស់ទីផ្សារមុនពេលអ្នកអាចបន្ថែមការពិនិត្យឡើងវិញណាមួយ។
 apps/erpnext/erpnext/manufacturing/doctype/job_card/job_card.py,Row {0} : Operation is required against the raw material item {1},ជួរដេក {0}: ប្រតិបត្តិការត្រូវបានទាមទារប្រឆាំងនឹងវត្ថុធាតុដើម {1}
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py,Please set default payable account for the company {0},សូមកំណត់លំនាំដើមសម្រាប់គណនីបង់ក្រុមហ៊ុននេះបាន {0}
@@ -845,6 +845,8 @@
 DocType: BOM,Work Order,លំដាប់ការងារ
 DocType: Sales Invoice,Total Qty,សរុប Qty
 apps/erpnext/erpnext/education/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py,Guardian2 Email ID,លេខសម្គាល់អ៊ីមែល Guardian2
+apps/erpnext/erpnext/hr/doctype/employee_transfer/employee_transfer.py,"Please delete the Employee <a href=""#Form/Employee/{0}"">{0}</a>\
+					to cancel this document","សូមលុបនិយោជិក <a href=""#Form/Employee/{0}"">{0}</a> \ ដើម្បីលុបចោលឯកសារនេះ។"
 DocType: Item,Show in Website (Variant),បង្ហាញក្នុងវេបសាយ (វ៉ារ្យង់)
 DocType: Employee,Health Concerns,ការព្រួយបារម្ភសុខភាព
 DocType: Payroll Entry,Select Payroll Period,ជ្រើសរយៈពេលបើកប្រាក់បៀវត្ស
@@ -901,7 +903,6 @@
 apps/erpnext/erpnext/education/doctype/student_group/student_group.py,Please select Course,សូមជ្រើសវគ្គសិក្សា
 DocType: Codification Table,Codification Table,តារាងកំណត់កូដកម្ម
 DocType: Timesheet Detail,Hrs,ម៉ោង
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js,Please select Company,សូមជ្រើសរើសក្រុមហ៊ុន
 DocType: Employee Skill,Employee Skill,ជំនាញបុគ្គលិក។
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.js,Difference Account,គណនីមានភាពខុសគ្នា
 DocType: Pricing Rule,Discount on Other Item,ការបញ្ចុះតម្លៃលើរបស់របរផ្សេងៗ។
@@ -969,6 +970,7 @@
 DocType: BOM,Operating Cost,ចំណាយប្រតិបត្តិការ
 DocType: Crop,Produced Items,ផលិតធាតុ
 DocType: Bank Statement Transaction Entry,Match Transaction to Invoices,ផ្គូផ្គងប្រតិបត្តិការទៅនឹងវិក្កយបត្រ
+apps/erpnext/erpnext/erpnext_integrations/exotel_integration.py,Error in Exotel incoming call,កំហុសក្នុងការហៅចូល Exotel ។
 DocType: Sales Order Item,Gross Profit,ប្រាក់ចំណេញដុល
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js,Unblock Invoice,មិនទប់ស្កាត់វិក្កយបត្រ
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py,Increment cannot be 0,ចំនួនបន្ថែមមិនអាចត្រូវបាន 0
@@ -1181,6 +1183,7 @@
 DocType: Activity Cost,Activity Type,ប្រភេទសកម្មភាព
 DocType: Request for Quotation,For individual supplier,សម្រាប់ផ្គត់ផ្គង់បុគ្គល
 DocType: BOM Operation,Base Hour Rate(Company Currency),អត្រាហួរមូលដ្ឋាន (ក្រុមហ៊ុនរូបិយប័ណ្ណ)
+,Qty To Be Billed,Qty ត្រូវបានចេញវិក្កយបត្រ។
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py,Delivered Amount,ចំនួនទឹកប្រាក់ដែលបានបញ្ជូន
 apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.js,Reserved Qty for Production: Raw materials quantity to make manufacturing items.,Qty ដែលបានបម្រុងទុកសម្រាប់ផលិតកម្ម៖ បរិមាណវត្ថុធាតុដើមដើម្បីផលិតរបស់របរ។
 DocType: Loyalty Point Entry Redemption,Redemption Date,កាលបរិច្ឆេទការប្រោសលោះ
@@ -1298,7 +1301,7 @@
 DocType: Sales Invoice,Commission Rate (%),អត្រាប្រាក់កំរៃ (%)
 apps/erpnext/erpnext/education/doctype/student_group/student_group.py,Please select Program,សូមជ្រើសកម្មវិធី
 DocType: Project,Estimated Cost,តំលៃ
-DocType: Request for Quotation,Link to material requests,តំណភ្ជាប់ទៅនឹងសំណើសម្ភារៈ
+DocType: Supplier Quotation,Link to material requests,តំណភ្ជាប់ទៅនឹងសំណើសម្ភារៈ
 apps/erpnext/erpnext/public/js/hub/pages/Publish.vue,Publish,ផ្សាយ
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py,Aerospace,អវកាស
 ,Fichier des Ecritures Comptables [FEC],ឯកសារស្តីអំពីការសរសេរឯកសាររបស់អ្នកនិពន្ធ [FEC]
@@ -1311,6 +1314,7 @@
 apps/erpnext/erpnext/utilities/transaction_base.py,Invalid Posting Time,ពេលប្រកាសមិនត្រឹមត្រូវ
 DocType: Salary Component,Condition and Formula,លក្ខខណ្ឌនិងរូបមន្ត
 DocType: Lead,Campaign Name,ឈ្មោះយុទ្ធនាការឃោសនា
+apps/erpnext/erpnext/setup/default_energy_point_rules.py,On Task Completion,នៅលើការបំពេញភារកិច្ច។
 apps/erpnext/erpnext/hr/doctype/compensatory_leave_request/compensatory_leave_request.py,There is no leave period in between {0} and {1},មិនមានរយៈពេលឈប់នៅចន្លោះ {0} និង {1} ទេ។
 DocType: Fee Validity,Healthcare Practitioner,អ្នកថែទាំសុខភាព
 DocType: Hotel Room,Capacity,សមត្ថភាព
@@ -1654,7 +1658,6 @@
 DocType: Quality Feedback Template,Quality Feedback Template,គំរូមតិយោបល់គុណភាព។
 apps/erpnext/erpnext/config/education.py,LMS Activity,សកម្មភាព LMS ។
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py,Internet Publishing,ការបោះពុម្ពអ៊ីធឺណិត
-DocType: Prescription Duration,Number,ចំនួន
 apps/erpnext/erpnext/accounts/doctype/opening_invoice_creation_tool/opening_invoice_creation_tool.js,Creating {0} Invoice,បង្កើត {0} វិក័យប័ត្រ
 DocType: Medical Code,Medical Code Standard,ស្តង់ដារវេជ្ជសាស្ត្រ
 DocType: Soil Texture,Clay Composition (%),សមាសធាតុដីឥដ្ឋ (%)
@@ -1729,6 +1732,7 @@
 DocType: Support Settings,Get Started Sections,ចាប់ផ្តើមផ្នែក
 DocType: Lead,CRM-LEAD-.YYYY.-,CRM-LEAD -YYYY.-
 DocType: Invoice Discounting,Sanctioned,អនុញ្ញាត
+,Base Amount,ចំនួនទឹកប្រាក់មូលដ្ឋាន។
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.js,Total Contribution Amount: {0},បរិមាណវិភាគទានសរុប: {0}
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py,Row #{0}: Please specify Serial No for Item {1},ជួរដេក # {0}: សូមបញ្ជាក់សម្រាប់ធាតុសៀរៀលគ្មាន {1}
 DocType: Payroll Entry,Salary Slips Submitted,តារាងប្រាក់ខែដែលបានដាក់ស្នើ
@@ -1946,6 +1950,7 @@
 apps/erpnext/erpnext/utilities/user_progress.py,List a few of your suppliers. They could be organizations or individuals.,រាយមួយចំនួននៃការផ្គត់ផ្គង់របស់អ្នក។ ពួកគេអាចត្រូវបានអង្គការឬបុគ្គល។
 DocType: Accounting Dimension,Dimension Defaults,លំនាំដើមវិមាត្រ។
 apps/erpnext/erpnext/crm/report/prospects_engaged_but_not_converted/prospects_engaged_but_not_converted.js,Minimum Lead Age (Days),អ្នកដឹកនាំការកំរិតអាយុអប្បបរមា (ថ្ងៃ)
+apps/erpnext/erpnext/assets/report/fixed_asset_register/fixed_asset_register.py,Available For Use Date,អាចប្រើបានសម្រាប់កាលបរិច្ឆេទប្រើប្រាស់។
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py,All BOMs,BOMs ទាំងអស់
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js,Create Inter Company Journal Entry,បង្កើតធាតុទិនានុប្បវត្តិក្រុមហ៊ុនអន្តរជាតិ។
 DocType: Company,Parent Company,ក្រុមហ៊ុនមេ
@@ -2010,6 +2015,7 @@
 ,IRS 1099,អាយ។ អេស ១០៩៩ ។
 DocType: Salary Slip,Leave Without Pay,ទុកឱ្យដោយគ្មានការបង់
 DocType: Payment Request,Outward,ចេញ
+apps/erpnext/erpnext/setup/default_energy_point_rules.py,On {0} Creation,នៅលើ {0} ការបង្កើត។
 apps/erpnext/erpnext/regional/doctype/gstr_3b_report/gstr_3b_report.html,State/UT Tax,ពន្ធរដ្ឋ / យូ។ ធី
 ,Trial Balance for Party,អង្គជំនុំតុល្យភាពសម្រាប់ការគណបក្ស
 ,Gross and Net Profit Report,របាយការណ៍ប្រាក់ចំណេញដុលនិងសុទ្ធ។
@@ -2124,6 +2130,7 @@
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js,Make Stock Entry,ធ្វើឱ្យធាតុចូល។
 DocType: Hotel Room Reservation,Hotel Reservation User,អ្នកប្រើប្រាស់កក់សណ្ឋាគារ
 apps/erpnext/erpnext/projects/doctype/project/project.js,Set Status,កំណត់ស្ថានភាព។
+apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py,Please setup numbering series for Attendance via Setup &gt; Numbering Series,សូមរៀបចំស៊េរីលេខរៀងសម្រាប់ការចូលរួមតាមរយៈតំឡើង&gt; លេខរៀង។
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py,Please select prefix first,សូមជ្រើសបុព្វបទជាលើកដំបូង
 DocType: Contract,Fulfilment Deadline,ថ្ងៃផុតកំណត់
 apps/erpnext/erpnext/public/js/hub/pages/Home.vue,Near you,នៅក្បែរអ្នក។
@@ -2139,6 +2146,7 @@
 DocType: Announcement,All Students,និស្សិតទាំងអស់
 apps/erpnext/erpnext/assets/doctype/asset/asset.py,Item {0} must be a non-stock item,ធាតុ {0} ត្រូវតែជាធាតុដែលមិនមានភាគហ៊ុន
 apps/erpnext/erpnext/stock/doctype/batch/batch.js,View Ledger,មើលសៀវភៅ
+DocType: Cost Center,Lft,Lft
 DocType: Grading Scale,Intervals,ចន្លោះពេល
 DocType: Bank Statement Transaction Entry,Reconciled Transactions,ប្រតិបត្តិការផ្សះផ្សា
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py,Earliest,ដំបូងបំផុត
@@ -2254,6 +2262,7 @@
 apps/erpnext/erpnext/hr/doctype/employee_benefit_application/employee_benefit_application.py,As per your assigned Salary Structure you cannot apply for benefits,តាមរចនាសម្ព័ន្ធប្រាក់ខែដែលបានកំណត់អ្នកមិនអាចស្នើសុំអត្ថប្រយោជន៍បានទេ
 apps/erpnext/erpnext/stock/doctype/item/item.py,Website Image should be a public file or website URL,វេបសាយរូបភាពគួរតែជាឯកសារសាធារណៈឬគេហទំព័ររបស់ URL
 DocType: Purchase Invoice Item,BOM,Bom
+apps/erpnext/erpnext/stock/doctype/item/item.py,Duplicate entry in Manufacturers table,ធាតុស្ទួននៅក្នុងតារាងក្រុមហ៊ុនផលិត។
 apps/erpnext/erpnext/setup/doctype/item_group/item_group.js,This is a root item group and cannot be edited.,នេះគឺជាក្រុមមួយដែលធាតុ root និងមិនអាចត្រូវបានកែសម្រួល។
 apps/erpnext/erpnext/accounts/doctype/account/account.js,Merge,បញ្ចូលចូលគ្នា
 DocType: Journal Entry Account,Purchase Order,ការបញ្ជាទិញ
@@ -2398,7 +2407,6 @@
 DocType: Asset,Depreciation Schedules,កាលវិភាគរំលស់
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.js,Create Sales Invoice,បង្កើតវិក្កយបត្រលក់។
 apps/erpnext/erpnext/regional/doctype/gstr_3b_report/gstr_3b_report.html,Ineligible ITC,អាយធីស៊ីមិនមានលក្ខណៈសម្បត្តិគ្រប់គ្រាន់។
-apps/erpnext/erpnext/erpnext_integrations/doctype/shopify_settings/shopify_settings.py,"Support for public app is deprecated. Please setup private app, for more details refer user manual",ការគាំទ្រកម្មវិធីសាធារណៈត្រូវបានបដិសេធ។ សូមដំឡើងកម្មវិធីឯកជនសម្រាប់ព័ត៌មានលំអិតសូមមើលសៀវភៅដៃអ្នកប្រើ
 DocType: Task,Dependent Tasks,ភារកិច្ចដែលពឹងផ្អែក។
 apps/erpnext/erpnext/regional/report/gstr_1/gstr_1.py,Following accounts might be selected in GST Settings:,គណនីខាងក្រោមអាចត្រូវបានជ្រើសរើសនៅក្នុងការកំណត់ GST:
 apps/erpnext/erpnext/manufacturing/report/bom_stock_report/bom_stock_report.js,Quantity to Produce,បរិមាណផលិត។
@@ -2647,6 +2655,7 @@
 DocType: Water Analysis,Container,កុងតឺន័រ
 apps/erpnext/erpnext/regional/report/gstr_1/gstr_1.py,Please set valid GSTIN No. in Company Address,សូមកំនត់លេខ GSTIN ដែលមានសុពលភាពនៅក្នុងអាស័យដ្ឋានក្រុមហ៊ុន។
 apps/erpnext/erpnext/education/utils.py,Student {0} - {1} appears Multiple times in row {2} & {3},សិស្ស {0} - {1} ហាក់ដូចជាដងច្រើនក្នុងជួរ {2} និង {3}
+apps/erpnext/erpnext/selling/doctype/customer/customer.py,Following fields are mandatory to create address:,ប្រអប់ខាងក្រោមគឺចាំបាច់ដើម្បីបង្កើតអាសយដ្ឋាន៖
 DocType: Item Alternative,Two-way,ពីរផ្លូវ
 DocType: Item,Manufacturers,ក្រុមហ៊ុនផលិត។
 apps/erpnext/erpnext/accounts/deferred_revenue.py,Error while processing deferred accounting for {0},មានកំហុសខណៈពេលដំណើរការគណនេយ្យពន្យាសម្រាប់ {0}
@@ -2721,9 +2730,9 @@
 DocType: Employee,HR-EMP-,HR-EMP-
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py,User {0} doesn't have any default POS Profile. Check Default at Row {1} for this User.,អ្នកប្រើ {0} មិនមានប្រវត្តិរូប POS លំនាំដើមទេ។ ពិនិត្យមើលលំនាំដើមនៅជួរដេក {1} សម្រាប់អ្នកប្រើនេះ។
 DocType: Quality Meeting Minutes,Quality Meeting Minutes,នាទីប្រជុំគុណភាព។
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Supplier &gt; Supplier Type,អ្នកផ្គត់ផ្គង់&gt; ប្រភេទអ្នកផ្គត់ផ្គង់។
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py,Employee Referral,ការបញ្ជូនបុគ្គលិក
 DocType: Student Group,Set 0 for no limit,កំណត់ 0 សម្រាប់គ្មានដែនកំណត់
+DocType: Cost Center,rgt,rgt
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py,The day(s) on which you are applying for leave are holidays. You need not apply for leave.,ថ្ងៃនេះ (s) បាននៅលើដែលអ្នកកំពុងដាក់ពាក្យសុំឈប់សម្រាកគឺជាថ្ងៃឈប់សម្រាក។ អ្នកត្រូវការត្រូវបានអនុវត្តសម្រាប់ការឈប់សម្រាក។
 DocType: Customer,Primary Address and Contact Detail,អាសយដ្ឋានបឋមសិក្សានិងព័ត៌មានទំនាក់ទំនង
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.js,Resend Payment Email,ផ្ញើការទូទាត់អ៊ីម៉ែល
@@ -2833,7 +2842,6 @@
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py,Against Supplier Invoice {0} dated {1},ប្រឆាំងនឹងការផ្គត់ផ្គង់វិក័យប័ត្រ {0} {1} ចុះកាលបរិច្ឆេទ
 DocType: Customer,Default Price List,តារាងតម្លៃលំនាំដើម
 apps/erpnext/erpnext/assets/doctype/asset/asset.py,Asset Movement record {0} created,កំណត់ត្រាចលនាទ្រព្យសកម្ម {0} បង្កើតឡើង
-apps/erpnext/erpnext/utilities/page/leaderboard/leaderboard.js,No items found.,មិនមែនមុខទំនិញ
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py,You cannot delete Fiscal Year {0}. Fiscal Year {0} is set as default in Global Settings,អ្នកមិនអាចលុបឆ្នាំសារពើពន្ធ {0} ។ ឆ្នាំសារពើពន្ធ {0} ត្រូវបានកំណត់ជាលំនាំដើមនៅក្នុងការកំណត់សកល
 DocType: Share Transfer,Equity/Liability Account,គណនីសមធម៌ / ការទទួលខុសត្រូវ
 apps/erpnext/erpnext/setup/doctype/customer_group/customer_group.py,A customer with the same name already exists,អតិថិជនដែលមានឈ្មោះដូចគ្នាមានរួចហើយ
@@ -2849,6 +2857,7 @@
 apps/erpnext/erpnext/selling/doctype/customer/customer.py,Credit limit has been crossed for customer {0} ({1}/{2}),ការកំណត់ឥណទានត្រូវបានឆ្លងកាត់សម្រាប់អតិថិជន {0} ({1} / {2})
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py,Customer required for 'Customerwise Discount',អតិថិជនដែលបានទាមទារសម្រាប់ &#39;បញ្ចុះតម្លៃ Customerwise &quot;
 apps/erpnext/erpnext/config/accounting.py,Update bank payment dates with journals.,ធ្វើឱ្យទាន់សម័យកាលបរិច្ឆេទទូទាត់ប្រាក់ធនាគារដែលទិនានុប្បវត្តិ។
+,Billed Qty,បានទូទាត់ Qty ។
 apps/erpnext/erpnext/stock/doctype/item/item_dashboard.py,Pricing,ការកំណត់តម្លៃ
 DocType: Employee,Attendance Device ID (Biometric/RF tag ID),លេខសម្គាល់ឧបករណ៍ចូលរួម (លេខសម្គាល់ស្លាកជីវមាត្រ / RF)
 DocType: Quotation,Term Details,ពត៌មានលំអិតរយៈពេល
@@ -2870,6 +2879,7 @@
 DocType: Share Transfer,Asset Account,គណនីទ្រព្យសកម្ម
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js,New release date should be in the future,កាលបរិច្ឆេទចេញផ្សាយថ្មីគួរតែមាននៅពេលអនាគត។
 DocType: Purchase Invoice,End date of current invoice's period,កាលបរិច្ឆេទបញ្ចប់នៃរយៈពេលបច្ចុប្បន្នរបស់វិក័យប័ត្រ
+apps/erpnext/erpnext/hr/doctype/employee/employee.py,Please setup Employee Naming System in Human Resource &gt; HR Settings,សូមរៀបចំប្រព័ន្ធដាក់ឈ្មោះបុគ្គលិកនៅក្នុងធនធានមនុស្ស&gt; ធនធានមនុស្ស។
 DocType: Lab Test,Technician Name,ឈ្មោះអ្នកបច្ចេកទេស
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py,"Cannot ensure delivery by Serial No as \
 					Item {0} is added with and without Ensure Delivery by \
@@ -2877,6 +2887,7 @@
 DocType: Accounts Settings,Unlink Payment on Cancellation of Invoice,ដោះតំណទូទាត់វិក័យប័ត្រនៅលើការលុបចោល
 DocType: Bank Reconciliation,From Date,ពីកាលបរិច្ឆេទ
 apps/erpnext/erpnext/hr/doctype/vehicle_log/vehicle_log.py,Current Odometer reading entered should be greater than initial Vehicle Odometer {0},បច្ចុប្បន្នប្រដាប់វាស់ចម្ងាយបានចូលអានគួរតែត្រូវបានរថយន្តធំជាងដំបូង {0} ប្រដាប់វាស់ចម្ងាយ
+,Purchase Order Items To Be Received or Billed,វត្ថុបញ្ជាទិញដែលត្រូវទទួលឬទូទាត់ប្រាក់។
 DocType: Restaurant Reservation,No Show,គ្មានការបង្ហាញ
 apps/erpnext/erpnext/regional/india/utils.py,You must be a registered supplier to generate e-Way Bill,អ្នកត្រូវតែជាអ្នកផ្គត់ផ្គង់ដែលបានចុះឈ្មោះដើម្បីបង្កើតវិក្កយបត្រអេឡិចត្រូនិច។
 DocType: Shipping Rule Country,Shipping Rule Country,វិធានការដឹកជញ្ជូនក្នុងប្រទេស
@@ -2919,6 +2930,7 @@
 apps/erpnext/erpnext/templates/generators/item/item_add_to_cart.html,View in Cart,មើលក្នុងកន្ត្រកទំនិញ
 DocType: Employee Checkin,Shift Actual Start,ផ្លាស់ប្តូរការចាប់ផ្តើមជាក់ស្តែង។
 DocType: Tally Migration,Is Day Book Data Imported,តើទិន្នន័យសៀវភៅត្រូវបាននាំចូលទេ។
+,Purchase Order Items To Be Received or Billed1,ធាតុបញ្ជាទិញដែលត្រូវទទួលឬចេញវិក្កយបត្រ ១ ។
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py,Marketing Expenses,ចំណាយទីផ្សារ
 ,Item Shortage Report,របាយការណ៍កង្វះធាតុ
 DocType: Bank Transaction Payments,Bank Transaction Payments,ការទូទាត់ប្រតិបត្តិការធនាគារ។
@@ -3141,7 +3153,6 @@
 apps/erpnext/erpnext/public/js/call_popup/call_popup.js,View all issues from {0},មើលបញ្ហាទាំងអស់ពី {0}
 DocType: Quality Inspection,MAT-QA-.YYYY.-,MAT-QA-YYYY.-
 DocType: Quality Meeting Table,Quality Meeting Table,តារាងប្រជុំគុណភាព។
-apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,សូមកំណត់ឈ្មោះដាក់ឈ្មោះសំរាប់ {0} តាមរយៈតំឡើង&gt; ការកំណត់&gt; តំរុយឈ្មោះ។
 apps/erpnext/erpnext/templates/pages/help.html,Visit the forums,ទស្សនាវេទិកា
 DocType: Student,Student Mobile Number,លេខទូរស័ព្ទរបស់សិស្ស
 DocType: Item,Has Variants,មានវ៉ារ្យ៉ង់
@@ -3282,6 +3293,7 @@
 DocType: Homepage Section,Section Cards,កាតផ្នែក។
 ,Campaign Efficiency,ប្រសិទ្ធភាពយុទ្ធនាការ
 DocType: Discussion,Discussion,ការពិភាក្សា
+apps/erpnext/erpnext/setup/default_energy_point_rules.py,On Sales Order Submission,នៅលើការដាក់ស្នើការលក់។
 DocType: Bank Transaction,Transaction ID,លេខសម្គាល់ប្រតិបត្តិការ
 DocType: Payroll Entry,Deduct Tax For Unsubmitted Tax Exemption Proof,កាត់បន្ថយពន្ធសម្រាប់លិខិតលើកលែងពន្ធមិនមានបណ្តោះអាសន្ន
 DocType: Volunteer,Anytime,គ្រប់ពេល
@@ -3289,7 +3301,6 @@
 DocType: Employee Tax Exemption Proof Submission,Employee Tax Exemption Proof Submission,ការដាក់ពាក្យស្នើសុំការលើកលែងពន្ធលើនិយោជិក
 DocType: Patient,Surgical History,ប្រវត្តិវះកាត់
 DocType: Bank Statement Settings Item,Mapped Header,បណ្តុំបឋមកថា
-apps/erpnext/erpnext/hr/doctype/employee/employee.py,Please setup Employee Naming System in Human Resource &gt; HR Settings,សូមរៀបចំប្រព័ន្ធដាក់ឈ្មោះបុគ្គលិកនៅក្នុងធនធានមនុស្ស&gt; ធនធានមនុស្ស។
 DocType: Employee,Resignation Letter Date,កាលបរិច្ឆេទលិខិតលាលែងពីតំណែង
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Pricing Rules are further filtered based on quantity.,ក្បួនកំណត់តម្លៃត្រូវបានត្រងបន្ថែមទៀតដោយផ្អែកលើបរិមាណ។
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py,Please set the Date Of Joining for employee {0},សូមកំណត់កាលបរិច្ឆេទនៃការចូលរួមសម្រាប់បុគ្គលិកដែលបាន {0}
@@ -3303,6 +3314,7 @@
 DocType: Bank Statement Settings,Mapped Items,ធាតុដែលបានបង្កប់
 DocType: Amazon MWS Settings,IT,បច្ចេកវិទ្យា
 DocType: Chapter,Chapter,ជំពូក
+,Fixed Asset Register,ចុះឈ្មោះទ្រព្យសម្បត្តិថេរ។
 apps/erpnext/erpnext/utilities/user_progress.py,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,Select BOM and Qty for Production,ជ្រើស Bom និង Qty សម្រាប់ផលិតកម្ម
@@ -4212,7 +4224,6 @@
 DocType: Journal Entry,Accounting Entries,ធាតុគណនេយ្យ
 DocType: Job Card Time Log,Job Card Time Log,កំណត់ហេតុពេលវេលានៃកាតការងារ។
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,"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; ។
-apps/erpnext/erpnext/education/doctype/instructor/instructor.py,Please setup Instructor Naming System in Education &gt; Education Settings,សូមតំឡើងប្រព័ន្ធដាក់ឈ្មោះគ្រូនៅក្នុងការអប់រំ&gt; ការកំណត់ការអប់រំ។
 DocType: Journal Entry,Paid Loan,ប្រាក់កម្ចីបង់
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py,Duplicate Entry. Please check Authorization Rule {0},ស្ទួនធាតុ។ សូមពិនិត្យមើលវិធានអនុញ្ញាត {0}
 DocType: Journal Entry Account,Reference Due Date,កាលបរិច្ឆេទយោងយោង
@@ -4229,7 +4240,6 @@
 apps/erpnext/erpnext/templates/pages/projects.html,No time sheets,គ្មានសន្លឹកពេល
 DocType: GoCardless Mandate,GoCardless Customer,អតិថិជន GoCardless
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py,Leave Type {0} cannot be carry-forwarded,ទុកឱ្យប្រភេទ {0} មិនអាចត្រូវបានយកមកបញ្ជូនបន្ត
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Item Code &gt; Item Group &gt; Brand,លេខកូដរបស់ក្រុម&gt; ក្រុមក្រុម&gt; ម៉ាក។
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py,Maintenance Schedule is not generated for all the items. Please click on 'Generate Schedule',ថែទាំគឺមិនត្រូវបានបង្កើតកាលវិភាគសម្រាប់ធាតុទាំងអស់នោះ។ សូមចុចលើ &#39;បង្កើតកាលវិភាគ &quot;
 ,To Produce,ផលិត
 DocType: Leave Encashment,Payroll,បើកប្រាក់បៀវត្ស
@@ -4343,7 +4353,6 @@
 DocType: Stock Ledger Entry,Actual Qty After Transaction,Qty ពិតប្រាកដបន្ទាប់ពីការប្រតិបត្តិការ
 ,Pending SO Items For Purchase Request,ការរង់ចាំការធាតុដូច្នេះសម្រាប់សំណើរសុំទិញ
 apps/erpnext/erpnext/education/doctype/student_admission/student_admission.py,Student Admissions,សិស្សចុះឈ្មោះចូលរៀន
-apps/erpnext/erpnext/accounts/party.py,{0} {1} is disabled,{0} {1} ត្រូវបានបិទ
 DocType: Supplier,Billing Currency,រូបិយប័ណ្ណវិក័យប័ត្រ
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py,Extra Large,បន្ថែមទៀតដែលមានទំហំធំ
 DocType: Loan,Loan Application,ពាក្យស្នើសុំឥណទាន
@@ -4420,7 +4429,6 @@
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py,Only Leave Applications with status 'Approved' and 'Rejected' can be submitted,ទុកឱ្យកម្មវិធីដែលមានស្ថានភាពប៉ុណ្ណោះ &#39;ត្រូវបានអនុម័ត &quot;និង&quot; បដិសេធ &quot;អាចត្រូវបានដាក់ស្នើ
 apps/erpnext/erpnext/accounts/doctype/accounting_dimension/accounting_dimension.py,Creating Dimensions...,កំពុងបង្កើតវិមាត្រ ...
 apps/erpnext/erpnext/education/doctype/student_group_creation_tool/student_group_creation_tool.py,Student Group Name is mandatory in row {0},និស្សិតឈ្មោះក្រុមគឺជាការចាំបាច់ក្នុងជួរ {0}
-DocType: Customer Credit Limit,Bypass credit limit_check,ដែនកំណត់ឥណទានតូចតាច។
 DocType: Homepage,Products to be shown on website homepage,ផលិតផលត្រូវបានបង្ហាញនៅលើគេហទំព័រគេហទំព័រ
 DocType: HR Settings,Password Policy,គោលការណ៍ពាក្យសម្ងាត់។
 apps/erpnext/erpnext/setup/doctype/customer_group/customer_group.js,This is a root customer group and cannot be edited.,នេះគឺជាក្រុមអតិថិជនជា root និងមិនអាចត្រូវបានកែសម្រួល។
@@ -4711,6 +4719,7 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py,Row {0}: Advance against Customer must be credit,ជួរដេក {0}: ជាមុនប្រឆាំងនឹងការអតិថិជនត្រូវតែមានការឥណទាន
 DocType: Quality Meeting,Quality Meeting,ការប្រជុំគុណភាព។
 apps/erpnext/erpnext/accounts/doctype/account/account.js,Non-Group to Group,ដែលមិនមែនជាក្រុមដែលជាក្រុម
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,សូមកំណត់ឈ្មោះដាក់ឈ្មោះសំរាប់ {0} តាមរយៈតំឡើង&gt; ការកំណត់&gt; តំរុយឈ្មោះ។
 DocType: Employee,ERPNext User,អ្នកប្រើ ERPNext
 apps/erpnext/erpnext/education/doctype/student_group_creation_tool/student_group_creation_tool.py,Batch is mandatory in row {0},បាច់គឺជាការចាំបាច់ក្នុងជួរ {0}
 DocType: Company,Default Buying Terms,ល័ក្ខខ័ណ្ឌនៃការទិញលំនាំដើម។
@@ -5004,6 +5013,7 @@
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py,No {0} found for Inter Company Transactions.,ទេ {0} បានរកឃើញសម្រាប់ប្រតិបត្តិការអន្តរក្រុមហ៊ុន។
 DocType: Travel Itinerary,Rented Car,ជួលរថយន្ត
 apps/erpnext/erpnext/public/js/hub/components/profile_dialog.js,About your Company,អំពីក្រុមហ៊ុនរបស់អ្នក
+apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.js,Show Stock Ageing Data,បង្ហាញទិន្នន័យវ័យចំណាស់ស្តុក។
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py,Credit To account must be a Balance Sheet account,ឥណទានទៅគណនីត្រូវតែមានតារាងតុល្យការគណនី
 DocType: Donor,Donor,ម្ចាស់ជំនួយ
 DocType: Global Defaults,Disable In Words,បិទនៅក្នុងពាក្យ
@@ -5018,8 +5028,10 @@
 DocType: Practitioner Schedule,Schedule Name,ដាក់ឈ្មោះឈ្មោះ
 apps/erpnext/erpnext/regional/doctype/gstr_3b_report/gstr_3b_report.py,Please enter GSTIN and state for the Company Address {0},សូមបញ្ចូល GSTIN និងរដ្ឋសំរាប់អាសយដ្ឋានក្រុមហ៊ុន {0}
 DocType: Currency Exchange,For Buying,សម្រាប់ការទិញ
+apps/erpnext/erpnext/setup/default_energy_point_rules.py,On Purchase Order Submission,នៅលើការដាក់ស្នើការបញ្ជាទិញ។
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js,Add All Suppliers,បន្ថែមអ្នកផ្គត់ផ្គង់ទាំងអស់
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py,Row #{0}: Allocated Amount cannot be greater than outstanding amount.,ជួរដេក # {0}: ចំនួនទឹកប្រាក់ដែលបានបម្រុងទុកមិនអាចច្រើនជាងចំនួនពូកែ។
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Customer &gt; Customer Group &gt; Territory,អតិថិជន&gt; ក្រុមអតិថិជន&gt; ទឹកដី។
 DocType: Tally Migration,Parties,ពិធីជប់លៀង។
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js,Browse BOM,រកមើល Bom
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py,Secured Loans,ការផ្តល់កម្ចីដែលមានសុវត្ថិភាព
@@ -5051,6 +5063,7 @@
 apps/erpnext/erpnext/stock/doctype/item_alternative/item_alternative.py,Not allow to set alternative item for the item {0},មិនអនុញ្ញាតឱ្យកំណត់ធាតុជំនួសសម្រាប់ធាតុ {0}
 apps/erpnext/erpnext/hr/doctype/leave_block_list/leave_block_list.py,Date is repeated,កាលបរិច្ឆេទគឺត្រូវបានធ្វើម្តងទៀត
 apps/erpnext/erpnext/accounts/print_format/payment_receipt_voucher/payment_receipt_voucher.html,Authorized Signatory,ហត្ថលេខីដែលបានអនុញ្ញាត
+apps/erpnext/erpnext/education/doctype/instructor/instructor.py,Please setup Instructor Naming System in Education &gt; Education Settings,សូមតំឡើងប្រព័ន្ធដាក់ឈ្មោះគ្រូនៅក្នុងការអប់រំ&gt; ការកំណត់ការអប់រំ។
 apps/erpnext/erpnext/regional/doctype/gstr_3b_report/gstr_3b_report.html,Net ITC Available(A) - (B),មានអាយ។ ស៊ី។ ធី។ ស៊ីដែលមាន (ក) - (ខ)
 apps/erpnext/erpnext/education/doctype/fee_schedule/fee_schedule.js,Create Fees,បង្កើតកម្រៃ
 DocType: Project,Total Purchase Cost (via Purchase Invoice),ការចំណាយទិញសរុប (តាមរយៈការទិញវិក័យប័ត្រ)
@@ -5071,6 +5084,7 @@
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.js,Message Sent,សារដែលបានផ្ញើ
 apps/erpnext/erpnext/accounts/doctype/account/account.py,Account with child nodes cannot be set as ledger,គណនីជាមួយថ្នាំងជាកូនក្មេងដែលមិនអាចត្រូវបានកំណត់ជាសៀវភៅ
 DocType: C-Form,II,ទី II
+apps/erpnext/erpnext/assets/report/fixed_asset_register/fixed_asset_register.py,Vendor Name,ឈ្មោះអ្នកលក់
 DocType: Quiz Result,Wrong,ខុស។
 DocType: Sales Invoice,Rate at which Price list currency is converted to customer's base currency,អត្រាដែលតារាងតំលៃរូបិយប័ណ្ណត្រូវបានបម្លែងទៅជារូបិយប័ណ្ណមូលដ្ឋានរបស់អតិថិជន
 DocType: Purchase Invoice Item,Net Amount (Company Currency),ចំនួនទឹកប្រាក់សុទ្ធ (ក្រុមហ៊ុនរូបិយវត្ថុ)
@@ -5315,6 +5329,7 @@
 DocType: Stock Settings,Auto Material Request,សម្ភារៈស្នើសុំដោយស្វ័យប្រវត្តិ
 DocType: Woocommerce Settings,API consumer secret,សម្ងាត់របស់អតិថិជន API
 DocType: Delivery Note Item,Available Batch Qty at From Warehouse,Qty បាច់អាចរកបាននៅពីឃ្លាំង
+,Received Qty Amount,ទទួលបានចំនួនគីតចំនួន។
 DocType: Salary Slip,Gross Pay - Total Deduction - Loan Repayment,ប្រាក់សរុប - ការដកហូតសរុប - សងប្រាក់កម្ចី
 DocType: Bank Account,Last Integration Date,កាលបរិច្ឆេទសមាហរណកម្មចុងក្រោយ។
 DocType: Expense Claim,Expense Taxes and Charges,ពន្ធនិងថ្លៃសេវាកម្ម។
@@ -5778,6 +5793,8 @@
 DocType: Drug Prescription,Hour,ហួរ
 DocType: Restaurant Order Entry,Last Sales Invoice,វិក័យប័ត្រលក់ចុងក្រោយ
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py,Please select Qty against item {0},សូមជ្រើស Qty ប្រឆាំងនឹងធាតុ {0}
+apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py,Latest Age,អាយុចុងក្រោយ។
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js,Transfer Material to Supplier,ផ្ទេរសម្ភារៈដើម្បីផ្គត់ផ្គង់
 apps/erpnext/erpnext/hr/report/loan_repayment/loan_repayment.py,EMI,អេមអាយ
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py,New Serial No cannot have Warehouse. Warehouse must be set by Stock Entry or Purchase Receipt,គ្មានស៊េរីថ្មីនេះមិនអាចមានឃ្លាំង។ ឃ្លាំងត្រូវតែត្រូវបានកំណត់ដោយបង្កាន់ដៃហ៊ុនទិញចូលឬ
 DocType: Lead,Lead Type,ការនាំមុខប្រភេទ
@@ -5801,7 +5818,6 @@
 apps/erpnext/erpnext/hr/doctype/employee_benefit_application/employee_benefit_application.py,"An amount of {0} already claimed for the component {1},\
 						 set the amount equal or greater than {2}",ចំនួនទឹកប្រាក់នៃ {0} បានទាមទារសម្រាប់សមាសភាគ {1} រួចហើយ \ កំណត់ចំនួនទឹកប្រាក់ដែលស្មើរឺធំជាង {2}
 DocType: Shipping Rule,Shipping Rule Conditions,ការដឹកជញ្ជូនវិធានលក្ខខណ្ឌ
-DocType: Purchase Invoice,Export Type,នាំចេញប្រភេទ
 DocType: Salary Slip Loan,Salary Slip Loan,ប្រាក់កម្ចីប្រាក់កម្ចី
 DocType: BOM Update Tool,The new BOM after replacement,នេះបន្ទាប់ពីការជំនួស Bom
 ,Point of Sale,ចំណុចនៃការលក់
@@ -5921,7 +5937,6 @@
 DocType: Purchase Order Item,Blanket Order Rate,អត្រាលំដាប់លំដោយ
 ,Customer Ledger Summary,សេចក្តីសង្ខេបអំពីអតិថិជន។
 apps/erpnext/erpnext/hooks.py,Certification,វិញ្ញាបនប័ត្រ
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js,Are you sure you want to make debit note?,តើអ្នកពិតជាចង់ធ្វើការកត់សំគាល់ឥណពន្ធមែនទេ?
 DocType: Bank Guarantee,Clauses and Conditions,លក្ខន្តិកៈនិងលក្ខខណ្ឌ
 DocType: Serial No,Creation Document Type,ការបង្កើតប្រភេទឯកសារ
 DocType: Amazon MWS Settings,ES,ES
@@ -5959,8 +5974,6 @@
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py,Financial Services,សេវាហិរញ្ញវត្ថុ
 DocType: Student Sibling,Student ID,លេខសម្គាល់របស់សិស្ស
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.js,For Quantity must be greater than zero,សម្រាប់បរិមាណត្រូវតែធំជាងសូន្យ
-apps/erpnext/erpnext/hr/doctype/employee_transfer/employee_transfer.py,"Please delete the Employee <a href=""#Form/Employee/{0}"">{0}</a>\
-					to cancel this document","សូមលុបនិយោជិក <a href=""#Form/Employee/{0}"">{0}</a> \ ដើម្បីលុបចោលឯកសារនេះ។"
 apps/erpnext/erpnext/config/projects.py,Types of activities for Time Logs,ប្រភេទនៃសកម្មភាពសម្រាប់កំណត់ហេតុម៉ោង
 DocType: Opening Invoice Creation Tool,Sales,ការលក់
 DocType: Stock Entry Detail,Basic Amount,ចំនួនទឹកប្រាក់ជាមូលដ្ឋាន
@@ -6039,6 +6052,7 @@
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py,Print and Stationery,បោះពុម្ពនិងការិយាល័យ
 DocType: Stock Settings,Show Barcode Field,បង្ហាញវាលលេខកូដ
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js,Send Supplier Emails,ផ្ញើអ៊ីម៉ែលផ្គត់ផ្គង់
+DocType: Asset Movement,ACC-ASM-.YYYY.-,ACC-ASM-.YYYY.-
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py,"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,បង្កើតដោយស្វ័យប្រវត្តិ
 apps/erpnext/erpnext/hr/doctype/employee_onboarding/employee_onboarding.py,Submit this to create the Employee record,ដាក់ស្នើនេះដើម្បីបង្កើតកំណត់ត្រានិយោជិក
@@ -6118,7 +6132,6 @@
 DocType: Sales Team,Contact No.,លេខទំនាក់ទំនងទៅ
 apps/erpnext/erpnext/templates/includes/cart/cart_address.html,Billing Address is same as Shipping Address,អាសយដ្ឋានវិក្កយបត្រគឺដូចគ្នានឹងអាសយដ្ឋានដឹកជញ្ជូនដែរ។
 DocType: Bank Reconciliation,Payment Entries,ធាតុការទូទាត់
-apps/erpnext/erpnext/erpnext_integrations/doctype/shopify_settings/shopify_settings.py,Access token or Shopify URL missing,ចូលប្រើលេខកូដសំងាត់ឬ URL ដែលបាត់
 DocType: Location,Latitude,រយៈទទឹង
 DocType: Work Order,Scrap Warehouse,ឃ្លាំងអេតចាយ
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py,"Warehouse required at Row No {0}, please set default warehouse for the item {1} for the company {2}",ឃ្លាំងដែលតម្រូវឱ្យនៅជួរដេកទេ {0} សូមកំណត់ឃ្លាំងដើមសម្រាប់ធាតុ {1} សម្រាប់ក្រុមហ៊ុន {2}
@@ -6163,7 +6176,6 @@
 DocType: Job Offer Term,Value / Description,គុណតម្លៃ / ការពិពណ៌នាសង្ខេប
 apps/erpnext/erpnext/controllers/accounts_controller.py,"Row #{0}: Asset {1} cannot be submitted, it is already {2}","ជួរដេក # {0}: ទ្រព្យសកម្ម {1} មិនអាចត្រូវបានដាក់ស្នើ, វារួចទៅហើយ {2}"
 DocType: Tax Rule,Billing Country,វិក័យប័ត្រប្រទេស
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js,Are you sure you want to make credit note?,តើអ្នកពិតជាចង់ធ្វើកំណត់ត្រាឥណទានមែនទេ?
 DocType: Purchase Order Item,Expected Delivery Date,គេរំពឹងថាការដឹកជញ្ជូនកាលបរិច្ឆេទ
 DocType: Restaurant Order Entry,Restaurant Order Entry,ភោជនីយដ្ឋានការបញ្ជាទិញចូល
 apps/erpnext/erpnext/accounts/general_ledger.py,Debit and Credit not equal for {0} #{1}. Difference is {2}.,ឥណពន្ធនិងឥណទានមិនស្មើគ្នាសម្រាប់ {0} # {1} ។ ភាពខុសគ្នាគឺ {2} ។
@@ -6288,6 +6300,7 @@
 DocType: Purchase Invoice,Taxes and Charges Added,ពន្ធនិងការចោទប្រកាន់បន្ថែម
 apps/erpnext/erpnext/assets/doctype/asset/asset.py,Depreciation Row {0}: Next Depreciation Date cannot be before Available-for-use Date,រំលស់ជួរដេក {0}: កាលបរិច្ឆេទរំលោះបន្ទាប់មិនអាចនៅមុនកាលបរិច្ឆេទដែលអាចប្រើបាន
 ,Sales Funnel,ការប្រមូលផ្តុំការលក់
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Item Code &gt; Item Group &gt; Brand,លេខកូដរបស់ក្រុម&gt; ក្រុមក្រុម&gt; ម៉ាក។
 apps/erpnext/erpnext/setup/doctype/company/company.py,Abbreviation is mandatory,អក្សរកាត់គឺជាការចាំបាច់
 DocType: Project,Task Progress,វឌ្ឍនភាពភារកិច្ច
 apps/erpnext/erpnext/templates/includes/navbar/navbar_items.html,Cart,រទេះ
@@ -6533,6 +6546,7 @@
 DocType: Employee Grade,Employee Grade,ថ្នាក់និយោជិក
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py,Piecework,ម៉ៅការ
 DocType: GSTR 3B Report,June,មិថុនា។
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Supplier &gt; Supplier Type,អ្នកផ្គត់ផ្គង់&gt; ប្រភេទអ្នកផ្គត់ផ្គង់។
 DocType: Share Balance,From No,ពីលេខ
 DocType: Shift Type,Early Exit Grace Period,រយៈពេលនៃការចាកចេញពីព្រះគុណមុនកាលកំណត់។
 DocType: Task,Actual Time (in Hours),ពេលវេលាពិតប្រាកដ (នៅក្នុងម៉ោងធ្វើការ)
@@ -7008,6 +7022,7 @@
 DocType: Quality Inspection Reading,Quality Inspection Reading,កំរោងអានគម្ពីរមានគុណភាពអធិការកិច្ច
 apps/erpnext/erpnext/stock/doctype/stock_settings/stock_settings.py,`Freeze Stocks Older Than` should be smaller than %d days.,`បង្អាក់ស្តុកដែលចាស់ជាង` មិនអាចតូចាជាង % d នៃចំនួនថ្ងៃ ។
 DocType: Tax Rule,Purchase Tax Template,ទិញពន្ធលើទំព័រគំរូ
+apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py,Earliest Age,អាយុដំបូងបំផុត។
 apps/erpnext/erpnext/utilities/user_progress.py,Set a sales goal you'd like to achieve for your company.,កំណត់គោលដៅលក់ដែលអ្នកចង់បានសម្រាប់ក្រុមហ៊ុនរបស់អ្នក។
 DocType: Quality Goal,Revision,ការពិនិត្យឡើងវិញ
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js,Healthcare Services,សេវាថែទាំសុខភាព
@@ -7050,6 +7065,7 @@
 apps/erpnext/erpnext/healthcare/doctype/patient_encounter/patient_encounter.js,Schedule Discharge,កំណត់ពេលវេលាការឆក់
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py,Cheques and Deposits incorrectly cleared,មូលប្បទានប័ត្រនិងប្រាក់បញ្ញើបានជម្រះមិនត្រឹមត្រូវ
 DocType: Homepage Section Card,Homepage Section Card,កាតផ្នែកគេហទំព័រ។
+,Amount To Be Billed,ចំនួនទឹកប្រាក់ដែលត្រូវបង់។
 apps/erpnext/erpnext/accounts/doctype/account/account.py,Account {0}: You can not assign itself as parent account,គណនី {0}: អ្នកមិនអាចកំណត់ដោយខ្លួនវាជាគណនីឪពុកម្តាយ
 DocType: Purchase Invoice Item,Price List Rate,តម្លៃការវាយតម្លៃបញ្ជី
 apps/erpnext/erpnext/utilities/activation.py,Create customer quotes,បង្កើតសម្រង់អតិថិជន
@@ -7102,6 +7118,7 @@
 DocType: Supplier Scorecard Criteria,Supplier Scorecard Criteria,លក្ខណៈវិនិច្ឆ័យពិន្ទុនៃអ្នកផ្គត់ផ្គង់
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py,Please select Start Date and End Date for Item {0},សូមជ្រើសរើសកាលបរិច្ឆេទចាប់ផ្ដើមនិងកាលបរិច្ឆេទបញ្ចប់សម្រាប់ធាតុ {0}
 DocType: Maintenance Schedule,MAT-MSH-.YYYY.-,MAT-MSH -YYYY.-
+,Amount to Receive,ចំនួនទឹកប្រាក់ដែលត្រូវទទួល។
 apps/erpnext/erpnext/education/doctype/student_group_creation_tool/student_group_creation_tool.py,Course is mandatory in row {0},ពិតណាស់គឺចាំបាច់នៅក្នុងជួរដេក {0}
 apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py,From date can not be greater than than To date,ពីកាលបរិច្ឆេទមិនអាចធំជាងកាលបរិច្ឆេទ។
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py,To date cannot be before from date,ដើម្បីកាលបរិច្ឆេទមិនអាចមានមុនពេលចេញពីកាលបរិច្ឆេទ
@@ -7563,6 +7580,7 @@
 DocType: Delivery Note,Print Without Amount,បោះពុម្ពដោយគ្មានការចំនួនទឹកប្រាក់
 apps/erpnext/erpnext/accounts/report/asset_depreciation_ledger/asset_depreciation_ledger.py,Depreciation Date,រំលស់កាលបរិច្ឆេទ
 ,Work Orders in Progress,កិច្ចការការងារនៅក្នុងវឌ្ឍនភាព
+DocType: Customer Credit Limit,Bypass Credit Limit Check,ការត្រួតពិនិត្យដែនកំណត់ឥណទានបៃទិក។
 DocType: Issue,Support Team,ក្រុមគាំទ្រ
 apps/erpnext/erpnext/stock/report/batch_item_expiry_status/batch_item_expiry_status.py,Expiry (In Days),ផុតកំណត់ (ក្នុងថ្ងៃ)
 DocType: Appraisal,Total Score (Out of 5),ពិន្ទុសរុប (ក្នុងចំណោម 5)
@@ -7749,6 +7767,7 @@
 DocType: Sales Invoice,Customer GSTIN,GSTIN អតិថិជន
 DocType: Crop Cycle,List of diseases detected on the field. When selected it'll automatically add a list of tasks to deal with the disease ,បញ្ជីនៃជំងឺបានរកឃើញនៅលើវាល។ នៅពេលដែលបានជ្រើសវានឹងបន្ថែមបញ្ជីភារកិច្ចដោយស្វ័យប្រវត្តិដើម្បីដោះស្រាយជំងឺ
 apps/erpnext/erpnext/manufacturing/page/bom_comparison_tool/bom_comparison_tool.js,BOM 1,BOM ១
+apps/erpnext/erpnext/assets/report/fixed_asset_register/fixed_asset_register.py,Asset Id,លេខសម្គាល់ទ្រព្យ។
 apps/erpnext/erpnext/healthcare/doctype/healthcare_service_unit/healthcare_service_unit.js,This is a root healthcare service unit and cannot be edited.,នេះគឺជាអង្គភាពសេវាកម្មថែរក្សាសុខភាពជា root ហើយមិនអាចកែប្រែបានទេ។
 DocType: Asset Repair,Repair Status,ជួសជុលស្ថានភាព
 apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.js,"Requested Qty: Quantity requested for purchase, but not ordered.",Qty ដែលបានស្នើសុំ៖ បរិមាណបានស្នើសុំទិញប៉ុន្តែមិនបានបញ្ជាទិញទេ។
diff --git a/erpnext/translations/kn.csv b/erpnext/translations/kn.csv
index e63057a..b68eb65 100644
--- a/erpnext/translations/kn.csv
+++ b/erpnext/translations/kn.csv
@@ -283,7 +283,6 @@
 DocType: Loan,Repay Over Number of Periods,ಓವರ್ ಸಂಖ್ಯೆ ಅವಧಿಗಳು ಮರುಪಾವತಿ
 apps/erpnext/erpnext/manufacturing/report/bom_stock_report/bom_stock_report.py,Quantity to Produce can not be less than Zero,ಉತ್ಪಾದಿಸುವ ಪ್ರಮಾಣ ಶೂನ್ಯಕ್ಕಿಂತ ಕಡಿಮೆಯಿರಬಾರದು
 DocType: Stock Entry,Additional Costs,ಹೆಚ್ಚುವರಿ ವೆಚ್ಚ
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Customer &gt; Customer Group &gt; Territory,ಗ್ರಾಹಕ&gt; ಗ್ರಾಹಕ ಗುಂಪು&gt; ಪ್ರದೇಶ
 apps/erpnext/erpnext/accounts/doctype/account/account.py,Account with existing transaction can not be converted to group.,ಅಸ್ತಿತ್ವದಲ್ಲಿರುವ ವಹಿವಾಟು ಖಾತೆ ಗುಂಪು ಪರಿವರ್ತನೆ ಸಾಧ್ಯವಿಲ್ಲ .
 DocType: Lead,Product Enquiry,ಉತ್ಪನ್ನ ವಿಚಾರಣೆ
 DocType: Education Settings,Validate Batch for Students in Student Group,ವಿದ್ಯಾರ್ಥಿ ಗುಂಪಿನಲ್ಲಿರುವ ವಿದ್ಯಾರ್ಥಿಗಳಿಗೆ ಬ್ಯಾಚ್ ಸ್ಥಿರೀಕರಿಸಿ
@@ -580,6 +579,7 @@
 DocType: Healthcare Settings,Create documents for sample collection,ಮಾದರಿ ಸಂಗ್ರಹಣೆಗಾಗಿ ಡಾಕ್ಯುಮೆಂಟ್ಗಳನ್ನು ರಚಿಸಿ
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py,Payment against {0} {1} cannot be greater than Outstanding Amount {2},ವಿರುದ್ಧ ಪಾವತಿ {0} {1} ಬಾಕಿ ಮೊತ್ತದ ಹೆಚ್ಚಿನ ಸಾಧ್ಯವಿಲ್ಲ {2}
 apps/erpnext/erpnext/patches/v11_0/add_healthcare_service_unit_tree_root.py,All Healthcare Service Units,ಎಲ್ಲಾ ಆರೋಗ್ಯ ಸೇವೆ ಘಟಕಗಳು
+apps/erpnext/erpnext/setup/default_energy_point_rules.py,On Converting Opportunity,ಅವಕಾಶವನ್ನು ಪರಿವರ್ತಿಸುವಲ್ಲಿ
 DocType: Bank Account,Address HTML,ವಿಳಾಸ ಎಚ್ಟಿಎಮ್ಎಲ್
 DocType: Lead,Mobile No.,ಮೊಬೈಲ್ ಸಂಖ್ಯೆ
 apps/erpnext/erpnext/selling/doctype/pos_closing_voucher/closing_voucher_details.html,Mode of Payments,ಪಾವತಿಯ ಮೋಡ್
@@ -644,7 +644,6 @@
 DocType: Accounting Dimension,Dimension Name,ಆಯಾಮದ ಹೆಸರು
 apps/erpnext/erpnext/healthcare/setup.py,Resistant,ನಿರೋಧಕ
 apps/erpnext/erpnext/hotels/doctype/hotel_room_reservation/hotel_room_reservation.py,Please set Hotel Room Rate on {},ಹೋಟೆಲ್ ಕೊಠಡಿ ದರವನ್ನು ದಯವಿಟ್ಟು {@} ಹೊಂದಿಸಿ
-apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py,Please setup numbering series for Attendance via Setup &gt; Numbering Series,ಸೆಟಪ್&gt; ಸಂಖ್ಯೆಯ ಸರಣಿಯ ಮೂಲಕ ಹಾಜರಾತಿಗಾಗಿ ದಯವಿಟ್ಟು ಸಂಖ್ಯೆಯ ಸರಣಿಯನ್ನು ಹೊಂದಿಸಿ
 DocType: Journal Entry,Multi Currency,ಮಲ್ಟಿ ಕರೆನ್ಸಿ
 DocType: Bank Statement Transaction Invoice Item,Invoice Type,ಸರಕುಪಟ್ಟಿ ಪ್ರಕಾರ
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py,Valid from date must be less than valid upto date,ದಿನಾಂಕದಿಂದ ಮಾನ್ಯವು ದಿನಾಂಕದವರೆಗೆ ಮಾನ್ಯಕ್ಕಿಂತ ಕಡಿಮೆಯಿರಬೇಕು
@@ -759,6 +758,7 @@
 apps/erpnext/erpnext/accounts/page/pos/pos.js,Create a new Customer,ಹೊಸ ಗ್ರಾಹಕ ರಚಿಸಿ
 apps/erpnext/erpnext/non_profit/report/expiring_memberships/expiring_memberships.py,Expiring On,ರಂದು ಮುಕ್ತಾಯಗೊಳ್ಳುತ್ತದೆ
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,"If multiple Pricing Rules continue to prevail, users are asked to set Priority manually to resolve conflict.","ಅನೇಕ ಬೆಲೆ ನಿಯಮಗಳು ಮೇಲುಗೈ ಮುಂದುವರಿದರೆ, ಬಳಕೆದಾರರು ಸಂಘರ್ಷ ಪರಿಹರಿಸಲು ಕೈಯಾರೆ ಆದ್ಯತಾ ಸೆಟ್ ತಿಳಿಸಲಾಗುತ್ತದೆ."
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js,Purchase Return,ಖರೀದಿ ರಿಟರ್ನ್
 apps/erpnext/erpnext/utilities/activation.py,Create Purchase Orders,ಖರೀದಿ ಆದೇಶಗಳನ್ನು ರಚಿಸಿ
 ,Purchase Register,ಖರೀದಿ ನೋಂದಣಿ
 apps/erpnext/erpnext/healthcare/doctype/patient/patient.py,Patient not found,ರೋಗಿಯು ಕಂಡುಬಂದಿಲ್ಲ
@@ -773,7 +773,6 @@
 DocType: Location,Area UOM,ಪ್ರದೇಶ UOM
 apps/erpnext/erpnext/manufacturing/doctype/workstation/workstation.py,Workstation is closed on the following dates as per Holiday List: {0},ಕಾರ್ಯಸ್ಥಳ ಹಾಲಿಡೇ ಪಟ್ಟಿ ಪ್ರಕಾರ ಕೆಳಗಿನ ದಿನಾಂಕಗಳಂದು ಮುಚ್ಚಲಾಗಿದೆ: {0}
 apps/erpnext/erpnext/selling/page/sales_funnel/sales_funnel.py,Opportunities,ಅವಕಾಶಗಳು
-apps/erpnext/erpnext/www/all-products/index.html,Clear filters,ಫಿಲ್ಟರ್‌ಗಳನ್ನು ತೆರವುಗೊಳಿಸಿ
 DocType: Lab Test Template,Single,ಏಕೈಕ
 DocType: Compensatory Leave Request,Work From Date,ದಿನಾಂಕದಿಂದ ಕೆಲಸ
 DocType: Salary Slip,Total Loan Repayment,ಒಟ್ಟು ಸಾಲದ ಮರುಪಾವತಿಯ
@@ -817,6 +816,7 @@
 apps/erpnext/erpnext/education/doctype/program_enrollment_tool/program_enrollment_tool.py,Mandatory field - Academic Year,ಕಡ್ಡಾಯ - ಅಕಾಡೆಮಿಕ್ ಇಯರ್
 apps/erpnext/erpnext/education/doctype/program_enrollment_tool/program_enrollment_tool.py,Mandatory field - Academic Year,ಕಡ್ಡಾಯ - ಅಕಾಡೆಮಿಕ್ ಇಯರ್
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py,{0} {1} is not associated with {2} {3},{0} {1} {2} {3}
+DocType: Opportunity,Converted By,ಇವರಿಂದ ಪರಿವರ್ತಿಸಲಾಗಿದೆ
 apps/erpnext/erpnext/public/js/hub/components/ReviewArea.vue,You need to login as a Marketplace User before you can add any reviews.,ನೀವು ಯಾವುದೇ ವಿಮರ್ಶೆಗಳನ್ನು ಸೇರಿಸುವ ಮೊದಲು ನೀವು ಮಾರುಕಟ್ಟೆ ಬಳಕೆದಾರರಾಗಿ ಲಾಗಿನ್ ಆಗಬೇಕು.
 apps/erpnext/erpnext/manufacturing/doctype/job_card/job_card.py,Row {0} : Operation is required against the raw material item {1},ಸಾಲು {0}: ಕಚ್ಚಾ ವಸ್ತು ಐಟಂ ವಿರುದ್ಧ ಕಾರ್ಯಾಚರಣೆ ಅಗತ್ಯವಿದೆ {1}
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py,Please set default payable account for the company {0},ದಯವಿಟ್ಟು ಕಂಪನಿಗೆ ಡೀಫಾಲ್ಟ್ ಪಾವತಿಸಬೇಕು ಖಾತೆಯನ್ನು ಹೊಂದಿಸಿ {0}
@@ -842,6 +842,8 @@
 DocType: Sales Invoice,Total Qty,ಒಟ್ಟು ಪ್ರಮಾಣ
 apps/erpnext/erpnext/education/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py,Guardian2 Email ID,Guardian2 ಮೇಲ್
 apps/erpnext/erpnext/education/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py,Guardian2 Email ID,Guardian2 ಮೇಲ್
+apps/erpnext/erpnext/hr/doctype/employee_transfer/employee_transfer.py,"Please delete the Employee <a href=""#Form/Employee/{0}"">{0}</a>\
+					to cancel this document","ಈ ಡಾಕ್ಯುಮೆಂಟ್ ರದ್ದುಗೊಳಿಸಲು ದಯವಿಟ್ಟು ನೌಕರ <a href=""#Form/Employee/{0}"">{0}</a> delete ಅನ್ನು ಅಳಿಸಿ"
 DocType: Item,Show in Website (Variant),ವೆಬ್ಸೈಟ್ ತೋರಿಸಿ (variant)
 DocType: Employee,Health Concerns,ಆರೋಗ್ಯ ಕಾಳಜಿ
 DocType: Payroll Entry,Select Payroll Period,ವೇತನದಾರರ ಅವಧಿಯ ಆಯ್ಕೆ
@@ -900,7 +902,6 @@
 apps/erpnext/erpnext/education/doctype/student_group/student_group.py,Please select Course,ದಯವಿಟ್ಟು ಕೋರ್ಸ್ ಆಯ್ಕೆ
 DocType: Codification Table,Codification Table,ಕೋಡಿಫಿಕೇಷನ್ ಟೇಬಲ್
 DocType: Timesheet Detail,Hrs,ಗಂಟೆಗಳ
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js,Please select Company,ಕಂಪನಿ ಆಯ್ಕೆಮಾಡಿ
 DocType: Employee Skill,Employee Skill,ನೌಕರರ ಕೌಶಲ್ಯ
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.js,Difference Account,ವ್ಯತ್ಯಾಸ ಖಾತೆ
 DocType: Pricing Rule,Discount on Other Item,ಇತರ ವಸ್ತುವಿನ ಮೇಲೆ ರಿಯಾಯಿತಿ
@@ -968,6 +969,7 @@
 DocType: BOM,Operating Cost,ವೆಚ್ಚವನ್ನು
 DocType: Crop,Produced Items,ತಯಾರಿಸಿದ ಐಟಂಗಳು
 DocType: Bank Statement Transaction Entry,Match Transaction to Invoices,ಇನ್ವಾಯ್ಸ್ಗಳಿಗೆ ವಹಿವಾಟಿನ ಹೊಂದಾಣಿಕೆ
+apps/erpnext/erpnext/erpnext_integrations/exotel_integration.py,Error in Exotel incoming call,ಎಕ್ಸೊಟೆಲ್ ಒಳಬರುವ ಕರೆಯಲ್ಲಿ ದೋಷ
 DocType: Sales Order Item,Gross Profit,ನಿವ್ವಳ ಲಾಭ
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js,Unblock Invoice,ಸರಕುಪಟ್ಟಿ ಅನಿರ್ಬಂಧಿಸಿ
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py,Increment cannot be 0,ಹೆಚ್ಚಳವನ್ನು 0 ಸಾಧ್ಯವಿಲ್ಲ
@@ -1178,6 +1180,7 @@
 DocType: Activity Cost,Activity Type,ಚಟುವಟಿಕೆ ವಿಧ
 DocType: Request for Quotation,For individual supplier,ವೈಯಕ್ತಿಕ ಸರಬರಾಜುದಾರನ
 DocType: BOM Operation,Base Hour Rate(Company Currency),ಬೇಸ್ ಅವರ್ ದರ (ಕಂಪನಿ ಕರೆನ್ಸಿ)
+,Qty To Be Billed,ಬಿಲ್ ಮಾಡಲು ಬಿಟಿ
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py,Delivered Amount,ತಲುಪಿಸಲಾಗಿದೆ ಪ್ರಮಾಣ
 apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.js,Reserved Qty for Production: Raw materials quantity to make manufacturing items.,ಉತ್ಪಾದನೆಗೆ ಕಾಯ್ದಿರಿಸಲಾಗಿದೆ: ಉತ್ಪಾದನಾ ವಸ್ತುಗಳನ್ನು ತಯಾರಿಸಲು ಕಚ್ಚಾ ವಸ್ತುಗಳ ಪ್ರಮಾಣ.
 DocType: Loyalty Point Entry Redemption,Redemption Date,ರಿಡೆಂಪ್ಶನ್ ದಿನಾಂಕ
@@ -1297,7 +1300,7 @@
 apps/erpnext/erpnext/education/doctype/student_group/student_group.py,Please select Program,ದಯವಿಟ್ಟು ಆಯ್ಕೆ ಕಾರ್ಯಕ್ರಮದಲ್ಲಿ
 apps/erpnext/erpnext/education/doctype/student_group/student_group.py,Please select Program,ದಯವಿಟ್ಟು ಆಯ್ಕೆ ಕಾರ್ಯಕ್ರಮದಲ್ಲಿ
 DocType: Project,Estimated Cost,ಅಂದಾಜು ವೆಚ್ಚ
-DocType: Request for Quotation,Link to material requests,ವಸ್ತು ವಿನಂತಿಗಳನ್ನು ಲಿಂಕ್
+DocType: Supplier Quotation,Link to material requests,ವಸ್ತು ವಿನಂತಿಗಳನ್ನು ಲಿಂಕ್
 apps/erpnext/erpnext/public/js/hub/pages/Publish.vue,Publish,ಪ್ರಕಟಿಸು
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py,Aerospace,ಏರೋಸ್ಪೇಸ್
 ,Fichier des Ecritures Comptables [FEC],ಫಿಶಿಯರ್ ಡೆಸ್ ಎಕ್ರಿಕರ್ಸ್ ಕಾಂಪ್ಟೇಬಲ್ಸ್ [ಎಫ್.ಸಿ.ಸಿ]
@@ -1310,6 +1313,7 @@
 apps/erpnext/erpnext/utilities/transaction_base.py,Invalid Posting Time,ಅಮಾನ್ಯ ಪೋಸ್ಟ್ ಸಮಯ
 DocType: Salary Component,Condition and Formula,ಪರಿಸ್ಥಿತಿ ಮತ್ತು ಫಾರ್ಮುಲಾ
 DocType: Lead,Campaign Name,ಕ್ಯಾಂಪೇನ್ ಹೆಸರು
+apps/erpnext/erpnext/setup/default_energy_point_rules.py,On Task Completion,ಕಾರ್ಯ ಪೂರ್ಣಗೊಂಡಿದೆ
 apps/erpnext/erpnext/hr/doctype/compensatory_leave_request/compensatory_leave_request.py,There is no leave period in between {0} and {1},{0} ಮತ್ತು {1} ನಡುವೆ ಯಾವುದೇ ರಜೆಯ ಅವಧಿ ಇಲ್ಲ
 DocType: Fee Validity,Healthcare Practitioner,ಹೆಲ್ತ್ಕೇರ್ ಪ್ರಾಕ್ಟೀಷನರ್
 DocType: Hotel Room,Capacity,ಸಾಮರ್ಥ್ಯ
@@ -1670,7 +1674,6 @@
 DocType: Quality Feedback Template,Quality Feedback Template,ಗುಣಮಟ್ಟದ ಪ್ರತಿಕ್ರಿಯೆ ಟೆಂಪ್ಲೇಟು
 apps/erpnext/erpnext/config/education.py,LMS Activity,LMS ಚಟುವಟಿಕೆ
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py,Internet Publishing,ಇಂಟರ್ನೆಟ್ ಪಬ್ಲಿಷಿಂಗ್
-DocType: Prescription Duration,Number,ಸಂಖ್ಯೆ
 apps/erpnext/erpnext/accounts/doctype/opening_invoice_creation_tool/opening_invoice_creation_tool.js,Creating {0} Invoice,{0} ಸರಕುಪಟ್ಟಿ ರಚಿಸಲಾಗುತ್ತಿದೆ
 DocType: Medical Code,Medical Code Standard,ವೈದ್ಯಕೀಯ ಕೋಡ್ ಸ್ಟ್ಯಾಂಡರ್ಡ್
 DocType: Soil Texture,Clay Composition (%),ಜೇಡಿಮಣ್ಣಿನ ಸಂಯೋಜನೆ (%)
@@ -1745,6 +1748,7 @@
 DocType: Support Settings,Get Started Sections,ಪರಿಚ್ಛೇದಗಳನ್ನು ಪ್ರಾರಂಭಿಸಿ
 DocType: Lead,CRM-LEAD-.YYYY.-,ಸಿಆರ್ಎಂ-ಲೀಡ್- .YYYY.-
 DocType: Invoice Discounting,Sanctioned,ಮಂಜೂರು
+,Base Amount,ಮೂಲ ಮೊತ್ತ
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.js,Total Contribution Amount: {0},ಒಟ್ಟು ಕೊಡುಗೆ ಮೊತ್ತ: {0}
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py,Row #{0}: Please specify Serial No for Item {1},ರೋ # {0}: ಐಟಂ ಯಾವುದೇ ಸೀರಿಯಲ್ ಸೂಚಿಸಲು ದಯವಿಟ್ಟು {1}
 DocType: Payroll Entry,Salary Slips Submitted,ವೇತನ ಸ್ಲಿಪ್ಸ್ ಸಲ್ಲಿಸಲಾಗಿದೆ
@@ -1964,6 +1968,7 @@
 DocType: Accounting Dimension,Dimension Defaults,ಆಯಾಮ ಡೀಫಾಲ್ಟ್‌ಗಳು
 apps/erpnext/erpnext/crm/report/prospects_engaged_but_not_converted/prospects_engaged_but_not_converted.js,Minimum Lead Age (Days),ಕನಿಷ್ಠ ಲೀಡ್ ವಯಸ್ಸು (ದಿನಗಳು)
 apps/erpnext/erpnext/crm/report/prospects_engaged_but_not_converted/prospects_engaged_but_not_converted.js,Minimum Lead Age (Days),ಕನಿಷ್ಠ ಲೀಡ್ ವಯಸ್ಸು (ದಿನಗಳು)
+apps/erpnext/erpnext/assets/report/fixed_asset_register/fixed_asset_register.py,Available For Use Date,ಬಳಕೆಯ ದಿನಾಂಕಕ್ಕೆ ಲಭ್ಯವಿದೆ
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py,All BOMs,ಎಲ್ಲಾ BOMs
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js,Create Inter Company Journal Entry,ಇಂಟರ್ ಕಂಪನಿ ಜರ್ನಲ್ ನಮೂದನ್ನು ರಚಿಸಿ
 DocType: Company,Parent Company,ಮೂಲ ಕಂಪನಿ
@@ -2026,6 +2031,7 @@
 ,IRS 1099,ಐಆರ್ಎಸ್ 1099
 DocType: Salary Slip,Leave Without Pay,ಪೇ ಇಲ್ಲದೆ ಬಿಡಿ
 DocType: Payment Request,Outward,ಹೊರಗಡೆ
+apps/erpnext/erpnext/setup/default_energy_point_rules.py,On {0} Creation,{0} ರಚನೆಯಲ್ಲಿ
 apps/erpnext/erpnext/regional/doctype/gstr_3b_report/gstr_3b_report.html,State/UT Tax,ರಾಜ್ಯ / ಯುಟಿ ತೆರಿಗೆ
 ,Trial Balance for Party,ಪಕ್ಷದ ಟ್ರಯಲ್ ಬ್ಯಾಲೆನ್ಸ್
 ,Gross and Net Profit Report,ಒಟ್ಟು ಮತ್ತು ನಿವ್ವಳ ಲಾಭ ವರದಿ
@@ -2140,6 +2146,7 @@
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js,Make Stock Entry,ಸ್ಟಾಕ್ ಎಂಟ್ರಿ ಮಾಡಿ
 DocType: Hotel Room Reservation,Hotel Reservation User,ಹೋಟೆಲ್ ಮೀಸಲಾತಿ ಬಳಕೆದಾರ
 apps/erpnext/erpnext/projects/doctype/project/project.js,Set Status,ಸ್ಥಿತಿಯನ್ನು ಹೊಂದಿಸಿ
+apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py,Please setup numbering series for Attendance via Setup &gt; Numbering Series,ಸೆಟಪ್&gt; ಸಂಖ್ಯೆಯ ಸರಣಿಯ ಮೂಲಕ ಹಾಜರಾತಿಗಾಗಿ ದಯವಿಟ್ಟು ಸಂಖ್ಯೆಯ ಸರಣಿಯನ್ನು ಹೊಂದಿಸಿ
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py,Please select prefix first,ಮೊದಲ ಪೂರ್ವಪ್ರತ್ಯಯ ಆಯ್ಕೆ ಮಾಡಿ
 DocType: Contract,Fulfilment Deadline,ಪೂರೈಸುವ ಗಡುವು
 apps/erpnext/erpnext/public/js/hub/pages/Home.vue,Near you,ನಿನ್ನ ಹತ್ತಿರ
@@ -2155,6 +2162,7 @@
 DocType: Announcement,All Students,ಎಲ್ಲಾ ವಿದ್ಯಾರ್ಥಿಗಳು
 apps/erpnext/erpnext/assets/doctype/asset/asset.py,Item {0} must be a non-stock item,ಐಟಂ {0} ನಾನ್ ಸ್ಟಾಕ್ ಐಟಂ ಇರಬೇಕು
 apps/erpnext/erpnext/stock/doctype/batch/batch.js,View Ledger,ವೀಕ್ಷಿಸು ಲೆಡ್ಜರ್
+DocType: Cost Center,Lft,lft
 DocType: Grading Scale,Intervals,ಮಧ್ಯಂತರಗಳು
 DocType: Bank Statement Transaction Entry,Reconciled Transactions,ಹೊಂದಾಣಿಕೆಯ ವಹಿವಾಟುಗಳು
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py,Earliest,ಮುಂಚಿನ
@@ -2269,6 +2277,7 @@
 apps/erpnext/erpnext/hr/doctype/employee_benefit_application/employee_benefit_application.py,As per your assigned Salary Structure you cannot apply for benefits,ನಿಯೋಜಿಸಲಾದ ಸಂಬಳ ರಚನೆಯ ಪ್ರಕಾರ ನೀವು ಪ್ರಯೋಜನಕ್ಕಾಗಿ ಅರ್ಜಿ ಸಲ್ಲಿಸಲು ಸಾಧ್ಯವಿಲ್ಲ
 apps/erpnext/erpnext/stock/doctype/item/item.py,Website Image should be a public file or website URL,ವೆಬ್ಸೈಟ್ ಚಿತ್ರ ಸಾರ್ವಜನಿಕ ಕಡತ ಅಥವಾ ವೆಬ್ಸೈಟ್ URL ಇರಬೇಕು
 DocType: Purchase Invoice Item,BOM,ಬಿಒಎಮ್
+apps/erpnext/erpnext/stock/doctype/item/item.py,Duplicate entry in Manufacturers table,ತಯಾರಕರ ಕೋಷ್ಟಕದಲ್ಲಿ ನಕಲಿ ಪ್ರವೇಶ
 apps/erpnext/erpnext/setup/doctype/item_group/item_group.js,This is a root item group and cannot be edited.,ಈ ಒಂದು ಮೂಲ ಐಟಂ ಗುಂಪು ಮತ್ತು ಸಂಪಾದಿತವಾಗಿಲ್ಲ .
 apps/erpnext/erpnext/accounts/doctype/account/account.js,Merge,ವಿಲೀನಗೊಳ್ಳಲು
 DocType: Journal Entry Account,Purchase Order,ಪರ್ಚೇಸ್ ಆರ್ಡರ್
@@ -2411,7 +2420,6 @@
 DocType: Asset,Depreciation Schedules,ಸವಕಳಿ ವೇಳಾಪಟ್ಟಿಗಳು
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.js,Create Sales Invoice,ಮಾರಾಟ ಸರಕುಪಟ್ಟಿ ರಚಿಸಿ
 apps/erpnext/erpnext/regional/doctype/gstr_3b_report/gstr_3b_report.html,Ineligible ITC,ಅನರ್ಹ ಐಟಿಸಿ
-apps/erpnext/erpnext/erpnext_integrations/doctype/shopify_settings/shopify_settings.py,"Support for public app is deprecated. Please setup private app, for more details refer user manual","ಸಾರ್ವಜನಿಕ ಅಪ್ಲಿಕೇಶನ್ಗೆ ಬೆಂಬಲವನ್ನು ನಿರಾಕರಿಸಲಾಗಿದೆ. ದಯವಿಟ್ಟು ಖಾಸಗಿ ಅಪ್ಲಿಕೇಶನ್ ಅನ್ನು ಹೊಂದಿಸಿ, ಹೆಚ್ಚಿನ ವಿವರಗಳಿಗಾಗಿ ಬಳಕೆದಾರ ಕೈಪಿಡಿಯನ್ನು ನೋಡಿ"
 DocType: Task,Dependent Tasks,ಅವಲಂಬಿತ ಕಾರ್ಯಗಳು
 apps/erpnext/erpnext/regional/report/gstr_1/gstr_1.py,Following accounts might be selected in GST Settings:,ಕೆಳಗಿನ ಖಾತೆಗಳನ್ನು ಜಿಎಸ್ಟಿ ಸೆಟ್ಟಿಂಗ್ಗಳಲ್ಲಿ ಆಯ್ಕೆ ಮಾಡಬಹುದು:
 apps/erpnext/erpnext/manufacturing/report/bom_stock_report/bom_stock_report.js,Quantity to Produce,ಉತ್ಪಾದಿಸುವ ಪ್ರಮಾಣ
@@ -2661,6 +2669,7 @@
 DocType: Water Analysis,Container,ಕಂಟೇನರ್
 apps/erpnext/erpnext/regional/report/gstr_1/gstr_1.py,Please set valid GSTIN No. in Company Address,ಕಂಪನಿ ವಿಳಾಸದಲ್ಲಿ ದಯವಿಟ್ಟು ಮಾನ್ಯ ಜಿಎಸ್ಟಿಎನ್ ಸಂಖ್ಯೆಯನ್ನು ಹೊಂದಿಸಿ
 apps/erpnext/erpnext/education/utils.py,Student {0} - {1} appears Multiple times in row {2} & {3},ವಿದ್ಯಾರ್ಥಿ {0} - {1} ಸತತವಾಗಿ ಅನೇಕ ಬಾರಿ ಕಂಡುಬರುತ್ತದೆ {2} ಮತ್ತು {3}
+apps/erpnext/erpnext/selling/doctype/customer/customer.py,Following fields are mandatory to create address:,ವಿಳಾಸವನ್ನು ರಚಿಸಲು ಕೆಳಗಿನ ಕ್ಷೇತ್ರಗಳು ಕಡ್ಡಾಯವಾಗಿದೆ:
 DocType: Item Alternative,Two-way,ಎರಡು ರೀತಿಯಲ್ಲಿ
 DocType: Item,Manufacturers,ತಯಾರಕರು
 ,Employee Billing Summary,ನೌಕರರ ಬಿಲ್ಲಿಂಗ್ ಸಾರಾಂಶ
@@ -2735,9 +2744,9 @@
 DocType: Employee,HR-EMP-,ಮಾನವ ಸಂಪನ್ಮೂಲ- EMP-
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py,User {0} doesn't have any default POS Profile. Check Default at Row {1} for this User.,ಬಳಕೆದಾರ {0} ಡೀಫಾಲ್ಟ್ ಪಿಓಎಸ್ ಪ್ರೊಫೈಲ್ ಅನ್ನು ಹೊಂದಿಲ್ಲ. ಈ ಬಳಕೆದಾರರಿಗಾಗಿ ಸಾಲು {1} ನಲ್ಲಿ ಡೀಫಾಲ್ಟ್ ಅನ್ನು ಪರಿಶೀಲಿಸಿ.
 DocType: Quality Meeting Minutes,Quality Meeting Minutes,ಗುಣಮಟ್ಟದ ಸಭೆ ನಿಮಿಷಗಳು
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Supplier &gt; Supplier Type,ಸರಬರಾಜುದಾರ&gt; ಪೂರೈಕೆದಾರ ಪ್ರಕಾರ
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py,Employee Referral,ಉದ್ಯೋಗಿ ಉಲ್ಲೇಖ
 DocType: Student Group,Set 0 for no limit,ಯಾವುದೇ ಮಿತಿ ಹೊಂದಿಸಿ 0
+DocType: Cost Center,rgt,rgt
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py,The day(s) on which you are applying for leave are holidays. You need not apply for leave.,ನೀವು ರಜೆ ಹಾಕುತ್ತಿವೆ ಮೇಲೆ ದಿನ (ಗಳು) ರಜಾದಿನಗಳು. ನೀವು ರಜೆ ಅನ್ವಯಿಸುವುದಿಲ್ಲ ಅಗತ್ಯವಿದೆ.
 DocType: Customer,Primary Address and Contact Detail,ಪ್ರಾಥಮಿಕ ವಿಳಾಸ ಮತ್ತು ಸಂಪರ್ಕ ವಿವರಗಳು
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.js,Resend Payment Email,ಪಾವತಿ ಇಮೇಲ್ ಅನ್ನು ಮತ್ತೆ ಕಳುಹಿಸಿ
@@ -2843,7 +2852,6 @@
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py,Against Supplier Invoice {0} dated {1},ಸರಬರಾಜುದಾರ ವಿರುದ್ಧ ಸರಕುಪಟ್ಟಿ {0} ರ {1}
 DocType: Customer,Default Price List,ಡೀಫಾಲ್ಟ್ ಬೆಲೆ ಪಟ್ಟಿ
 apps/erpnext/erpnext/assets/doctype/asset/asset.py,Asset Movement record {0} created,ಆಸ್ತಿ ಚಳವಳಿ ದಾಖಲೆ {0} ದಾಖಲಿಸಿದವರು
-apps/erpnext/erpnext/utilities/page/leaderboard/leaderboard.js,No items found.,ಯಾವುದೇ ಐಟಂಗಳು ಕಂಡುಬಂದಿಲ್ಲ.
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py,You cannot delete Fiscal Year {0}. Fiscal Year {0} is set as default in Global Settings,ನೀವು ಅಳಿಸಲು ಸಾಧ್ಯವಿಲ್ಲ ಹಣಕಾಸಿನ ವರ್ಷದ {0}. ಹಣಕಾಸಿನ ವರ್ಷ {0} ಜಾಗತಿಕ ಸೆಟ್ಟಿಂಗ್ಗಳು ಡೀಫಾಲ್ಟ್ ಆಗಿ ಹೊಂದಿಸಲಾಗಿದೆ
 DocType: Share Transfer,Equity/Liability Account,ಇಕ್ವಿಟಿ / ಹೊಣೆಗಾರಿಕೆ ಖಾತೆ
 apps/erpnext/erpnext/setup/doctype/customer_group/customer_group.py,A customer with the same name already exists,ಅದೇ ಹೆಸರಿನ ಗ್ರಾಹಕರು ಈಗಾಗಲೇ ಅಸ್ತಿತ್ವದಲ್ಲಿದ್ದಾರೆ
@@ -2859,6 +2867,7 @@
 apps/erpnext/erpnext/selling/doctype/customer/customer.py,Credit limit has been crossed for customer {0} ({1}/{2}),ಗ್ರಾಹಕನಿಗೆ ಕ್ರೆಡಿಟ್ ಮಿತಿಯನ್ನು ದಾಟಿದೆ {0} ({1} / {2})
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py,Customer required for 'Customerwise Discount',' Customerwise ಡಿಸ್ಕೌಂಟ್ ' ಅಗತ್ಯವಿದೆ ಗ್ರಾಹಕ
 apps/erpnext/erpnext/config/accounting.py,Update bank payment dates with journals.,ಜರ್ನಲ್ ಬ್ಯಾಂಕಿಂಗ್ ಪಾವತಿ ದಿನಾಂಕ ನವೀಕರಿಸಿ .
+,Billed Qty,ಕ್ಯೂಟಿ ಬಿಲ್ ಮಾಡಲಾಗಿದೆ
 apps/erpnext/erpnext/stock/doctype/item/item_dashboard.py,Pricing,ಬೆಲೆ
 DocType: Employee,Attendance Device ID (Biometric/RF tag ID),ಹಾಜರಾತಿ ಸಾಧನ ID (ಬಯೋಮೆಟ್ರಿಕ್ / ಆರ್ಎಫ್ ಟ್ಯಾಗ್ ಐಡಿ)
 DocType: Quotation,Term Details,ಟರ್ಮ್ ವಿವರಗಳು
@@ -2882,6 +2891,7 @@
 DocType: Share Transfer,Asset Account,ಆಸ್ತಿ ಖಾತೆ
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js,New release date should be in the future,ಹೊಸ ಬಿಡುಗಡೆ ದಿನಾಂಕ ಭವಿಷ್ಯದಲ್ಲಿರಬೇಕು
 DocType: Purchase Invoice,End date of current invoice's period,ಪ್ರಸ್ತುತ ಅವಧಿಯ ಸರಕುಪಟ್ಟಿ ಅಂತಿಮ ದಿನಾಂಕ
+apps/erpnext/erpnext/hr/doctype/employee/employee.py,Please setup Employee Naming System in Human Resource &gt; HR Settings,ದಯವಿಟ್ಟು ಮಾನವ ಸಂಪನ್ಮೂಲ&gt; ಮಾನವ ಸಂಪನ್ಮೂಲ ಸೆಟ್ಟಿಂಗ್‌ಗಳಲ್ಲಿ ನೌಕರರ ಹೆಸರಿಸುವ ವ್ಯವಸ್ಥೆಯನ್ನು ಹೊಂದಿಸಿ
 DocType: Lab Test,Technician Name,ತಂತ್ರಜ್ಞ ಹೆಸರು
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py,"Cannot ensure delivery by Serial No as \
 					Item {0} is added with and without Ensure Delivery by \
@@ -2889,6 +2899,7 @@
 DocType: Accounts Settings,Unlink Payment on Cancellation of Invoice,ಸರಕುಪಟ್ಟಿ ರದ್ದು ಮೇಲೆ ಪಾವತಿ ಅನ್ಲಿಂಕ್
 DocType: Bank Reconciliation,From Date,Fromdate
 apps/erpnext/erpnext/hr/doctype/vehicle_log/vehicle_log.py,Current Odometer reading entered should be greater than initial Vehicle Odometer {0},ಪ್ರವೇಶಿಸಿತು ಪ್ರಸ್ತುತ ದೂರಮಾಪಕ ಓದುವ ಆರಂಭಿಕ ವಾಹನ ದೂರಮಾಪಕ ಹೆಚ್ಚು ಇರಬೇಕು {0}
+,Purchase Order Items To Be Received or Billed,ಸ್ವೀಕರಿಸಲು ಅಥವಾ ಬಿಲ್ ಮಾಡಲು ಆರ್ಡರ್ ವಸ್ತುಗಳನ್ನು ಖರೀದಿಸಿ
 DocType: Restaurant Reservation,No Show,ಶೋ ಇಲ್ಲ
 apps/erpnext/erpnext/regional/india/utils.py,You must be a registered supplier to generate e-Way Bill,ಇ-ವೇ ಬಿಲ್ ರಚಿಸಲು ನೀವು ನೋಂದಾಯಿತ ಪೂರೈಕೆದಾರರಾಗಿರಬೇಕು
 DocType: Shipping Rule Country,Shipping Rule Country,ಶಿಪ್ಪಿಂಗ್ ಆಡಳಿತ
@@ -2930,6 +2941,7 @@
 apps/erpnext/erpnext/templates/generators/item/item_add_to_cart.html,View in Cart,ಕಾರ್ಟ್ ವೀಕ್ಷಿಸಿ
 DocType: Employee Checkin,Shift Actual Start,ನಿಜವಾದ ಪ್ರಾರಂಭವನ್ನು ಬದಲಾಯಿಸಿ
 DocType: Tally Migration,Is Day Book Data Imported,ದಿನ ಪುಸ್ತಕ ಡೇಟಾವನ್ನು ಆಮದು ಮಾಡಲಾಗಿದೆ
+,Purchase Order Items To Be Received or Billed1,ಸ್ವೀಕರಿಸಲು ಅಥವಾ ಬಿಲ್ ಮಾಡಲು ಆರ್ಡರ್ ವಸ್ತುಗಳನ್ನು ಖರೀದಿಸಿ
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py,Marketing Expenses,ಮಾರ್ಕೆಟಿಂಗ್ ವೆಚ್ಚಗಳು
 apps/erpnext/erpnext/stock/doctype/pick_list/pick_list.py,{0} units of {1} is not available.,{1} ನ {0} ಘಟಕಗಳು ಲಭ್ಯವಿಲ್ಲ.
 ,Item Shortage Report,ಐಟಂ ಕೊರತೆ ವರದಿ
@@ -3300,6 +3312,7 @@
 ,Campaign Efficiency,ಕ್ಯಾಂಪೇನ್ ದಕ್ಷತೆ
 ,Campaign Efficiency,ಕ್ಯಾಂಪೇನ್ ದಕ್ಷತೆ
 DocType: Discussion,Discussion,ಚರ್ಚೆ
+apps/erpnext/erpnext/setup/default_energy_point_rules.py,On Sales Order Submission,ಮಾರಾಟ ಆದೇಶ ಸಲ್ಲಿಕೆಗೆ
 DocType: Bank Transaction,Transaction ID,ವ್ಯವಹಾರ ಐಡಿ
 DocType: Payroll Entry,Deduct Tax For Unsubmitted Tax Exemption Proof,ಸಲ್ಲಿಸದ ತೆರಿಗೆ ವಿನಾಯಿತಿ ಪ್ರೂಫ್ಗಾಗಿ ತೆರಿಗೆ ಕಡಿತಗೊಳಿಸಿ
 DocType: Volunteer,Anytime,ಯಾವ ಸಮಯದಲ್ಲಾದರೂ
@@ -3307,7 +3320,6 @@
 DocType: Employee Tax Exemption Proof Submission,Employee Tax Exemption Proof Submission,ನೌಕರರ ತೆರಿಗೆ ವಿನಾಯಿತಿ ಪ್ರೂಫ್ ಸಲ್ಲಿಕೆ
 DocType: Patient,Surgical History,ಸರ್ಜಿಕಲ್ ಹಿಸ್ಟರಿ
 DocType: Bank Statement Settings Item,Mapped Header,ಮ್ಯಾಪ್ಡ್ ಹೆಡರ್
-apps/erpnext/erpnext/hr/doctype/employee/employee.py,Please setup Employee Naming System in Human Resource &gt; HR Settings,ದಯವಿಟ್ಟು ಮಾನವ ಸಂಪನ್ಮೂಲ&gt; ಮಾನವ ಸಂಪನ್ಮೂಲ ಸೆಟ್ಟಿಂಗ್‌ಗಳಲ್ಲಿ ನೌಕರರ ಹೆಸರಿಸುವ ವ್ಯವಸ್ಥೆಯನ್ನು ಹೊಂದಿಸಿ
 DocType: Employee,Resignation Letter Date,ರಾಜೀನಾಮೆ ಪತ್ರ ದಿನಾಂಕ
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Pricing Rules are further filtered based on quantity.,ಬೆಲೆ ನಿಯಮಗಳಲ್ಲಿ ಮತ್ತಷ್ಟು ಪ್ರಮಾಣವನ್ನು ಆಧರಿಸಿ ಫಿಲ್ಟರ್.
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py,Please set the Date Of Joining for employee {0},ನೌಕರ ಸೇರುವ ದಿನಾಂಕ ದಯವಿಟ್ಟು {0}
@@ -3322,6 +3334,7 @@
 DocType: Bank Statement Settings,Mapped Items,ಮ್ಯಾಪ್ ಮಾಡಿದ ಐಟಂಗಳು
 DocType: Amazon MWS Settings,IT,IT
 DocType: Chapter,Chapter,ಅಧ್ಯಾಯ
+,Fixed Asset Register,ಸ್ಥಿರ ಆಸ್ತಿ ನೋಂದಣಿ
 apps/erpnext/erpnext/utilities/user_progress.py,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,Select BOM and Qty for Production,ಪ್ರೊಡಕ್ಷನ್ ಬಿಒಎಮ್ ಮತ್ತು ಪ್ರಮಾಣ ಆಯ್ಕೆ
@@ -3451,7 +3464,6 @@
 apps/erpnext/erpnext/templates/emails/reorder_item.html,Following Material Requests have been raised automatically based on Item's re-order level,ಮೆಟೀರಿಯಲ್ ವಿನಂತಿಗಳು ಕೆಳಗಿನ ಐಟಂ ಮರು ಆದೇಶ ಮಟ್ಟವನ್ನು ಆಧರಿಸಿ ಸ್ವಯಂಚಾಲಿತವಾಗಿ ಎದ್ದಿವೆ
 apps/erpnext/erpnext/controllers/accounts_controller.py,Account {0} is invalid. Account Currency must be {1},ಖಾತೆ {0} ಅಮಾನ್ಯವಾಗಿದೆ. ಖಾತೆ ಕರೆನ್ಸಿ ಇರಬೇಕು {1}
 apps/erpnext/erpnext/hr/doctype/salary_structure_assignment/salary_structure_assignment.py,From Date {0} cannot be after employee's relieving Date {1},ದಿನಾಂಕದಿಂದ {0} ಉದ್ಯೋಗಿಗಳ ನಿವಾರಣೆ ದಿನಾಂಕದ ನಂತರ ಇರುವಂತಿಲ್ಲ {1}
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py,Debit Note {0} has been created automatically,ಡೆಬಿಟ್ ಟಿಪ್ಪಣಿ {0} ಅನ್ನು ಸ್ವಯಂಚಾಲಿತವಾಗಿ ರಚಿಸಲಾಗಿದೆ
 apps/erpnext/erpnext/accounts/doctype/payment_order/payment_order.js,Create Payment Entries,ಪಾವತಿ ನಮೂದುಗಳನ್ನು ರಚಿಸಿ
 DocType: Supplier,Is Internal Supplier,ಆಂತರಿಕ ಪೂರೈಕೆದಾರರು
 DocType: Employee,Create User Permission,ಬಳಕೆದಾರರ ಅನುಮತಿಯನ್ನು ರಚಿಸಿ
@@ -4011,7 +4023,6 @@
 DocType: Project User,Project Status,ಸ್ಥಿತಿ
 DocType: UOM,Check this to disallow fractions. (for Nos),ಭಿನ್ನರಾಶಿಗಳನ್ನು ಅವಕಾಶ ಈ ಪರಿಶೀಲಿಸಿ . ( ಸೂಲ ಫಾರ್ )
 DocType: Student Admission Program,Naming Series (for Student Applicant),ಸರಣಿ ಹೆಸರಿಸುವ (ವಿದ್ಯಾರ್ಥಿ ಅರ್ಜಿದಾರರಿಂದ)
-apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.py,UOM Conversion factor ({0} -&gt; {1}) not found for item: {2},ಐಟಂಗೆ UOM ಪರಿವರ್ತನೆ ಅಂಶ ({0} -&gt; {1}) ಕಂಡುಬಂದಿಲ್ಲ: {2}
 apps/erpnext/erpnext/hr/doctype/retention_bonus/retention_bonus.py,Bonus Payment Date cannot be a past date,ಬೋನಸ್ ಪಾವತಿ ದಿನಾಂಕವು ಹಿಂದಿನ ದಿನಾಂಕವಾಗಿರಬಾರದು
 DocType: Travel Request,Copy of Invitation/Announcement,ಆಮಂತ್ರಣ / ಪ್ರಕಟಣೆಯ ನಕಲು
 DocType: Practitioner Service Unit Schedule,Practitioner Service Unit Schedule,ಪ್ರಾಕ್ಟೀಷನರ್ ಸರ್ವೀಸ್ ಯುನಿಟ್ ವೇಳಾಪಟ್ಟಿ
@@ -4254,7 +4265,6 @@
 DocType: Journal Entry,Accounting Entries,ಲೆಕ್ಕಪರಿಶೋಧಕ ನಮೂದುಗಳು
 DocType: Job Card Time Log,Job Card Time Log,ಜಾಬ್ ಕಾರ್ಡ್ ಸಮಯ ಲಾಗ್
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,"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; ಕ್ಷೇತ್ರದಲ್ಲಿ ಅದನ್ನು ತರಲಾಗುತ್ತದೆ."
-apps/erpnext/erpnext/education/doctype/instructor/instructor.py,Please setup Instructor Naming System in Education &gt; Education Settings,ಶಿಕ್ಷಣ&gt; ಶಿಕ್ಷಣ ಸೆಟ್ಟಿಂಗ್‌ಗಳಲ್ಲಿ ಬೋಧಕ ಹೆಸರಿಸುವ ವ್ಯವಸ್ಥೆಯನ್ನು ದಯವಿಟ್ಟು ಹೊಂದಿಸಿ
 DocType: Journal Entry,Paid Loan,ಪಾವತಿಸಿದ ಸಾಲ
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py,Duplicate Entry. Please check Authorization Rule {0},ಎಂಟ್ರಿ ನಕಲು . ಅಧಿಕಾರ ರೂಲ್ ಪರಿಶೀಲಿಸಿ {0}
 DocType: Journal Entry Account,Reference Due Date,ಉಲ್ಲೇಖ ದಿನಾಂಕ ಕಾರಣ
@@ -4271,7 +4281,6 @@
 apps/erpnext/erpnext/templates/pages/projects.html,No time sheets,ಯಾವುದೇ ಸಮಯ ಹಾಳೆಗಳನ್ನು
 DocType: GoCardless Mandate,GoCardless Customer,ಗೋಕಾರ್ಡ್ಲೆಸ್ ಗ್ರಾಹಕ
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py,Leave Type {0} cannot be carry-forwarded,{0} ಸಾಗಿಸುವ-ಫಾರ್ವರ್ಡ್ ಸಾಧ್ಯವಿಲ್ಲ ಕೌಟುಂಬಿಕತೆ ಬಿಡಿ
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Item Code &gt; Item Group &gt; Brand,ಐಟಂ ಕೋಡ್&gt; ಐಟಂ ಗುಂಪು&gt; ಬ್ರಾಂಡ್
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py,Maintenance Schedule is not generated for all the items. Please click on 'Generate Schedule',ನಿರ್ವಹಣೆ ವೇಳಾಪಟ್ಟಿ ಎಲ್ಲಾ ಐಟಂಗಳನ್ನು ಉತ್ಪತ್ತಿಯಾಗುವುದಿಲ್ಲ. ವೇಳಾಪಟ್ಟಿ ' ' ರಚಿಸಿ 'ಅನ್ನು ಕ್ಲಿಕ್ ಮಾಡಿ
 ,To Produce,ಉತ್ಪಾದಿಸಲು
 DocType: Leave Encashment,Payroll,ವೇತನದಾರರ
@@ -4386,7 +4395,6 @@
 DocType: Stock Ledger Entry,Actual Qty After Transaction,ವ್ಯವಹಾರದ ನಂತರ ನಿಜವಾದ ಪ್ರಮಾಣ
 ,Pending SO Items For Purchase Request,ಖರೀದಿ ವಿನಂತಿ ಆದ್ದರಿಂದ ಐಟಂಗಳು ಬಾಕಿ
 apps/erpnext/erpnext/education/doctype/student_admission/student_admission.py,Student Admissions,ವಿದ್ಯಾರ್ಥಿ ಪ್ರವೇಶ
-apps/erpnext/erpnext/accounts/party.py,{0} {1} is disabled,{0} {1} ನಿಷ್ಕ್ರಿಯಗೊಳಿಸಲಾಗಿದೆ
 DocType: Supplier,Billing Currency,ಬಿಲ್ಲಿಂಗ್ ಕರೆನ್ಸಿ
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py,Extra Large,ಎಕ್ಸ್ಟ್ರಾ ದೊಡ್ಡದು
 DocType: Loan,Loan Application,ಸಾಲದ ಅರ್ಜಿ
@@ -4463,7 +4471,6 @@
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py,Only Leave Applications with status 'Approved' and 'Rejected' can be submitted,ಮಾತ್ರ ಸ್ಥಿತಿಯನ್ನು ಅನ್ವಯಗಳಲ್ಲಿ ಬಿಡಿ &#39;ಅಂಗೀಕಾರವಾದ&#39; ಮತ್ತು &#39;ತಿರಸ್ಕರಿಸಲಾಗಿದೆ&#39; ಸಲ್ಲಿಸಿದ ಮಾಡಬಹುದು
 apps/erpnext/erpnext/accounts/doctype/accounting_dimension/accounting_dimension.py,Creating Dimensions...,ಆಯಾಮಗಳನ್ನು ರಚಿಸಲಾಗುತ್ತಿದೆ ...
 apps/erpnext/erpnext/education/doctype/student_group_creation_tool/student_group_creation_tool.py,Student Group Name is mandatory in row {0},ವಿದ್ಯಾರ್ಥಿ ಗುಂಪು ಹೆಸರು ಸತತವಾಗಿ ಕಡ್ಡಾಯ {0}
-DocType: Customer Credit Limit,Bypass credit limit_check,ಬೈಪಾಸ್ ಕ್ರೆಡಿಟ್ ಮಿತಿ_ ಪರಿಶೀಲನೆ
 DocType: Homepage,Products to be shown on website homepage,ಉತ್ಪನ್ನಗಳು ವೆಬ್ಸೈಟ್ ಮುಖಪುಟದಲ್ಲಿ ತೋರಿಸಲಾಗುತ್ತದೆ
 DocType: HR Settings,Password Policy,ಪಾಸ್ವರ್ಡ್ ನೀತಿ
 apps/erpnext/erpnext/setup/doctype/customer_group/customer_group.js,This is a root customer group and cannot be edited.,ಈ ಗ್ರಾಹಕ ಗುಂಪಿನ ಮೂಲ ಮತ್ತು ಸಂಪಾದಿತವಾಗಿಲ್ಲ .
@@ -5059,6 +5066,7 @@
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py,No {0} found for Inter Company Transactions.,ಇಂಟರ್ ಕಂಪೆನಿ ಟ್ರಾನ್ಸಾಕ್ಷನ್ಸ್ಗೆ ಯಾವುದೇ {0} ಕಂಡುಬಂದಿಲ್ಲ.
 DocType: Travel Itinerary,Rented Car,ಬಾಡಿಗೆ ಕಾರು
 apps/erpnext/erpnext/public/js/hub/components/profile_dialog.js,About your Company,ನಿಮ್ಮ ಕಂಪನಿ ಬಗ್ಗೆ
+apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.js,Show Stock Ageing Data,ಸ್ಟಾಕ್ ಏಜಿಂಗ್ ಡೇಟಾವನ್ನು ತೋರಿಸಿ
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py,Credit To account must be a Balance Sheet account,ಖಾತೆಗೆ ಕ್ರೆಡಿಟ್ ಬ್ಯಾಲೆನ್ಸ್ ಶೀಟ್ ಖಾತೆ ಇರಬೇಕು
 DocType: Donor,Donor,ದಾನಿ
 DocType: Global Defaults,Disable In Words,ವರ್ಡ್ಸ್ ನಿಷ್ಕ್ರಿಯಗೊಳಿಸಿ
@@ -5072,8 +5080,10 @@
 DocType: Patient,Patient ID,ರೋಗಿಯ ID
 DocType: Practitioner Schedule,Schedule Name,ವೇಳಾಪಟ್ಟಿ ಹೆಸರು
 DocType: Currency Exchange,For Buying,ಖರೀದಿಸಲು
+apps/erpnext/erpnext/setup/default_energy_point_rules.py,On Purchase Order Submission,ಖರೀದಿ ಆದೇಶ ಸಲ್ಲಿಕೆಗೆ
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js,Add All Suppliers,ಎಲ್ಲಾ ಪೂರೈಕೆದಾರರನ್ನು ಸೇರಿಸಿ
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py,Row #{0}: Allocated Amount cannot be greater than outstanding amount.,ರೋ # {0}: ನಿಗದಿ ಪ್ರಮಾಣ ಬಾಕಿ ಮೊತ್ತದ ಹೆಚ್ಚು ಹೆಚ್ಚಿರಬಾರದು.
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Customer &gt; Customer Group &gt; Territory,ಗ್ರಾಹಕ&gt; ಗ್ರಾಹಕ ಗುಂಪು&gt; ಪ್ರದೇಶ
 DocType: Tally Migration,Parties,ಪಕ್ಷಗಳು
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js,Browse BOM,ಬ್ರೌಸ್ BOM
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py,Secured Loans,ಸುರಕ್ಷಿತ ಸಾಲ
@@ -5104,6 +5114,7 @@
 apps/erpnext/erpnext/stock/doctype/item_alternative/item_alternative.py,Not allow to set alternative item for the item {0},ಐಟಂ {0} ಗಾಗಿ ಪರ್ಯಾಯ ಐಟಂ ಅನ್ನು ಹೊಂದಿಸಲು ಅನುಮತಿಸುವುದಿಲ್ಲ
 apps/erpnext/erpnext/hr/doctype/leave_block_list/leave_block_list.py,Date is repeated,ದಿನಾಂಕ ಪುನರಾವರ್ತಿಸುತ್ತದೆ
 apps/erpnext/erpnext/accounts/print_format/payment_receipt_voucher/payment_receipt_voucher.html,Authorized Signatory,ಅಧಿಕೃತ ಸಹಿ
+apps/erpnext/erpnext/education/doctype/instructor/instructor.py,Please setup Instructor Naming System in Education &gt; Education Settings,ಶಿಕ್ಷಣ&gt; ಶಿಕ್ಷಣ ಸೆಟ್ಟಿಂಗ್‌ಗಳಲ್ಲಿ ಬೋಧಕ ಹೆಸರಿಸುವ ವ್ಯವಸ್ಥೆಯನ್ನು ದಯವಿಟ್ಟು ಹೊಂದಿಸಿ
 apps/erpnext/erpnext/regional/doctype/gstr_3b_report/gstr_3b_report.html,Net ITC Available(A) - (B),ನೆಟ್ ಐಟಿಸಿ ಲಭ್ಯವಿದೆ (ಎ) - (ಬಿ)
 apps/erpnext/erpnext/education/doctype/fee_schedule/fee_schedule.js,Create Fees,ಶುಲ್ಕಗಳು ರಚಿಸಿ
 DocType: Project,Total Purchase Cost (via Purchase Invoice),ಒಟ್ಟು ಖರೀದಿ ವೆಚ್ಚ (ಖರೀದಿ ಸರಕುಪಟ್ಟಿ ಮೂಲಕ)
@@ -5123,6 +5134,7 @@
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.js,Message Sent,ಕಳುಹಿಸಿದ ಸಂದೇಶವನ್ನು
 apps/erpnext/erpnext/accounts/doctype/account/account.py,Account with child nodes cannot be set as ledger,ಚೈಲ್ಡ್ ನೋಡ್ಗಳ ಜೊತೆ ಖಾತೆ ಲೆಡ್ಜರ್ ಎಂದು ಹೊಂದಿಸಲು ಸಾಧ್ಯವಿಲ್ಲ
 DocType: C-Form,II,II ನೇ
+apps/erpnext/erpnext/assets/report/fixed_asset_register/fixed_asset_register.py,Vendor Name,ಮಾರಾಟಗಾರರ ಹೆಸರು
 DocType: Quiz Result,Wrong,ತಪ್ಪಾಗಿದೆ
 DocType: Sales Invoice,Rate at which Price list currency is converted to customer's base currency,ಬೆಲೆ ಪಟ್ಟಿ ಕರೆನ್ಸಿ ದರ ಗ್ರಾಹಕ ಬೇಸ್ ಕರೆನ್ಸಿ ಪರಿವರ್ತನೆ
 DocType: Purchase Invoice Item,Net Amount (Company Currency),ನೆಟ್ ಪ್ರಮಾಣ (ಕಂಪನಿ ಕರೆನ್ಸಿ)
@@ -5363,6 +5375,7 @@
 DocType: Stock Settings,Auto Material Request,ಆಟೋ ಉತ್ಪನ್ನ ವಿನಂತಿ
 DocType: Woocommerce Settings,API consumer secret,API ಗ್ರಾಹಕ ರಹಸ್ಯ
 DocType: Delivery Note Item,Available Batch Qty at From Warehouse,ಗೋದಾಮಿನ ಲಭ್ಯವಿದೆ ಬ್ಯಾಚ್ ಪ್ರಮಾಣ
+,Received Qty Amount,ಕ್ಯೂಟಿ ಮೊತ್ತವನ್ನು ಸ್ವೀಕರಿಸಲಾಗಿದೆ
 DocType: Salary Slip,Gross Pay - Total Deduction - Loan Repayment,ಒಟ್ಟು ಪೇ - ಒಟ್ಟು ವಿನಾಯಿತಿ - ಸಾಲದ ಮರುಪಾವತಿಯ
 DocType: Bank Account,Last Integration Date,ಕೊನೆಯ ಏಕೀಕರಣ ದಿನಾಂಕ
 DocType: Expense Claim,Expense Taxes and Charges,ಖರ್ಚು ತೆರಿಗೆಗಳು ಮತ್ತು ಶುಲ್ಕಗಳು
@@ -5824,6 +5837,8 @@
 DocType: Drug Prescription,Hour,ಗಂಟೆ
 DocType: Restaurant Order Entry,Last Sales Invoice,ಕೊನೆಯ ಮಾರಾಟದ ಸರಕುಪಟ್ಟಿ
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py,Please select Qty against item {0},ಐಟಂ ವಿರುದ್ಧ ಕ್ಯೂಟಿ ಆಯ್ಕೆ ಮಾಡಿ {0}
+apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py,Latest Age,ಇತ್ತೀಚಿನ ವಯಸ್ಸು
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js,Transfer Material to Supplier,ಸರಬರಾಜುದಾರರಿಗೆ ವಸ್ತು ವರ್ಗಾವಣೆ
 apps/erpnext/erpnext/hr/report/loan_repayment/loan_repayment.py,EMI,ಇಎಂಐ
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py,New Serial No cannot have Warehouse. Warehouse must be set by Stock Entry or Purchase Receipt,ಹೊಸ ಸೀರಿಯಲ್ ನಂ ಗೋದಾಮಿನ ಸಾಧ್ಯವಿಲ್ಲ . ವೇರ್ಹೌಸ್ ಷೇರು ಖರೀದಿ ರಸೀತಿ ಎಂಟ್ರಿ ಅಥವಾ ಸೆಟ್ ಮಾಡಬೇಕು
 DocType: Lead,Lead Type,ಲೀಡ್ ಪ್ರಕಾರ
@@ -5845,7 +5860,6 @@
 apps/erpnext/erpnext/hr/doctype/employee_benefit_application/employee_benefit_application.py,"An amount of {0} already claimed for the component {1},\
 						 set the amount equal or greater than {2}",{1} ಅಂಶಕ್ಕೆ ಈಗಾಗಲೇ {0} ಹಕ್ಕು ಸಾಧಿಸಿದ ಮೊತ್ತವು \ 2 {2}
 DocType: Shipping Rule,Shipping Rule Conditions,ಶಿಪ್ಪಿಂಗ್ ರೂಲ್ ನಿಯಮಗಳು
-DocType: Purchase Invoice,Export Type,ರಫ್ತು ಕೌಟುಂಬಿಕತೆ
 DocType: Salary Slip Loan,Salary Slip Loan,ವೇತನ ಸ್ಲಿಪ್ ಸಾಲ
 DocType: BOM Update Tool,The new BOM after replacement,ಬದಲಿ ನಂತರ ಹೊಸ BOM
 ,Point of Sale,ಪಾಯಿಂಟ್ ಆಫ್ ಸೇಲ್
@@ -5965,7 +5979,6 @@
 DocType: Purchase Order Item,Blanket Order Rate,ಬ್ಲ್ಯಾಂಕೆಟ್ ಆರ್ಡರ್ ದರ
 ,Customer Ledger Summary,ಗ್ರಾಹಕ ಲೆಡ್ಜರ್ ಸಾರಾಂಶ
 apps/erpnext/erpnext/hooks.py,Certification,ಪ್ರಮಾಣೀಕರಣ
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js,Are you sure you want to make debit note?,ನೀವು ಡೆಬಿಟ್ ಟಿಪ್ಪಣಿ ಮಾಡಲು ಖಚಿತವಾಗಿ ಬಯಸುವಿರಾ?
 DocType: Bank Guarantee,Clauses and Conditions,ವಿಧಿಗಳು ಮತ್ತು ಷರತ್ತುಗಳು
 DocType: Serial No,Creation Document Type,ಸೃಷ್ಟಿ ಡಾಕ್ಯುಮೆಂಟ್ ಕೌಟುಂಬಿಕತೆ
 DocType: Amazon MWS Settings,ES,ಇಎಸ್
@@ -6003,8 +6016,6 @@
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py,Financial Services,ಹಣಕಾಸು ಸೇವೆಗಳು
 DocType: Student Sibling,Student ID,ವಿದ್ಯಾರ್ಥಿ ಗುರುತು
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.js,For Quantity must be greater than zero,ಪ್ರಮಾಣವು ಶೂನ್ಯಕ್ಕಿಂತ ಹೆಚ್ಚಿನದಾಗಿರಬೇಕು
-apps/erpnext/erpnext/hr/doctype/employee_transfer/employee_transfer.py,"Please delete the Employee <a href=""#Form/Employee/{0}"">{0}</a>\
-					to cancel this document","ಈ ಡಾಕ್ಯುಮೆಂಟ್ ರದ್ದುಗೊಳಿಸಲು ದಯವಿಟ್ಟು ನೌಕರ <a href=""#Form/Employee/{0}"">{0}</a> delete ಅನ್ನು ಅಳಿಸಿ"
 apps/erpnext/erpnext/config/projects.py,Types of activities for Time Logs,ಸಮಯ ದಾಖಲೆಗಳು ಚಟುವಟಿಕೆಗಳನ್ನು ವಿಧಗಳು
 DocType: Opening Invoice Creation Tool,Sales,ಮಾರಾಟದ
 DocType: Stock Entry Detail,Basic Amount,ಬೇಸಿಕ್ ಪ್ರಮಾಣ
@@ -6083,6 +6094,7 @@
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py,Print and Stationery,ಮುದ್ರಣ ಮತ್ತು ಲೇಖನ ಸಾಮಗ್ರಿ
 DocType: Stock Settings,Show Barcode Field,ಶೋ ಬಾರ್ಕೋಡ್ ಫೀಲ್ಡ್
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js,Send Supplier Emails,ಸರಬರಾಜುದಾರ ಇಮೇಲ್ಗಳನ್ನು ಕಳುಹಿಸಿ
+DocType: Asset Movement,ACC-ASM-.YYYY.-,ACC-ASM-.YYYY.-
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py,"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,ಸ್ವಯಂ ರಚಿಸಲಾಗಿದೆ
 apps/erpnext/erpnext/hr/doctype/employee_onboarding/employee_onboarding.py,Submit this to create the Employee record,ಉದ್ಯೋಗದಾತರ ದಾಖಲೆಯನ್ನು ರಚಿಸಲು ಇದನ್ನು ಸಲ್ಲಿಸಿ
@@ -6162,7 +6174,6 @@
 DocType: Sales Team,Contact No.,ಸಂಪರ್ಕಿಸಿ ನಂ
 apps/erpnext/erpnext/templates/includes/cart/cart_address.html,Billing Address is same as Shipping Address,ಬಿಲ್ಲಿಂಗ್ ವಿಳಾಸವು ಶಿಪ್ಪಿಂಗ್ ವಿಳಾಸದಂತೆಯೇ ಇರುತ್ತದೆ
 DocType: Bank Reconciliation,Payment Entries,ಪಾವತಿ ನಮೂದುಗಳು
-apps/erpnext/erpnext/erpnext_integrations/doctype/shopify_settings/shopify_settings.py,Access token or Shopify URL missing,ಪ್ರವೇಶ ಟೋಕನ್ ಅಥವಾ Shopify URL ಕಾಣೆಯಾಗಿದೆ
 DocType: Location,Latitude,ಅಕ್ಷಾಂಶ
 DocType: Work Order,Scrap Warehouse,ಸ್ಕ್ರ್ಯಾಪ್ ವೇರ್ಹೌಸ್
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py,"Warehouse required at Row No {0}, please set default warehouse for the item {1} for the company {2}","ರೋ ಇಲ್ಲ ಇಲ್ಲ {0} ನಲ್ಲಿ ಬೇಕಾದ ವೇರ್ಹೌಸ್, ದಯವಿಟ್ಟು ಕಂಪನಿ {2} ಗೆ ಐಟಂ {1} ಗಾಗಿ ಡೀಫಾಲ್ಟ್ ವೇರ್ಹೌಸ್ ಅನ್ನು ಹೊಂದಿಸಿ."
@@ -6206,7 +6217,6 @@
 DocType: Job Offer Term,Value / Description,ಮೌಲ್ಯ / ವಿವರಣೆ
 apps/erpnext/erpnext/controllers/accounts_controller.py,"Row #{0}: Asset {1} cannot be submitted, it is already {2}","ರೋ # {0}: ಆಸ್ತಿ {1} ಮಾಡಬಹುದು ಸಲ್ಲಿಸಲಾಗುತ್ತದೆ, ಇದು ಈಗಾಗಲೇ {2}"
 DocType: Tax Rule,Billing Country,ಬಿಲ್ಲಿಂಗ್ ಕಂಟ್ರಿ
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js,Are you sure you want to make credit note?,ನೀವು ಕ್ರೆಡಿಟ್ ನೋಟ್ ಮಾಡಲು ಖಚಿತವಾಗಿ ಬಯಸುವಿರಾ?
 DocType: Purchase Order Item,Expected Delivery Date,ನಿರೀಕ್ಷಿತ ಡೆಲಿವರಿ ದಿನಾಂಕ
 DocType: Restaurant Order Entry,Restaurant Order Entry,ರೆಸ್ಟೋರೆಂಟ್ ಆರ್ಡರ್ ಎಂಟ್ರಿ
 apps/erpnext/erpnext/accounts/general_ledger.py,Debit and Credit not equal for {0} #{1}. Difference is {2}.,ಡೆಬಿಟ್ ಮತ್ತು ಕ್ರೆಡಿಟ್ {0} # ಸಮಾನ ಅಲ್ಲ {1}. ವ್ಯತ್ಯಾಸ {2}.
@@ -6329,6 +6339,7 @@
 DocType: Purchase Invoice,Taxes and Charges Added,ಸೇರಿಸಲಾಗಿದೆ ತೆರಿಗೆಗಳು ಮತ್ತು ಶುಲ್ಕಗಳು
 apps/erpnext/erpnext/assets/doctype/asset/asset.py,Depreciation Row {0}: Next Depreciation Date cannot be before Available-for-use Date,ಸವಕಳಿ ಸಾಲು {0}: ಮುಂದಿನ ಸವಕಳಿ ದಿನಾಂಕ ಲಭ್ಯವಾಗುವ ದಿನಾಂಕದ ಮೊದಲು ಇರಬಾರದು
 ,Sales Funnel,ಮಾರಾಟ ಕೊಳವೆಯನ್ನು
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Item Code &gt; Item Group &gt; Brand,ಐಟಂ ಕೋಡ್&gt; ಐಟಂ ಗುಂಪು&gt; ಬ್ರಾಂಡ್
 apps/erpnext/erpnext/setup/doctype/company/company.py,Abbreviation is mandatory,ಸಂಕ್ಷೇಪಣ ಕಡ್ಡಾಯ
 DocType: Project,Task Progress,ಟಾಸ್ಕ್ ಪ್ರೋಗ್ರೆಸ್
 apps/erpnext/erpnext/templates/includes/navbar/navbar_items.html,Cart,ಕಾರ್ಟ್
@@ -6572,6 +6583,7 @@
 DocType: Employee Grade,Employee Grade,ಉದ್ಯೋಗಿ ಗ್ರೇಡ್
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py,Piecework,Piecework
 DocType: GSTR 3B Report,June,ಜೂನ್
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Supplier &gt; Supplier Type,ಸರಬರಾಜುದಾರ&gt; ಪೂರೈಕೆದಾರ ಪ್ರಕಾರ
 DocType: Share Balance,From No,ಇಲ್ಲ
 DocType: Shift Type,Early Exit Grace Period,ಆರಂಭಿಕ ನಿರ್ಗಮನ ಗ್ರೇಸ್ ಅವಧಿ
 DocType: Task,Actual Time (in Hours),(ಘಂಟೆಗಳಲ್ಲಿ) ವಾಸ್ತವ ಟೈಮ್
@@ -6854,6 +6866,7 @@
 DocType: Warehouse,Warehouse Name,ವೇರ್ಹೌಸ್ ಹೆಸರು
 DocType: Naming Series,Select Transaction,ಟ್ರಾನ್ಸಾಕ್ಷನ್ ಆಯ್ಕೆ
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py,Please enter Approving Role or Approving User,ಪಾತ್ರ ಅನುಮೋದಿಸಲಾಗುತ್ತಿದೆ ಅಥವಾ ಬಳಕೆದಾರ ಅನುಮೋದಿಸಲಾಗುತ್ತಿದೆ ನಮೂದಿಸಿ
+apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.py,UOM Conversion factor ({0} -&gt; {1}) not found for item: {2},ಐಟಂಗೆ UOM ಪರಿವರ್ತನೆ ಅಂಶ ({0} -&gt; {1}) ಕಂಡುಬಂದಿಲ್ಲ: {2}
 DocType: Journal Entry,Write Off Entry,ಎಂಟ್ರಿ ಆಫ್ ಬರೆಯಿರಿ
 DocType: BOM,Rate Of Materials Based On,ಮೆಟೀರಿಯಲ್ಸ್ ಆಧರಿಸಿದ ದರ
 DocType: Education Settings,"If enabled, field Academic Term will be Mandatory in Program Enrollment Tool.","ಸಕ್ರಿಯಗೊಳಿಸಿದಲ್ಲಿ, ಫೀಲ್ಡ್ ಅಕಾಡೆಮಿಕ್ ಟರ್ಮ್ ಪ್ರೋಗ್ರಾಂ ದಾಖಲಾತಿ ಪರಿಕರದಲ್ಲಿ ಕಡ್ಡಾಯವಾಗಿರುತ್ತದೆ."
@@ -7043,6 +7056,7 @@
 DocType: Quality Inspection Reading,Quality Inspection Reading,ಗುಣಮಟ್ಟದ ತಪಾಸಣೆ ಓದುವಿಕೆ
 apps/erpnext/erpnext/stock/doctype/stock_settings/stock_settings.py,`Freeze Stocks Older Than` should be smaller than %d days.,` ಸ್ಟಾಕ್ಗಳು ದ್ಯಾನ್ ಫ್ರೀಜ್ ` ಹಳೆಯ % d ದಿನಗಳಲ್ಲಿ ಹೆಚ್ಚು ಚಿಕ್ಕದಾಗಿರಬೇಕು.
 DocType: Tax Rule,Purchase Tax Template,ತೆರಿಗೆ ಟೆಂಪ್ಲೇಟು ಖರೀದಿಸಿ
+apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py,Earliest Age,ಆರಂಭಿಕ ವಯಸ್ಸು
 apps/erpnext/erpnext/utilities/user_progress.py,Set a sales goal you'd like to achieve for your company.,ನಿಮ್ಮ ಕಂಪನಿಗೆ ನೀವು ಸಾಧಿಸಲು ಬಯಸುವ ಮಾರಾಟದ ಗುರಿಯನ್ನು ಹೊಂದಿಸಿ.
 DocType: Quality Goal,Revision,ಪರಿಷ್ಕರಣೆ
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js,Healthcare Services,ಆರೋಗ್ಯ ಸೇವೆ
@@ -7085,6 +7099,7 @@
 apps/erpnext/erpnext/healthcare/doctype/patient_encounter/patient_encounter.js,Schedule Discharge,ವೇಳಾಪಟ್ಟಿ ಡಿಸ್ಚಾರ್ಜ್
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py,Cheques and Deposits incorrectly cleared,ಚೆಕ್ ಮತ್ತು ಠೇವಣಿಗಳ ತಪ್ಪಾಗಿ ತೆರವುಗೊಳಿಸಲಾಗಿದೆ
 DocType: Homepage Section Card,Homepage Section Card,ಮುಖಪುಟ ವಿಭಾಗ ಕಾರ್ಡ್
+,Amount To Be Billed,ಬಿಲ್ ಮಾಡಬೇಕಾದ ಮೊತ್ತ
 apps/erpnext/erpnext/accounts/doctype/account/account.py,Account {0}: You can not assign itself as parent account,ಖಾತೆ {0}: ನೀವು ಪೋಷಕರ ಖಾತೆಯ ಎಂದು ಸ್ವತಃ ನಿಯೋಜಿಸಲು ಸಾಧ್ಯವಿಲ್ಲ
 DocType: Purchase Invoice Item,Price List Rate,ಬೆಲೆ ಪಟ್ಟಿ ದರ
 apps/erpnext/erpnext/utilities/activation.py,Create customer quotes,ಗ್ರಾಹಕ ಉಲ್ಲೇಖಗಳು ರಚಿಸಿ
@@ -7137,6 +7152,7 @@
 DocType: Supplier Scorecard Criteria,Supplier Scorecard Criteria,ಸರಬರಾಜುದಾರ ಸ್ಕೋರ್ಕಾರ್ಡ್ ಮಾನದಂಡ
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py,Please select Start Date and End Date for Item {0},ಪ್ರಾರಂಭ ದಿನಾಂಕ ಮತ್ತು ಐಟಂ ಎಂಡ್ ದಿನಾಂಕ ಆಯ್ಕೆ ಮಾಡಿ {0}
 DocType: Maintenance Schedule,MAT-MSH-.YYYY.-,MAT-MSH -YYYY.-
+,Amount to Receive,ಸ್ವೀಕರಿಸುವ ಮೊತ್ತ
 apps/erpnext/erpnext/education/doctype/student_group_creation_tool/student_group_creation_tool.py,Course is mandatory in row {0},ಕೋರ್ಸ್ ಸತತವಾಗಿ ಕಡ್ಡಾಯ {0}
 apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py,From date can not be greater than than To date,ದಿನಾಂಕದಿಂದ ಇಲ್ಲಿಯವರೆಗೆ ದೊಡ್ಡದಾಗಿರಬಾರದು
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py,To date cannot be before from date,ಇಲ್ಲಿಯವರೆಗೆ fromDate ಮೊದಲು ಸಾಧ್ಯವಿಲ್ಲ
@@ -7590,6 +7606,7 @@
 DocType: Delivery Note,Print Without Amount,ಪ್ರಮಾಣ ಇಲ್ಲದೆ ಮುದ್ರಿಸು
 apps/erpnext/erpnext/accounts/report/asset_depreciation_ledger/asset_depreciation_ledger.py,Depreciation Date,ಸವಕಳಿ ದಿನಾಂಕ
 ,Work Orders in Progress,ಕೆಲಸದ ಆದೇಶಗಳು ಪ್ರಗತಿಯಲ್ಲಿದೆ
+DocType: Customer Credit Limit,Bypass Credit Limit Check,ಬೈಪಾಸ್ ಕ್ರೆಡಿಟ್ ಮಿತಿ ಪರಿಶೀಲನೆ
 DocType: Issue,Support Team,ಬೆಂಬಲ ತಂಡ
 apps/erpnext/erpnext/stock/report/batch_item_expiry_status/batch_item_expiry_status.py,Expiry (In Days),ಅಂತ್ಯ (ದಿನಗಳಲ್ಲಿ)
 DocType: Appraisal,Total Score (Out of 5),ಒಟ್ಟು ಸ್ಕೋರ್ ( 5)
@@ -7775,6 +7792,7 @@
 DocType: Sales Invoice,Customer GSTIN,ಗ್ರಾಹಕ GSTIN
 DocType: Crop Cycle,List of diseases detected on the field. When selected it'll automatically add a list of tasks to deal with the disease ,ಮೈದಾನದಲ್ಲಿ ಪತ್ತೆಯಾದ ರೋಗಗಳ ಪಟ್ಟಿ. ಆಯ್ಕೆಮಾಡಿದಾಗ ಅದು ರೋಗದೊಂದಿಗೆ ವ್ಯವಹರಿಸಲು ಕಾರ್ಯಗಳ ಪಟ್ಟಿಯನ್ನು ಸ್ವಯಂಚಾಲಿತವಾಗಿ ಸೇರಿಸುತ್ತದೆ
 apps/erpnext/erpnext/manufacturing/page/bom_comparison_tool/bom_comparison_tool.js,BOM 1,BOM 1
+apps/erpnext/erpnext/assets/report/fixed_asset_register/fixed_asset_register.py,Asset Id,ಆಸ್ತಿ ಐಡಿ
 apps/erpnext/erpnext/healthcare/doctype/healthcare_service_unit/healthcare_service_unit.js,This is a root healthcare service unit and cannot be edited.,ಇದು ಮೂಲ ಆರೋಗ್ಯ ಸೇವೆ ಘಟಕವಾಗಿದೆ ಮತ್ತು ಸಂಪಾದಿಸಲು ಸಾಧ್ಯವಿಲ್ಲ.
 DocType: Asset Repair,Repair Status,ದುರಸ್ತಿ ಸ್ಥಿತಿ
 apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.js,"Requested Qty: Quantity requested for purchase, but not ordered.","ವಿನಂತಿಸಲಾಗಿದೆ ಪ್ರಮಾಣ: ಪ್ರಮಾಣ ಆದೇಶ ಖರೀದಿಗಾಗಿ ವಿನಂತಿಸಿದ , ಆದರೆ ."
diff --git a/erpnext/translations/ko.csv b/erpnext/translations/ko.csv
index c089e5e..1ff9873 100644
--- a/erpnext/translations/ko.csv
+++ b/erpnext/translations/ko.csv
@@ -289,7 +289,6 @@
 DocType: Loan,Repay Over Number of Periods,기간의 동안 수 상환
 apps/erpnext/erpnext/manufacturing/report/bom_stock_report/bom_stock_report.py,Quantity to Produce can not be less than Zero,생산량은 0보다 작을 수 없습니다.
 DocType: Stock Entry,Additional Costs,추가 비용
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Customer &gt; Customer Group &gt; Territory,고객&gt; 고객 그룹&gt; 지역
 apps/erpnext/erpnext/accounts/doctype/account/account.py,Account with existing transaction can not be converted to group.,기존 거래와 계정 그룹으로 변환 할 수 없습니다.
 DocType: Lead,Product Enquiry,제품 문의
 DocType: Education Settings,Validate Batch for Students in Student Group,학생 그룹의 학생들을위한 배치 확인
@@ -587,6 +586,7 @@
 DocType: Healthcare Settings,Create documents for sample collection,샘플 수집을위한 문서 작성
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py,Payment against {0} {1} cannot be greater than Outstanding Amount {2},에 대한 지불은 {0} {1} 뛰어난 금액보다 클 수 없습니다 {2}
 apps/erpnext/erpnext/patches/v11_0/add_healthcare_service_unit_tree_root.py,All Healthcare Service Units,모든 의료 서비스 유닛
+apps/erpnext/erpnext/setup/default_energy_point_rules.py,On Converting Opportunity,기회 전환에
 DocType: Bank Account,Address HTML,주소 HTML
 DocType: Lead,Mobile No.,모바일 번호
 apps/erpnext/erpnext/selling/doctype/pos_closing_voucher/closing_voucher_details.html,Mode of Payments,지불 방식
@@ -651,7 +651,6 @@
 DocType: Accounting Dimension,Dimension Name,측정 기준 이름
 apps/erpnext/erpnext/healthcare/setup.py,Resistant,저항하는
 apps/erpnext/erpnext/hotels/doctype/hotel_room_reservation/hotel_room_reservation.py,Please set Hotel Room Rate on {},{}에 호텔 객실 요금을 설정하십시오.
-apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py,Please setup numbering series for Attendance via Setup &gt; Numbering Series,설정&gt; 넘버링 시리즈를 통해 출석 용 넘버링 시리즈를 설정하십시오
 DocType: Journal Entry,Multi Currency,멀티 통화
 DocType: Bank Statement Transaction Invoice Item,Invoice Type,송장 유형
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py,Valid from date must be less than valid upto date,날짜 유효 기간은 날짜까지 유효해야합니다.
@@ -769,6 +768,7 @@
 apps/erpnext/erpnext/accounts/page/pos/pos.js,Create a new Customer,새로운 고객을 만들기
 apps/erpnext/erpnext/non_profit/report/expiring_memberships/expiring_memberships.py,Expiring On,만료
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,"If multiple Pricing Rules continue to prevail, users are asked to set Priority manually to resolve conflict.","여러 가격의 규칙이 우선 계속되면, 사용자는 충돌을 해결하기 위해 수동으로 우선 순위를 설정하라는 메시지가 표시됩니다."
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js,Purchase Return,구매 돌아 가기
 apps/erpnext/erpnext/utilities/activation.py,Create Purchase Orders,구매 오더를 생성
 ,Purchase Register,회원에게 구매
 apps/erpnext/erpnext/healthcare/doctype/patient/patient.py,Patient not found,환자를 찾을 수 없음
@@ -784,7 +784,6 @@
 DocType: Location,Area UOM,면적 UOM
 apps/erpnext/erpnext/manufacturing/doctype/workstation/workstation.py,Workstation is closed on the following dates as per Holiday List: {0},워크 스테이션 홀리데이 목록에 따라 다음과 같은 날짜에 닫혀 : {0}
 apps/erpnext/erpnext/selling/page/sales_funnel/sales_funnel.py,Opportunities,기회
-apps/erpnext/erpnext/www/all-products/index.html,Clear filters,필터 지우기
 DocType: Lab Test Template,Single,미혼
 DocType: Compensatory Leave Request,Work From Date,근무일로부터
 DocType: Salary Slip,Total Loan Repayment,총 대출 상환
@@ -828,6 +827,7 @@
 apps/erpnext/erpnext/education/doctype/program_enrollment_tool/program_enrollment_tool.py,Mandatory field - Academic Year,필수 입력란 - Academic Year
 apps/erpnext/erpnext/education/doctype/program_enrollment_tool/program_enrollment_tool.py,Mandatory field - Academic Year,필수 입력란 - Academic Year
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py,{0} {1} is not associated with {2} {3},{0} {1}은 (는) {2} {3}과 관련이 없습니다.
+DocType: Opportunity,Converted By,로 변환
 apps/erpnext/erpnext/public/js/hub/components/ReviewArea.vue,You need to login as a Marketplace User before you can add any reviews.,리뷰를 추가하기 전에 마켓 플레이스 사용자로 로그인해야합니다.
 apps/erpnext/erpnext/manufacturing/doctype/job_card/job_card.py,Row {0} : Operation is required against the raw material item {1},행 {0} : 원료 항목 {1}에 대한 작업이 필요합니다.
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py,Please set default payable account for the company {0},회사 {0}에 대한 기본 지불 계정을 설정하십시오.
@@ -854,6 +854,8 @@
 DocType: Sales Invoice,Total Qty,총 수량
 apps/erpnext/erpnext/education/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py,Guardian2 Email ID,Guardian2 이메일 ID
 apps/erpnext/erpnext/education/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py,Guardian2 Email ID,Guardian2 이메일 ID
+apps/erpnext/erpnext/hr/doctype/employee_transfer/employee_transfer.py,"Please delete the Employee <a href=""#Form/Employee/{0}"">{0}</a>\
+					to cancel this document","이 문서를 취소하려면 직원 <a href=""#Form/Employee/{0}"">{0}을 (를)</a> 삭제하십시오"
 DocType: Item,Show in Website (Variant),웹 사이트에 표시 (변형)
 DocType: Employee,Health Concerns,건강 문제
 DocType: Payroll Entry,Select Payroll Period,급여 기간을 선택
@@ -914,7 +916,6 @@
 DocType: Codification Table,Codification Table,목록 화표
 DocType: Timesheet Detail,Hrs,시간
 apps/erpnext/erpnext/manufacturing/page/bom_comparison_tool/bom_comparison_tool.js,Changes in {0},{0}의 변경 사항
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js,Please select Company,회사를 선택하세요
 DocType: Employee Skill,Employee Skill,직원 기술
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.js,Difference Account,차이 계정
 DocType: Pricing Rule,Discount on Other Item,다른 항목 할인
@@ -983,6 +984,7 @@
 DocType: BOM,Operating Cost,운영 비용
 DocType: Crop,Produced Items,생산 품목
 DocType: Bank Statement Transaction Entry,Match Transaction to Invoices,송장에 대한 거래 일치
+apps/erpnext/erpnext/erpnext_integrations/exotel_integration.py,Error in Exotel incoming call,Exotel 전화 수신 오류
 DocType: Sales Order Item,Gross Profit,매출 총 이익
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js,Unblock Invoice,송장 차단 해제
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py,Increment cannot be 0,증가는 0이 될 수 없습니다
@@ -1198,6 +1200,7 @@
 DocType: Activity Cost,Activity Type,활동 유형
 DocType: Request for Quotation,For individual supplier,개별 업체에 대한
 DocType: BOM Operation,Base Hour Rate(Company Currency),자료 시간 비율 (회사 통화)
+,Qty To Be Billed,청구될 수량
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py,Delivered Amount,납품 금액
 apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.js,Reserved Qty for Production: Raw materials quantity to make manufacturing items.,생산을위한 예비 수량 : 제조 품목을 만들기위한 원자재 수량.
 DocType: Loyalty Point Entry Redemption,Redemption Date,사용 날짜
@@ -1318,7 +1321,7 @@
 apps/erpnext/erpnext/education/doctype/student_group/student_group.py,Please select Program,프로그램을 선택하십시오.
 apps/erpnext/erpnext/education/doctype/student_group/student_group.py,Please select Program,프로그램을 선택하십시오.
 DocType: Project,Estimated Cost,예상 비용
-DocType: Request for Quotation,Link to material requests,자료 요청에 대한 링크
+DocType: Supplier Quotation,Link to material requests,자료 요청에 대한 링크
 apps/erpnext/erpnext/public/js/hub/pages/Publish.vue,Publish,게시
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py,Aerospace,항공 우주
 ,Fichier des Ecritures Comptables [FEC],Fichier des Ecritures Comptables [FEC]
@@ -1331,6 +1334,7 @@
 apps/erpnext/erpnext/utilities/transaction_base.py,Invalid Posting Time,잘못된 전기 시간
 DocType: Salary Component,Condition and Formula,조건 및 수식
 DocType: Lead,Campaign Name,캠페인 이름
+apps/erpnext/erpnext/setup/default_energy_point_rules.py,On Task Completion,작업 완료시
 apps/erpnext/erpnext/hr/doctype/compensatory_leave_request/compensatory_leave_request.py,There is no leave period in between {0} and {1},{0}에서 {1} 사이에 휴가 기간이 없습니다.
 DocType: Fee Validity,Healthcare Practitioner,의료 종사자
 DocType: Hotel Room,Capacity,생산 능력
@@ -1695,7 +1699,6 @@
 DocType: Quality Feedback Template,Quality Feedback Template,품질 피드백 템플릿
 apps/erpnext/erpnext/config/education.py,LMS Activity,LMS 활동
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py,Internet Publishing,인터넷 게시
-DocType: Prescription Duration,Number,번호
 apps/erpnext/erpnext/accounts/doctype/opening_invoice_creation_tool/opening_invoice_creation_tool.js,Creating {0} Invoice,송장 생성 {0}
 DocType: Medical Code,Medical Code Standard,의료 코드 표준
 DocType: Soil Texture,Clay Composition (%),점토 조성 (%)
@@ -1770,6 +1773,7 @@
 DocType: Support Settings,Get Started Sections,시작 섹션
 DocType: Lead,CRM-LEAD-.YYYY.-,CRM-LEAD- .YYYY.-
 DocType: Invoice Discounting,Sanctioned,제재
+,Base Amount,기본 금액
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.js,Total Contribution Amount: {0},총 기여 금액 : {0}
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py,Row #{0}: Please specify Serial No for Item {1},행 번호는 {0} 항목에 대한 일련 번호를 지정하십시오 {1}
 DocType: Payroll Entry,Salary Slips Submitted,제출 된 급여 전표
@@ -1992,6 +1996,7 @@
 DocType: Accounting Dimension,Dimension Defaults,측정 기준 기본값
 apps/erpnext/erpnext/crm/report/prospects_engaged_but_not_converted/prospects_engaged_but_not_converted.js,Minimum Lead Age (Days),최소 납기 (일)
 apps/erpnext/erpnext/crm/report/prospects_engaged_but_not_converted/prospects_engaged_but_not_converted.js,Minimum Lead Age (Days),최소 납기 (일)
+apps/erpnext/erpnext/assets/report/fixed_asset_register/fixed_asset_register.py,Available For Use Date,사용 가능한 날짜
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py,All BOMs,모든 BOM을
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js,Create Inter Company Journal Entry,회사 간판 항목 생성
 DocType: Company,Parent Company,모회사
@@ -2056,6 +2061,7 @@
 ,IRS 1099,국세청 1099
 DocType: Salary Slip,Leave Without Pay,지불하지 않고 종료
 DocType: Payment Request,Outward,외부
+apps/erpnext/erpnext/setup/default_energy_point_rules.py,On {0} Creation,{0} 작성시
 apps/erpnext/erpnext/regional/doctype/gstr_3b_report/gstr_3b_report.html,State/UT Tax,주 / UT 세금
 ,Trial Balance for Party,파티를위한 시산표
 ,Gross and Net Profit Report,총 이익 및 순이익 보고서
@@ -2173,6 +2179,7 @@
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js,Make Stock Entry,재고 항목 만들기
 DocType: Hotel Room Reservation,Hotel Reservation User,호텔 예약 사용자
 apps/erpnext/erpnext/projects/doctype/project/project.js,Set Status,상태 설정
+apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py,Please setup numbering series for Attendance via Setup &gt; Numbering Series,설정&gt; 넘버링 시리즈를 통해 출석 용 넘버링 시리즈를 설정하십시오
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py,Please select prefix first,첫 번째 접두사를 선택하세요
 DocType: Contract,Fulfilment Deadline,이행 마감
 apps/erpnext/erpnext/public/js/hub/pages/Home.vue,Near you,가까운
@@ -2188,6 +2195,7 @@
 DocType: Announcement,All Students,모든 학생
 apps/erpnext/erpnext/assets/doctype/asset/asset.py,Item {0} must be a non-stock item,{0} 상품은 재고 항목 있어야합니다
 apps/erpnext/erpnext/stock/doctype/batch/batch.js,View Ledger,보기 원장
+DocType: Cost Center,Lft,LFT
 DocType: Grading Scale,Intervals,간격
 DocType: Bank Statement Transaction Entry,Reconciled Transactions,조정 된 거래
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py,Earliest,처음
@@ -2303,6 +2311,7 @@
 apps/erpnext/erpnext/hr/doctype/employee_benefit_application/employee_benefit_application.py,As per your assigned Salary Structure you cannot apply for benefits,지정된 급여 구조에 따라 혜택을 신청할 수 없습니다
 apps/erpnext/erpnext/stock/doctype/item/item.py,Website Image should be a public file or website URL,웹 사이트의 이미지가 공개 파일 또는 웹 사이트 URL이어야합니다
 DocType: Purchase Invoice Item,BOM,BOM
+apps/erpnext/erpnext/stock/doctype/item/item.py,Duplicate entry in Manufacturers table,제조업체 테이블에 중복 된 항목
 apps/erpnext/erpnext/setup/doctype/item_group/item_group.js,This is a root item group and cannot be edited.,이 루트 항목 그룹 및 편집 할 수 없습니다.
 apps/erpnext/erpnext/accounts/doctype/account/account.js,Merge,병합
 DocType: Journal Entry Account,Purchase Order,구매 주문
@@ -2449,7 +2458,6 @@
 DocType: Asset,Depreciation Schedules,감가 상각 스케줄
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.js,Create Sales Invoice,판매 송장 생성
 apps/erpnext/erpnext/regional/doctype/gstr_3b_report/gstr_3b_report.html,Ineligible ITC,부적격 ITC
-apps/erpnext/erpnext/erpnext_integrations/doctype/shopify_settings/shopify_settings.py,"Support for public app is deprecated. Please setup private app, for more details refer user manual",공개 앱에 대한 지원이 중단되었습니다. 개인 앱을 설치하십시오. 자세한 내용은 사용자 설명서를 참조하십시오.
 DocType: Task,Dependent Tasks,종속 작업
 apps/erpnext/erpnext/regional/report/gstr_1/gstr_1.py,Following accounts might be selected in GST Settings:,다음 계정은 GST 설정에서 선택할 수 있습니다.
 apps/erpnext/erpnext/manufacturing/report/bom_stock_report/bom_stock_report.js,Quantity to Produce,생산량
@@ -2702,6 +2710,7 @@
 DocType: Water Analysis,Container,컨테이너
 apps/erpnext/erpnext/regional/report/gstr_1/gstr_1.py,Please set valid GSTIN No. in Company Address,회사 주소에 유효한 GSTIN 번호를 설정하십시오
 apps/erpnext/erpnext/education/utils.py,Student {0} - {1} appears Multiple times in row {2} & {3},학생은 {0} - {1} 행에 여러 번 나타납니다 {2} {3}
+apps/erpnext/erpnext/selling/doctype/customer/customer.py,Following fields are mandatory to create address:,주소를 작성하려면 다음 필드가 필수입니다.
 DocType: Item Alternative,Two-way,양방향
 DocType: Item,Manufacturers,제조사
 apps/erpnext/erpnext/accounts/deferred_revenue.py,Error while processing deferred accounting for {0},{0}에 대한 지연된 회계 처리 중 오류가 발생했습니다.
@@ -2777,9 +2786,9 @@
 DocType: Employee,HR-EMP-,HR-EMP-
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py,User {0} doesn't have any default POS Profile. Check Default at Row {1} for this User.,사용자 {0}에게는 기본 POS 프로파일이 없습니다. 이 사용자에 대해 {1} 행의 기본값을 확인하십시오.
 DocType: Quality Meeting Minutes,Quality Meeting Minutes,품질 회의 회의록
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Supplier &gt; Supplier Type,공급 업체&gt; 공급 업체 유형
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py,Employee Referral,직원 소개
 DocType: Student Group,Set 0 for no limit,제한 없음 0 설정
+DocType: Cost Center,rgt,RGT
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py,The day(s) on which you are applying for leave are holidays. You need not apply for leave.,당신이 휴가를 신청하는 날 (들)은 휴일입니다. 당신은 휴가를 신청할 필요가 없습니다.
 DocType: Customer,Primary Address and Contact Detail,기본 주소 및 연락처 세부 정보
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.js,Resend Payment Email,지불 이메일을 다시 보내
@@ -2889,7 +2898,6 @@
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py,Against Supplier Invoice {0} dated {1},공급 업체 청구서를 {0} 일자 {1}
 DocType: Customer,Default Price List,기본 가격리스트
 apps/erpnext/erpnext/assets/doctype/asset/asset.py,Asset Movement record {0} created,자산 이동 기록 {0} 작성
-apps/erpnext/erpnext/utilities/page/leaderboard/leaderboard.js,No items found.,제품을 찾지 못했습니다.
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py,You cannot delete Fiscal Year {0}. Fiscal Year {0} is set as default in Global Settings,당신은 삭제할 수 없습니다 회계 연도 {0}. 회계 연도 {0} 전역 설정에서 기본값으로 설정
 DocType: Share Transfer,Equity/Liability Account,지분 / 책임 계정
 apps/erpnext/erpnext/setup/doctype/customer_group/customer_group.py,A customer with the same name already exists,같은 이름의 고객이 이미 있습니다.
@@ -2905,6 +2913,7 @@
 apps/erpnext/erpnext/selling/doctype/customer/customer.py,Credit limit has been crossed for customer {0} ({1}/{2}),고객 {0} ({1} / {2})의 신용 한도가 초과되었습니다.
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py,Customer required for 'Customerwise Discount','Customerwise 할인'을 위해 필요한 고객
 apps/erpnext/erpnext/config/accounting.py,Update bank payment dates with journals.,저널과 은행의 지불 날짜를 업데이트합니다.
+,Billed Qty,청구 수량
 apps/erpnext/erpnext/stock/doctype/item/item_dashboard.py,Pricing,가격
 DocType: Employee,Attendance Device ID (Biometric/RF tag ID),출석 장치 ID (생체 / RF 태그 ID)
 DocType: Quotation,Term Details,용어의 자세한 사항
@@ -2928,6 +2937,7 @@
 DocType: Share Transfer,Asset Account,자산 계좌
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js,New release date should be in the future,새로운 출시 날짜가 미래에 있어야합니다.
 DocType: Purchase Invoice,End date of current invoice's period,현재 송장의 기간의 종료 날짜
+apps/erpnext/erpnext/hr/doctype/employee/employee.py,Please setup Employee Naming System in Human Resource &gt; HR Settings,인사 관리&gt; HR 설정에서 직원 이름 지정 시스템을 설정하십시오
 DocType: Lab Test,Technician Name,기술자 이름
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py,"Cannot ensure delivery by Serial No as \
 					Item {0} is added with and without Ensure Delivery by \
@@ -2935,6 +2945,7 @@
 DocType: Accounts Settings,Unlink Payment on Cancellation of Invoice,송장의 취소에 지불 연결 해제
 DocType: Bank Reconciliation,From Date,날짜
 apps/erpnext/erpnext/hr/doctype/vehicle_log/vehicle_log.py,Current Odometer reading entered should be greater than initial Vehicle Odometer {0},입력 현재 주행 독서는 초기 차량 주행보다 커야합니다 {0}
+,Purchase Order Items To Be Received or Billed,수령 또는 청구 할 구매 주문 품목
 DocType: Restaurant Reservation,No Show,더 쇼 없다
 apps/erpnext/erpnext/regional/india/utils.py,You must be a registered supplier to generate e-Way Bill,이 - 웨이 빌을 생성하려면 등록 된 공급 업체 여야합니다.
 DocType: Shipping Rule Country,Shipping Rule Country,배송 규칙 나라
@@ -2977,6 +2988,7 @@
 apps/erpnext/erpnext/templates/generators/item/item_add_to_cart.html,View in Cart,쇼핑 카트에보기
 DocType: Employee Checkin,Shift Actual Start,실제 시작 이동
 DocType: Tally Migration,Is Day Book Data Imported,데이 북 데이터 가져 오기 여부
+,Purchase Order Items To Be Received or Billed1,수령 또는 청구 할 구매 주문 항목 1
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py,Marketing Expenses,마케팅 비용
 apps/erpnext/erpnext/stock/doctype/pick_list/pick_list.py,{0} units of {1} is not available.,{1}의 {0} 단위를 사용할 수 없습니다.
 ,Item Shortage Report,매물 부족 보고서
@@ -3205,7 +3217,6 @@
 apps/erpnext/erpnext/public/js/call_popup/call_popup.js,View all issues from {0},{0}의 모든 문제보기
 DocType: Quality Inspection,MAT-QA-.YYYY.-,MAT-QA-.YYYY.-
 DocType: Quality Meeting Table,Quality Meeting Table,품질 회의 테이블
-apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,설정&gt; 설정&gt; 이름 지정 시리즈를 통해 이름 지정 시리즈를 {0}으로 설정하십시오.
 apps/erpnext/erpnext/templates/pages/help.html,Visit the forums,포럼 방문
 DocType: Student,Student Mobile Number,학생 휴대 전화 번호
 DocType: Item,Has Variants,변형을 가지고
@@ -3350,6 +3361,7 @@
 ,Campaign Efficiency,캠페인 효율성
 ,Campaign Efficiency,캠페인 효율성
 DocType: Discussion,Discussion,토론
+apps/erpnext/erpnext/setup/default_energy_point_rules.py,On Sales Order Submission,판매 주문 제출
 DocType: Bank Transaction,Transaction ID,트랜잭션 ID
 DocType: Payroll Entry,Deduct Tax For Unsubmitted Tax Exemption Proof,미제출 된 세금 면제 증명에 대한 세금 공제
 DocType: Volunteer,Anytime,언제든지
@@ -3357,7 +3369,6 @@
 DocType: Employee Tax Exemption Proof Submission,Employee Tax Exemption Proof Submission,직원 세금 면제 서약
 DocType: Patient,Surgical History,외과 적 병력
 DocType: Bank Statement Settings Item,Mapped Header,매핑 된 헤더
-apps/erpnext/erpnext/hr/doctype/employee/employee.py,Please setup Employee Naming System in Human Resource &gt; HR Settings,인사 관리&gt; HR 설정에서 직원 이름 지정 시스템을 설정하십시오
 DocType: Employee,Resignation Letter Date,사직서 날짜
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Pricing Rules are further filtered based on quantity.,가격 규칙은 또한 수량에 따라 필터링됩니다.
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py,Please set the Date Of Joining for employee {0},직원 {0}의 가입 날짜를 설정하십시오.
@@ -3372,6 +3383,7 @@
 DocType: Bank Statement Settings,Mapped Items,매핑 된 항목
 DocType: Amazon MWS Settings,IT,그것
 DocType: Chapter,Chapter,장
+,Fixed Asset Register,고정 자산 등록
 apps/erpnext/erpnext/utilities/user_progress.py,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,Select BOM and Qty for Production,생산을위한 BOM 및 수량 선택
@@ -3507,7 +3519,6 @@
 apps/erpnext/erpnext/templates/emails/reorder_item.html,Following Material Requests have been raised automatically based on Item's re-order level,자료 요청에 이어 항목의 재 주문 레벨에 따라 자동으로 제기되고있다
 apps/erpnext/erpnext/controllers/accounts_controller.py,Account {0} is invalid. Account Currency must be {1},계정 {0} 유효하지 않습니다. 계정 통화가 있어야합니다 {1}
 apps/erpnext/erpnext/hr/doctype/salary_structure_assignment/salary_structure_assignment.py,From Date {0} cannot be after employee's relieving Date {1},직원이 {{1} 날짜를 해고 한 후에 {0} 날짜를 사용할 수 없습니다.
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py,Debit Note {0} has been created automatically,차변 메모 {0}이 (가) 자동으로 생성되었습니다.
 apps/erpnext/erpnext/accounts/doctype/payment_order/payment_order.js,Create Payment Entries,지불 항목 생성
 DocType: Supplier,Is Internal Supplier,내부 공급 업체인가
 DocType: Employee,Create User Permission,사용자 권한 생성
@@ -4070,7 +4081,6 @@
 DocType: Project User,Project Status,프로젝트 상태
 DocType: UOM,Check this to disallow fractions. (for Nos),분수를 허용하려면이 옵션을 선택합니다. (NOS의 경우)
 DocType: Student Admission Program,Naming Series (for Student Applicant),시리즈 이름 지정 (학생 지원자의 경우)
-apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.py,UOM Conversion factor ({0} -&gt; {1}) not found for item: {2},항목 {2}에 대한 UOM 변환 계수 ({0}-&gt; {1})를 찾을 수 없습니다
 apps/erpnext/erpnext/hr/doctype/retention_bonus/retention_bonus.py,Bonus Payment Date cannot be a past date,보너스 지급 날짜는 과거 날짜 일 수 없습니다.
 DocType: Travel Request,Copy of Invitation/Announcement,초대장 / 공지 사항 사본
 DocType: Practitioner Service Unit Schedule,Practitioner Service Unit Schedule,실무자 서비스 단위 일정
@@ -4238,6 +4248,7 @@
 apps/erpnext/erpnext/utilities/user_progress.py,Setup Company,설치 회사
 ,Lab Test Report,실험실 테스트 보고서
 DocType: Employee Benefit Application,Employee Benefit Application,직원 복리 신청서
+apps/erpnext/erpnext/accounts/doctype/invoice_discounting/invoice_discounting.py,Row({0}): {1} is already discounted in {2},행 ({0}) : {1}은 (는) 이미 {2}에서 할인되었습니다
 apps/erpnext/erpnext/hr/doctype/additional_salary/additional_salary.py,Additional Salary Component Exists.,추가 급여 구성 요소가 있습니다.
 DocType: Purchase Invoice,Unregistered,미등록
 DocType: Student Applicant,Application Date,신청 날짜
@@ -4317,7 +4328,6 @@
 DocType: Journal Entry,Accounting Entries,회계 항목
 DocType: Job Card Time Log,Job Card Time Log,작업 카드 시간 기록
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,"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;필드에서 가져옵니다."
-apps/erpnext/erpnext/education/doctype/instructor/instructor.py,Please setup Instructor Naming System in Education &gt; Education Settings,교육&gt; 교육 설정에서 강사 명명 시스템을 설정하십시오
 DocType: Journal Entry,Paid Loan,유료 대출
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py,Duplicate Entry. Please check Authorization Rule {0},중복 입력입니다..권한 부여 규칙을 확인하시기 바랍니다 {0}
 DocType: Journal Entry Account,Reference Due Date,참고 마감일
@@ -4334,7 +4344,6 @@
 apps/erpnext/erpnext/templates/pages/projects.html,No time sheets,시간 시트 없음
 DocType: GoCardless Mandate,GoCardless Customer,GoCardless 고객
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py,Leave Type {0} cannot be carry-forwarded,{0} 수행-전달할 수 없습니다 유형을 남겨주세요
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Item Code &gt; Item Group &gt; Brand,상품 코드&gt; 상품 그룹&gt; 브랜드
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py,Maintenance Schedule is not generated for all the items. Please click on 'Generate Schedule',유지 보수 일정은 모든 항목에 대해 생성되지 않습니다.'생성 일정'을 클릭 해주세요
 ,To Produce,생산
 DocType: Leave Encashment,Payroll,급여
@@ -4450,7 +4459,6 @@
 DocType: Stock Ledger Entry,Actual Qty After Transaction,거래 후 실제 수량
 ,Pending SO Items For Purchase Request,구매 요청에 대한 SO 항목 보류
 apps/erpnext/erpnext/education/doctype/student_admission/student_admission.py,Student Admissions,학생 입학
-apps/erpnext/erpnext/accounts/party.py,{0} {1} is disabled,{0} {1} 비활성화
 DocType: Supplier,Billing Currency,결제 통화
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py,Extra Large,아주 큰
 DocType: Loan,Loan Application,대출 지원서
@@ -4527,7 +4535,6 @@
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py,Only Leave Applications with status 'Approved' and 'Rejected' can be submitted,만 제출할 수 있습니다 &#39;거부&#39; &#39;승인&#39;상태와 응용 프로그램을 남겨주세요
 apps/erpnext/erpnext/accounts/doctype/accounting_dimension/accounting_dimension.py,Creating Dimensions...,치수 만들기 ...
 apps/erpnext/erpnext/education/doctype/student_group_creation_tool/student_group_creation_tool.py,Student Group Name is mandatory in row {0},학생 그룹 이름은 행의 필수 {0}
-DocType: Customer Credit Limit,Bypass credit limit_check,여신 한도 우회
 DocType: Homepage,Products to be shown on website homepage,제품 웹 사이트 홈페이지에 표시하기
 DocType: HR Settings,Password Policy,암호 정책
 apps/erpnext/erpnext/setup/doctype/customer_group/customer_group.js,This is a root customer group and cannot be edited.,이 루트 고객 그룹 및 편집 할 수 없습니다.
@@ -4833,6 +4840,7 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py,Row {0}: Advance against Customer must be credit,행 {0} : 고객에 대한 사전 신용해야합니다
 DocType: Quality Meeting,Quality Meeting,품질 회의
 apps/erpnext/erpnext/accounts/doctype/account/account.js,Non-Group to Group,그룹에 비 그룹
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,설정&gt; 설정&gt; 이름 지정 시리즈를 통해 이름 지정 시리즈를 {0}으로 설정하십시오.
 DocType: Employee,ERPNext User,ERPNext 사용자
 apps/erpnext/erpnext/education/doctype/student_group_creation_tool/student_group_creation_tool.py,Batch is mandatory in row {0},배치는 {0} 행에서 필수 항목입니다.
 apps/erpnext/erpnext/education/doctype/student_group_creation_tool/student_group_creation_tool.py,Batch is mandatory in row {0},배치는 {0} 행에서 필수 항목입니다.
@@ -5132,6 +5140,7 @@
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py,No {0} found for Inter Company Transactions.,회사 간 거래에 대해 {0}이 (가) 없습니다.
 DocType: Travel Itinerary,Rented Car,렌트카
 apps/erpnext/erpnext/public/js/hub/components/profile_dialog.js,About your Company,회사 소개
+apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.js,Show Stock Ageing Data,재고 노화 데이터 표시
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py,Credit To account must be a Balance Sheet account,계정에 신용은 대차 대조표 계정이어야합니다
 DocType: Donor,Donor,기증자
 DocType: Global Defaults,Disable In Words,단어에서 해제
@@ -5146,8 +5155,10 @@
 DocType: Practitioner Schedule,Schedule Name,일정 이름
 apps/erpnext/erpnext/regional/doctype/gstr_3b_report/gstr_3b_report.py,Please enter GSTIN and state for the Company Address {0},GSTIN을 입력하고 회사 주소 {0}을 기재하십시오.
 DocType: Currency Exchange,For Buying,구매 용
+apps/erpnext/erpnext/setup/default_energy_point_rules.py,On Purchase Order Submission,구매 주문서 제출
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js,Add All Suppliers,모든 공급 업체 추가
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py,Row #{0}: Allocated Amount cannot be greater than outstanding amount.,행 번호 {0} : 할당 된 금액은 미납 금액을 초과 할 수 없습니다.
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Customer &gt; Customer Group &gt; Territory,고객&gt; 고객 그룹&gt; 지역
 DocType: Tally Migration,Parties,당사국들
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js,Browse BOM,찾아 BOM
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py,Secured Loans,보안 대출
@@ -5179,6 +5190,7 @@
 apps/erpnext/erpnext/stock/doctype/item_alternative/item_alternative.py,Not allow to set alternative item for the item {0},항목 {0}에 대해 대체 항목을 설정할 수 없습니다.
 apps/erpnext/erpnext/hr/doctype/leave_block_list/leave_block_list.py,Date is repeated,날짜는 반복된다
 apps/erpnext/erpnext/accounts/print_format/payment_receipt_voucher/payment_receipt_voucher.html,Authorized Signatory,공인 서명자
+apps/erpnext/erpnext/education/doctype/instructor/instructor.py,Please setup Instructor Naming System in Education &gt; Education Settings,교육&gt; 교육 설정에서 강사 명명 시스템을 설정하십시오
 apps/erpnext/erpnext/regional/doctype/gstr_3b_report/gstr_3b_report.html,Net ITC Available(A) - (B),순 ITC 가능 (A) - (B)
 apps/erpnext/erpnext/education/doctype/fee_schedule/fee_schedule.js,Create Fees,수수료 생성
 DocType: Project,Total Purchase Cost (via Purchase Invoice),총 구매 비용 (구매 송장을 통해)
@@ -5199,6 +5211,7 @@
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.js,Message Sent,보낸 메시지
 apps/erpnext/erpnext/accounts/doctype/account/account.py,Account with child nodes cannot be set as ledger,자식 노드와 계좌 원장은로 설정 될 수 없다
 DocType: C-Form,II,II
+apps/erpnext/erpnext/assets/report/fixed_asset_register/fixed_asset_register.py,Vendor Name,공급 업체 이름
 DocType: Quiz Result,Wrong,잘못된
 DocType: Sales Invoice,Rate at which Price list currency is converted to customer's base currency,가격 목록의 통화는 고객의 기본 통화로 변환하는 속도에
 DocType: Purchase Invoice Item,Net Amount (Company Currency),순 금액 (회사 통화)
@@ -5444,6 +5457,7 @@
 DocType: Stock Settings,Auto Material Request,자동 자료 요청
 DocType: Woocommerce Settings,API consumer secret,API 소비자 비밀
 DocType: Delivery Note Item,Available Batch Qty at From Warehouse,창고에서 이용 가능한 일괄 수량
+,Received Qty Amount,수량을 받았습니다
 DocType: Salary Slip,Gross Pay - Total Deduction - Loan Repayment,총 급여 - 총 공제 - 대출 상환
 DocType: Bank Account,Last Integration Date,마지막 통합 날짜
 DocType: Expense Claim,Expense Taxes and Charges,경비 및 세금
@@ -5908,6 +5922,8 @@
 DocType: Drug Prescription,Hour,시간
 DocType: Restaurant Order Entry,Last Sales Invoice,마지막 판매 송장
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py,Please select Qty against item {0},항목 {0}에 대해 수량을 선택하십시오.
+apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py,Latest Age,최신 나이
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js,Transfer Material to Supplier,공급 업체에 자료를 전송
 apps/erpnext/erpnext/hr/report/loan_repayment/loan_repayment.py,EMI,EMI
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py,New Serial No cannot have Warehouse. Warehouse must be set by Stock Entry or Purchase Receipt,새로운 시리얼 번호는 창고를 가질 수 없습니다.창고 재고 항목 또는 구입 영수증으로 설정해야합니다
 DocType: Lead,Lead Type,리드 타입
@@ -5931,7 +5947,6 @@
 apps/erpnext/erpnext/hr/doctype/employee_benefit_application/employee_benefit_application.py,"An amount of {0} already claimed for the component {1},\
 						 set the amount equal or greater than {2}","요소 {1}에 대해 이미 청구 된 {0} 금액, {2}보다 크거나 같은 금액 설정,"
 DocType: Shipping Rule,Shipping Rule Conditions,배송 규칙 조건
-DocType: Purchase Invoice,Export Type,수출 유형
 DocType: Salary Slip Loan,Salary Slip Loan,샐러리 슬립 론
 DocType: BOM Update Tool,The new BOM after replacement,교체 후 새로운 BOM
 ,Point of Sale,판매 시점
@@ -6053,7 +6068,6 @@
 DocType: Purchase Order Item,Blanket Order Rate,담요 주문률
 ,Customer Ledger Summary,고객 원장 요약
 apps/erpnext/erpnext/hooks.py,Certification,인증
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js,Are you sure you want to make debit note?,직불 메모를 보내시겠습니까?
 DocType: Bank Guarantee,Clauses and Conditions,조항 및 조건
 DocType: Serial No,Creation Document Type,작성 문서 형식
 DocType: Amazon MWS Settings,ES,ES
@@ -6091,8 +6105,6 @@
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py,Financial Services,금융 서비스
 DocType: Student Sibling,Student ID,학생 아이디
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.js,For Quantity must be greater than zero,수량이 0보다 커야합니다.
-apps/erpnext/erpnext/hr/doctype/employee_transfer/employee_transfer.py,"Please delete the Employee <a href=""#Form/Employee/{0}"">{0}</a>\
-					to cancel this document","이 문서를 취소하려면 직원 <a href=""#Form/Employee/{0}"">{0}을 (를)</a> 삭제하십시오"
 apps/erpnext/erpnext/config/projects.py,Types of activities for Time Logs,시간 로그에 대한 활동의 종류
 DocType: Opening Invoice Creation Tool,Sales,판매
 DocType: Stock Entry Detail,Basic Amount,기본 금액
@@ -6171,6 +6183,7 @@
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py,Print and Stationery,인쇄 및 문구
 DocType: Stock Settings,Show Barcode Field,쇼 바코드 필드
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js,Send Supplier Emails,공급 업체 이메일 보내기
+DocType: Asset Movement,ACC-ASM-.YYYY.-,ACC-ASM-.YYYY.-
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py,"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,자동 생성됨
 apps/erpnext/erpnext/hr/doctype/employee_onboarding/employee_onboarding.py,Submit this to create the Employee record,Employee 레코드를 생성하려면 이것을 제출하십시오.
@@ -6251,7 +6264,6 @@
 DocType: Sales Team,Contact No.,연락 번호
 apps/erpnext/erpnext/templates/includes/cart/cart_address.html,Billing Address is same as Shipping Address,대금 청구 주소는 배송 주소와 동일합니다.
 DocType: Bank Reconciliation,Payment Entries,결제 항목
-apps/erpnext/erpnext/erpnext_integrations/doctype/shopify_settings/shopify_settings.py,Access token or Shopify URL missing,액세스 토큰 또는 Shopify URL 누락
 DocType: Location,Latitude,위도
 DocType: Work Order,Scrap Warehouse,스크랩 창고
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py,"Warehouse required at Row No {0}, please set default warehouse for the item {1} for the company {2}",행 번호가 {0} 인 창고가 필요합니다. {2} 회사의 {1} 항목에 대한 기본 창고를 설정하십시오.
@@ -6296,7 +6308,6 @@
 DocType: Job Offer Term,Value / Description,값 / 설명
 apps/erpnext/erpnext/controllers/accounts_controller.py,"Row #{0}: Asset {1} cannot be submitted, it is already {2}","행 번호 {0} 자산이 {1} 제출할 수 없습니다, 그것은 이미 {2}"
 DocType: Tax Rule,Billing Country,결제 나라
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js,Are you sure you want to make credit note?,신용 기록을 남기시겠습니까?
 DocType: Purchase Order Item,Expected Delivery Date,예상 배송 날짜
 DocType: Restaurant Order Entry,Restaurant Order Entry,레스토랑 주문 입력
 apps/erpnext/erpnext/accounts/general_ledger.py,Debit and Credit not equal for {0} #{1}. Difference is {2}.,직불 및 신용 {0} #에 대한 동일하지 {1}. 차이는 {2}.
@@ -6421,6 +6432,7 @@
 DocType: Purchase Invoice,Taxes and Charges Added,추가 세금 및 수수료
 apps/erpnext/erpnext/assets/doctype/asset/asset.py,Depreciation Row {0}: Next Depreciation Date cannot be before Available-for-use Date,감가 상각 행 {0} : 다음 감가 상각 날짜는 사용 가능일 이전 일 수 없습니다.
 ,Sales Funnel,판매 퍼넬
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Item Code &gt; Item Group &gt; Brand,상품 코드&gt; 상품 그룹&gt; 브랜드
 apps/erpnext/erpnext/setup/doctype/company/company.py,Abbreviation is mandatory,약자는 필수입니다
 DocType: Project,Task Progress,작업 진행
 apps/erpnext/erpnext/templates/includes/navbar/navbar_items.html,Cart,카트
@@ -6666,6 +6678,7 @@
 DocType: Employee Grade,Employee Grade,직원 급료
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py,Piecework,일한 분량에 따라 공임을 지급받는 일
 DocType: GSTR 3B Report,June,유월
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Supplier &gt; Supplier Type,공급 업체&gt; 공급 업체 유형
 DocType: Share Balance,From No,~부터
 DocType: Shift Type,Early Exit Grace Period,조기 퇴거 유예 기간
 DocType: Task,Actual Time (in Hours),(시간) 실제 시간
@@ -6952,6 +6965,7 @@
 DocType: Warehouse,Warehouse Name,창고의 이름
 DocType: Naming Series,Select Transaction,거래 선택
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py,Please enter Approving Role or Approving User,역할을 승인 또는 사용을 승인 입력하십시오
+apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.py,UOM Conversion factor ({0} -&gt; {1}) not found for item: {2},항목 {2}에 대한 UOM 변환 계수 ({0}-&gt; {1})를 찾을 수 없습니다
 apps/erpnext/erpnext/support/doctype/service_level_agreement/service_level_agreement.py,Service Level Agreement with Entity Type {0} and Entity {1} already exists.,엔티티 유형 {0} 및 엔티티 {1}을 (를) 사용하는 서비스 수준 계약이 이미 존재합니다.
 DocType: Journal Entry,Write Off Entry,항목 오프 쓰기
 DocType: BOM,Rate Of Materials Based On,자료에 의거 한 속도
@@ -7143,6 +7157,7 @@
 DocType: Quality Inspection Reading,Quality Inspection Reading,품질 검사 읽기
 apps/erpnext/erpnext/stock/doctype/stock_settings/stock_settings.py,`Freeze Stocks Older Than` should be smaller than %d days.,`확정된 재고'는 `% d의 일보다 작아야한다.
 DocType: Tax Rule,Purchase Tax Template,세금 템플릿을 구입
+apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py,Earliest Age,가장 빠른 나이
 apps/erpnext/erpnext/utilities/user_progress.py,Set a sales goal you'd like to achieve for your company.,회사에서 달성하고자하는 판매 목표를 설정하십시오.
 DocType: Quality Goal,Revision,개정
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js,Healthcare Services,의료 서비스
@@ -7186,6 +7201,7 @@
 apps/erpnext/erpnext/healthcare/doctype/patient_encounter/patient_encounter.js,Schedule Discharge,방전 계획
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py,Cheques and Deposits incorrectly cleared,수표와 예금 잘못 삭제
 DocType: Homepage Section Card,Homepage Section Card,홈페이지 섹션 카드
+,Amount To Be Billed,청구 금액
 apps/erpnext/erpnext/accounts/doctype/account/account.py,Account {0}: You can not assign itself as parent account,계정 {0} : 당신은 부모 계정 자체를 할당 할 수 없습니다
 DocType: Purchase Invoice Item,Price List Rate,가격리스트 평가
 apps/erpnext/erpnext/utilities/activation.py,Create customer quotes,고객 따옴표를 만들기
@@ -7238,6 +7254,7 @@
 DocType: Supplier Scorecard Criteria,Supplier Scorecard Criteria,공급 업체 성과표 기준
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py,Please select Start Date and End Date for Item {0},시작 날짜와 항목에 대한 종료 날짜를 선택하세요 {0}
 DocType: Maintenance Schedule,MAT-MSH-.YYYY.-,MAT-MSH- .YYYY.-
+,Amount to Receive,받을 금액
 apps/erpnext/erpnext/education/doctype/student_group_creation_tool/student_group_creation_tool.py,Course is mandatory in row {0},코스 행의 필수 {0}
 apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py,From date can not be greater than than To date,시작일은 이전보다 클 수 없습니다.
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py,To date cannot be before from date,지금까지 날로부터 이전 할 수 없습니다
@@ -7489,7 +7506,6 @@
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js,BOM and Manufacturing Quantity are required,BOM 및 제조 수량이 필요합니다
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js,Ageing Range 2,고령화 범위 2
 DocType: SG Creation Tool Course,Max Strength,최대 강도
-apps/erpnext/erpnext/accounts/doctype/account/account.py,"Account {0} already exists in child company {1}. The following fields have different values, they should be same:<ul><li>{2}</li></ul>",{0} 계정이 이미 하위 회사 {1}에 존재합니다. 다음 필드는 다른 값을 가지며 동일해야합니다. <ul><li> {2} </li></ul>
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py,Installing presets,사전 설정 설치
 DocType: Fee Schedule,EDU-FSH-.YYYY.-,EDU-FSH-.YYYY.-
 apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js,No Delivery Note selected for Customer {},고객 {}에 대해 배달 노트가 선택되지 않았습니다.
@@ -7701,6 +7717,7 @@
 DocType: Delivery Note,Print Without Amount,금액없이 인쇄
 apps/erpnext/erpnext/accounts/report/asset_depreciation_ledger/asset_depreciation_ledger.py,Depreciation Date,감가 상각 날짜
 ,Work Orders in Progress,진행중인 작업 주문
+DocType: Customer Credit Limit,Bypass Credit Limit Check,여신 한도 점검 우회
 DocType: Issue,Support Team,지원 팀
 apps/erpnext/erpnext/stock/report/batch_item_expiry_status/batch_item_expiry_status.py,Expiry (In Days),(일) 만료
 DocType: Appraisal,Total Score (Out of 5),전체 점수 (5 점 만점)
@@ -7887,6 +7904,7 @@
 DocType: Sales Invoice,Customer GSTIN,고객 GSTIN
 DocType: Crop Cycle,List of diseases detected on the field. When selected it'll automatically add a list of tasks to deal with the disease ,현장에서 발견 된 질병의 목록. 선택한 경우 병을 치료할 작업 목록이 자동으로 추가됩니다.
 apps/erpnext/erpnext/manufacturing/page/bom_comparison_tool/bom_comparison_tool.js,BOM 1,BOM 1
+apps/erpnext/erpnext/assets/report/fixed_asset_register/fixed_asset_register.py,Asset Id,자산 ID
 apps/erpnext/erpnext/healthcare/doctype/healthcare_service_unit/healthcare_service_unit.js,This is a root healthcare service unit and cannot be edited.,이것은 루트 의료 서비스 부서이며 편집 할 수 없습니다.
 DocType: Asset Repair,Repair Status,수리 상태
 apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.js,"Requested Qty: Quantity requested for purchase, but not ordered.","요청 수량 : 수량 주문 구입 요청,하지만."
diff --git a/erpnext/translations/ku.csv b/erpnext/translations/ku.csv
index b19ead6..7d3f27b 100644
--- a/erpnext/translations/ku.csv
+++ b/erpnext/translations/ku.csv
@@ -281,7 +281,6 @@
 DocType: Loan,Repay Over Number of Periods,Bergîdana Hejmara Over ji Maweya
 apps/erpnext/erpnext/manufacturing/report/bom_stock_report/bom_stock_report.py,Quantity to Produce can not be less than Zero,Hebûna areseriyê nikare ji Zero kêm be
 DocType: Stock Entry,Additional Costs,Xercên din
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Customer &gt; Customer Group &gt; Territory,Mişterî&gt; Koma Xerîdar&gt; Herêm
 apps/erpnext/erpnext/accounts/doctype/account/account.py,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
@@ -577,6 +576,7 @@
 DocType: Healthcare Settings,Create documents for sample collection,Daxuyaniya ji bo koleksiyonê çêkin
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py,Payment against {0} {1} cannot be greater than Outstanding Amount {2},Payment dijî {0} {1} nikare were mezintir Outstanding Mîqdar {2}
 apps/erpnext/erpnext/patches/v11_0/add_healthcare_service_unit_tree_root.py,All Healthcare Service Units,Hemû Yekîneyên Xizmeta Xizmetiyê
+apps/erpnext/erpnext/setup/default_energy_point_rules.py,On Converting Opportunity,Li ser Veguhêrîna Derfetê
 DocType: Bank Account,Address HTML,Navnîşana IP
 DocType: Lead,Mobile No.,No. Mobile
 apps/erpnext/erpnext/selling/doctype/pos_closing_voucher/closing_voucher_details.html,Mode of Payments,Mode Serê
@@ -641,7 +641,6 @@
 DocType: Accounting Dimension,Dimension Name,Dimension navê
 apps/erpnext/erpnext/healthcare/setup.py,Resistant,Berxwedana
 apps/erpnext/erpnext/hotels/doctype/hotel_room_reservation/hotel_room_reservation.py,Please set Hotel Room Rate on {},Ji kerema xwe ji odeya otêlê li ser xuyakirinê {}
-apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py,Please setup numbering series for Attendance via Setup &gt; Numbering Series,Ji kerema xwe ji hêla Tevlêbûnê&gt; Pêjeya Hejmarbûnê ve ji bo Pêvekêşandinê hejmarên hejmarê saz bikin
 DocType: Journal Entry,Multi Currency,Multi Exchange
 DocType: Bank Statement Transaction Invoice Item,Invoice Type,bi fatûreyên Type
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py,Valid from date must be less than valid upto date,Ji mêjûya derbasdar divê ji roja têde derbasdar kêmtir be
@@ -709,6 +708,7 @@
 DocType: Quotation Item,Additional Notes,Nîşeyên Zêdeyî
 DocType: Purchase Order,% Received,% وەریگرت
 apps/erpnext/erpnext/education/doctype/student_group_creation_tool/student_group_creation_tool.js,Create Student Groups,Create komên xwendekaran
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py,"Available quantity is {0}, you need {1}","Hêjmara heye {0} e, hûn hewceyê {1} in"
 DocType: Volunteer,Weekends,Weekend
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html,Credit Note Amount,Credit Têbînî Mîqdar
 DocType: Setup Progress Action,Action Document,Belgeya Çalakiyê
@@ -755,6 +755,7 @@
 apps/erpnext/erpnext/accounts/page/pos/pos.js,Create a new Customer,Create a Mişterî ya nû
 apps/erpnext/erpnext/non_profit/report/expiring_memberships/expiring_memberships.py,Expiring On,Derbasbûnê Li ser
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,"If multiple Pricing Rules continue to prevail, users are asked to set Priority manually to resolve conflict.","Ger Rules Pricing multiple berdewam bi ser keve, bikarhênerên pirsî danîna Priority bi destan ji bo çareserkirina pevçûnan."
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js,Purchase Return,Return kirîn
 apps/erpnext/erpnext/utilities/activation.py,Create Purchase Orders,Create Orders Purchase
 ,Purchase Register,Buy Register
 apps/erpnext/erpnext/healthcare/doctype/patient/patient.py,Patient not found,Nexweş nayê dîtin
@@ -770,7 +771,6 @@
 DocType: Location,Area UOM,UOM
 apps/erpnext/erpnext/manufacturing/doctype/workstation/workstation.py,Workstation is closed on the following dates as per Holiday List: {0},Workstation dîrokan li ser wek per Lîsteya Holiday girtî be: {0}
 apps/erpnext/erpnext/selling/page/sales_funnel/sales_funnel.py,Opportunities,derfetên
-apps/erpnext/erpnext/www/all-products/index.html,Clear filters,Parzûnên zelal bikin
 DocType: Lab Test Template,Single,Yekoyek
 DocType: Compensatory Leave Request,Work From Date,Work From Date
 DocType: Salary Slip,Total Loan Repayment,Total vegerandinê Loan
@@ -814,6 +814,7 @@
 apps/erpnext/erpnext/education/doctype/program_enrollment_tool/program_enrollment_tool.py,Mandatory field - Academic Year,warê Mandatory - Year (Ekadîmî)
 apps/erpnext/erpnext/education/doctype/program_enrollment_tool/program_enrollment_tool.py,Mandatory field - Academic Year,warê Mandatory - Year (Ekadîmî)
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py,{0} {1} is not associated with {2} {3},{0} {1} ne girêdayî {2} {3}
+DocType: Opportunity,Converted By,Ji hêla veguherandî
 apps/erpnext/erpnext/public/js/hub/components/ReviewArea.vue,You need to login as a Marketplace User before you can add any reviews.,"Berî ku hûn şiroveyan lê zêde bikin, hûn hewce ne ku wekî Bikarhênerek Bazarê têkevin."
 apps/erpnext/erpnext/manufacturing/doctype/job_card/job_card.py,Row {0} : Operation is required against the raw material item {1},Row {0}: Operasyona li dijî materyalên raweya gerek pêwîst e {1}
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py,Please set default payable account for the company {0},Tikaye default account cîhde danîn ji bo ku şîrketa {0}
@@ -898,7 +899,6 @@
 DocType: Codification Table,Codification Table,Table Codification
 DocType: Timesheet Detail,Hrs,hrs
 apps/erpnext/erpnext/manufacturing/page/bom_comparison_tool/bom_comparison_tool.js,Changes in {0},Changes in {0}
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js,Please select Company,Ji kerema xwe ve Company hilbijêre
 DocType: Employee Skill,Employee Skill,Hişmendiya Karmend
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.js,Difference Account,Account Cudahiya
 DocType: Pricing Rule,Discount on Other Item,Discount li Tiştê din
@@ -966,6 +966,7 @@
 DocType: BOM,Operating Cost,Cost Operating
 DocType: Crop,Produced Items,Produced Items
 DocType: Bank Statement Transaction Entry,Match Transaction to Invoices,Bi Têkiliya Bihêle Pevçûnan
+apps/erpnext/erpnext/erpnext_integrations/exotel_integration.py,Error in Exotel incoming call,Di banga gihîştina Exotel de xelet e
 DocType: Sales Order Item,Gross Profit,Profit Gross
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js,Unblock Invoice,Vebijarkirina Unblock
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py,Increment cannot be 0,Increment nikare bibe 0
@@ -1175,6 +1176,7 @@
 DocType: Activity Cost,Activity Type,Type Activity
 DocType: Request for Quotation,For individual supplier,Ji bo dabînkerê şexsî
 DocType: BOM Operation,Base Hour Rate(Company Currency),Saet Rate Base (Company Exchange)
+,Qty To Be Billed,Qty To Bills
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py,Delivered Amount,Şêwaz teslîmî
 apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.js,Reserved Qty for Production: Raw materials quantity to make manufacturing items.,Qty Ji bo Hilberînê Qedandî: Kêmasiya madeyên xav ji bo çêkirina tiştên çêker.
 DocType: Loyalty Point Entry Redemption,Redemption Date,Dîroka Veweşandinê
@@ -1295,7 +1297,7 @@
 apps/erpnext/erpnext/education/doctype/student_group/student_group.py,Please select Program,Please select Program
 apps/erpnext/erpnext/education/doctype/student_group/student_group.py,Please select Program,Please select Program
 DocType: Project,Estimated Cost,Cost texmînkirin
-DocType: Request for Quotation,Link to material requests,Link to daxwazên maddî
+DocType: Supplier Quotation,Link to material requests,Link to daxwazên maddî
 apps/erpnext/erpnext/public/js/hub/pages/Publish.vue,Publish,Weşandin
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py,Aerospace,Aerospace
 ,Fichier des Ecritures Comptables [FEC],Fichier des Ecritures Comptables [FEC]
@@ -1308,6 +1310,7 @@
 apps/erpnext/erpnext/utilities/transaction_base.py,Invalid Posting Time,Wexta Posteyê çewt
 DocType: Salary Component,Condition and Formula,Rewş û Formula
 DocType: Lead,Campaign Name,Navê kampanyayê
+apps/erpnext/erpnext/setup/default_energy_point_rules.py,On Task Completion,Li ser Serkeftina Task
 apps/erpnext/erpnext/hr/doctype/compensatory_leave_request/compensatory_leave_request.py,There is no leave period in between {0} and {1},Di navbera {0} û {1} de demek nîne
 DocType: Fee Validity,Healthcare Practitioner,Bijîşkdariya Tenduristiyê
 DocType: Hotel Room,Capacity,Kanîn
@@ -1649,7 +1652,6 @@
 DocType: Quality Feedback Template,Quality Feedback Template,Feedablonê nerazîbûna kalîteyê
 apps/erpnext/erpnext/config/education.py,LMS Activity,Alakiya LMS
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py,Internet Publishing,Publishing Internet
-DocType: Prescription Duration,Number,Jimare
 apps/erpnext/erpnext/accounts/doctype/opening_invoice_creation_tool/opening_invoice_creation_tool.js,Creating {0} Invoice,Creating {0} Invoice
 DocType: Medical Code,Medical Code Standard,Standard Code
 DocType: Soil Texture,Clay Composition (%),Çargoşe (%)
@@ -1724,6 +1726,7 @@
 DocType: Support Settings,Get Started Sections,Beşên Destpêk Bike
 DocType: Lead,CRM-LEAD-.YYYY.-,CRM-LEAD -YYYY-
 DocType: Invoice Discounting,Sanctioned,belê
+,Base Amount,Bêjeya Base
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.js,Total Contribution Amount: {0},Giştî Tişta Tevahî: {0}
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py,Row #{0}: Please specify Serial No for Item {1},Row # {0}: kerema xwe diyar bike Serial No bo Babetê {1}
 DocType: Payroll Entry,Salary Slips Submitted,Salary Slips Submitted
@@ -1946,6 +1949,7 @@
 DocType: Accounting Dimension,Dimension Defaults,Pêşkêşiyên Mezinahî
 apps/erpnext/erpnext/crm/report/prospects_engaged_but_not_converted/prospects_engaged_but_not_converted.js,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,Minimum Lead Age (Days),Siparîşa hindiktirîn Lead Age (Days)
+apps/erpnext/erpnext/assets/report/fixed_asset_register/fixed_asset_register.py,Available For Use Date,Ji bo Bikaranîna Dîrokê heye
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py,All BOMs,Hemû dikeye
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js,Create Inter Company Journal Entry,Navnîşa Kovara Navneteweyî ya Navneteweyî Afirînin
 DocType: Company,Parent Company,Şîrketê Parent
@@ -2007,6 +2011,7 @@
 ,IRS 1099,IRS 1099
 DocType: Salary Slip,Leave Without Pay,Leave Bê Pay
 DocType: Payment Request,Outward,Ji derve
+apps/erpnext/erpnext/setup/default_energy_point_rules.py,On {0} Creation,Li ser {0} Afirandin
 apps/erpnext/erpnext/regional/doctype/gstr_3b_report/gstr_3b_report.html,State/UT Tax,Baca Dewlet / UT
 ,Trial Balance for Party,Balance Trial bo Party
 ,Gross and Net Profit Report,Raporta Profitiya Genc û Neto
@@ -2122,6 +2127,7 @@
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js,Make Stock Entry,Navbera Stock Bikin
 DocType: Hotel Room Reservation,Hotel Reservation User,User Reservation
 apps/erpnext/erpnext/projects/doctype/project/project.js,Set Status,Rewşa Set
+apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py,Please setup numbering series for Attendance via Setup &gt; Numbering Series,Ji kerema xwe ji hêla Tevlêbûnê&gt; Pêjeya Hejmarbûnê ve ji bo Pêvekêşandinê hejmarên hejmarê saz bikin
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py,Please select prefix first,Ji kerema xwe ve yekem prefix hilbijêre
 DocType: Contract,Fulfilment Deadline,Pêdengiya Dawî
 apps/erpnext/erpnext/public/js/hub/pages/Home.vue,Near you,Li nêzê te
@@ -2136,6 +2142,7 @@
 DocType: Announcement,All Students,Hemû xwendekarên
 apps/erpnext/erpnext/assets/doctype/asset/asset.py,Item {0} must be a non-stock item,"Babetê {0}, divê babete non-stock be"
 apps/erpnext/erpnext/stock/doctype/batch/batch.js,View Ledger,View Ledger
+DocType: Cost Center,Lft,Lft
 DocType: Grading Scale,Intervals,navberan
 DocType: Bank Statement Transaction Entry,Reconciled Transactions,Transactions
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py,Earliest,Kevintirîn
@@ -2250,6 +2257,7 @@
 apps/erpnext/erpnext/hr/doctype/employee_benefit_application/employee_benefit_application.py,As per your assigned Salary Structure you cannot apply for benefits,Li gorî Performasyona Wezareta we ya ku hûn nikarin ji bo berjewendiyan neynin
 apps/erpnext/erpnext/stock/doctype/item/item.py,Website Image should be a public file or website URL,"Website Wêne, divê pel giştî an URL malpera be"
 DocType: Purchase Invoice Item,BOM,BOM
+apps/erpnext/erpnext/stock/doctype/item/item.py,Duplicate entry in Manufacturers table,Di tabloya Hilberên de ketin dubare
 apps/erpnext/erpnext/setup/doctype/item_group/item_group.js,This is a root item group and cannot be edited.,Ev komeke babete root e û ne jî dikarim di dahatûyê de were.
 apps/erpnext/erpnext/accounts/doctype/account/account.js,Merge,Bihevkelyan
 DocType: Journal Entry Account,Purchase Order,Buy Order
@@ -2393,7 +2401,6 @@
 DocType: Asset,Depreciation Schedules,Schedules Farhad.
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.js,Create Sales Invoice,Pêşkêşkirina Firotanê Afirînin
 apps/erpnext/erpnext/regional/doctype/gstr_3b_report/gstr_3b_report.html,Ineligible ITC,ITC bêserûber
-apps/erpnext/erpnext/erpnext_integrations/doctype/shopify_settings/shopify_settings.py,"Support for public app is deprecated. Please setup private app, for more details refer user manual","Piştgirî ji bo serîlêdana gelemperî xelet kirin. Ji kerema xwe ji bo serîlêdana taybet a taybet, ji bo agahdariya zêdetir destnîşankirin bikarhênerek binivîse"
 DocType: Task,Dependent Tasks,Karên girêdayî
 apps/erpnext/erpnext/regional/report/gstr_1/gstr_1.py,Following accounts might be selected in GST Settings:,Di hesabên GST de bêne hilbijartin:
 apps/erpnext/erpnext/manufacturing/report/bom_stock_report/bom_stock_report.js,Quantity to Produce,Kêmasiya hilberînê
@@ -2640,6 +2647,7 @@
 DocType: Water Analysis,Container,Têrr
 apps/erpnext/erpnext/regional/report/gstr_1/gstr_1.py,Please set valid GSTIN No. in Company Address,Ji kerema xwe Di Navnîşa Pargîdanî de GSTIN No.
 apps/erpnext/erpnext/education/utils.py,Student {0} - {1} appears Multiple times in row {2} & {3},Xwendekarên {0} - {1} hatiye Multiple li row xuya {2} &amp; {3}
+apps/erpnext/erpnext/selling/doctype/customer/customer.py,Following fields are mandatory to create address:,Zeviyên jêrîn ji bo afirandina navnîşanê mecbûr in:
 DocType: Item Alternative,Two-way,Du-rê
 DocType: Item,Manufacturers,Hilberîner
 ,Employee Billing Summary,Kêmasiya Bilindkirina Karmendan
@@ -2714,9 +2722,9 @@
 DocType: Employee,HR-EMP-,HR-EMP-
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py,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: Quality Meeting Minutes,Quality Meeting Minutes,Minutên Civîna Qalîteyê
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Supplier &gt; Supplier Type,Hilberîner&gt; Tîpa pêşkêşkar
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py,Employee Referral,Referralê
 DocType: Student Group,Set 0 for no limit,Set 0 bo sînorê
+DocType: Cost Center,rgt,rgt
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py,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.
 DocType: Customer,Primary Address and Contact Detail,Navnîşana Navnîş û Têkiliya Serûpel
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.js,Resend Payment Email,Ji nûve Payment Email
@@ -2820,7 +2828,6 @@
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py,Against Supplier Invoice {0} dated {1},Li dijî Supplier bi fatûreyên {0} dîroka {1}
 DocType: Customer,Default Price List,Default List Price
 apps/erpnext/erpnext/assets/doctype/asset/asset.py,Asset Movement record {0} created,record Tevgera Asset {0} tên afirandin
-apps/erpnext/erpnext/utilities/page/leaderboard/leaderboard.js,No items found.,Ti tişt nehat dîtin.
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py,You cannot delete Fiscal Year {0}. Fiscal Year {0} is set as default in Global Settings,Tu nikarî bibî Fiscal Sal {0}. Sal malî {0} wek default li Settings Global danîn
 DocType: Share Transfer,Equity/Liability Account,Hesabê / Rewşa Ewlekariyê
 apps/erpnext/erpnext/setup/doctype/customer_group/customer_group.py,A customer with the same name already exists,Pêwendiyek bi heman navî heye
@@ -2836,6 +2843,7 @@
 apps/erpnext/erpnext/selling/doctype/customer/customer.py,Credit limit has been crossed for customer {0} ({1}/{2}),Gelek kredî ji bo mişteriyan derbas dibe {0} ({1} / {2})
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py,Customer required for 'Customerwise Discount',Mişterî ya pêwîst ji bo &#39;Discount Customerwise&#39;
 apps/erpnext/erpnext/config/accounting.py,Update bank payment dates with journals.,Baştir dîroka peredana bank bi kovarên.
+,Billed Qty,Qty hat qewirandin
 apps/erpnext/erpnext/stock/doctype/item/item_dashboard.py,Pricing,Pricing
 DocType: Employee,Attendance Device ID (Biometric/RF tag ID),ID Nasnameya Beşdariyê (Nasnameya biyometrîkî / RF)
 DocType: Quotation,Term Details,Details term
@@ -2859,6 +2867,7 @@
 DocType: Share Transfer,Asset Account,Hesabê Assist
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js,New release date should be in the future,Dîroka berdana nû divê di pêşerojê de be
 DocType: Purchase Invoice,End date of current invoice's period,roja dawî ji dema fatûra niha ya
+apps/erpnext/erpnext/hr/doctype/employee/employee.py,Please setup Employee Naming System in Human Resource &gt; HR Settings,Ji kerema xwe di Resavkaniya Mirovan de&gt; Sîstema Nomisyonkirina Karmendan saz bikin&gt; Mîhengên HR
 DocType: Lab Test,Technician Name,Nûnerê Teknîkî
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py,"Cannot ensure delivery by Serial No as \
 					Item {0} is added with and without Ensure Delivery by \
@@ -2866,6 +2875,7 @@
 DocType: Accounts Settings,Unlink Payment on Cancellation of Invoice,Unlink Payment li ser komcivîna me ya bi fatûreyên
 DocType: Bank Reconciliation,From Date,ji Date
 apps/erpnext/erpnext/hr/doctype/vehicle_log/vehicle_log.py,Current Odometer reading entered should be greater than initial Vehicle Odometer {0},xwendina Green niha ketin divê mezintir destpêkê Vehicle Green be {0}
+,Purchase Order Items To Be Received or Billed,Tiştên Fermana Kirînê Ku bêne stendin an bezandin
 DocType: Restaurant Reservation,No Show,Pêşanî tune
 apps/erpnext/erpnext/regional/india/utils.py,You must be a registered supplier to generate e-Way Bill,Divê hûn pêşkêşvanek qeydkirî hebe ku hûn Bill-e-Way çêbikin
 DocType: Shipping Rule Country,Shipping Rule Country,Shipping Rule Country
@@ -2907,6 +2917,7 @@
 apps/erpnext/erpnext/templates/generators/item/item_add_to_cart.html,View in Cart,View li Têxe
 DocType: Employee Checkin,Shift Actual Start,Destpêka rastîn a Shift
 DocType: Tally Migration,Is Day Book Data Imported,Daneyên Pirtûka Rojê tête navandin
+,Purchase Order Items To Be Received or Billed1,Tiştên Fermana Kirînê Ku bêne stendin an Bijardandin1
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py,Marketing Expenses,Mesref marketing
 ,Item Shortage Report,Babetê Report pirsgirêka
 DocType: Bank Transaction Payments,Bank Transaction Payments,Dravên Veguhastina Bankê
@@ -3131,7 +3142,6 @@
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js,Material Consumption is not set in Manufacturing Settings.,Serdanîna Amûdê di Guhertoya Manufacturing Setup de ne.
 DocType: Quality Inspection,MAT-QA-.YYYY.-,MAT-QA-YYYY-
 DocType: Quality Meeting Table,Quality Meeting Table,Tabloya Hevdîtina Quality
-apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,Ji kerema xwe Sêwirandina Navên foran ji bo {0} bi hêla Setup&gt; Mîhengên&gt; Navên Navnîşan bikin
 apps/erpnext/erpnext/templates/pages/help.html,Visit the forums,Serdana forumê
 DocType: Student,Student Mobile Number,Xwendekarên Hejmara Mobile
 DocType: Item,Has Variants,has Variants
@@ -3275,6 +3285,7 @@
 ,Campaign Efficiency,Efficiency kampanya
 ,Campaign Efficiency,Efficiency kampanya
 DocType: Discussion,Discussion,Nîqaş
+apps/erpnext/erpnext/setup/default_energy_point_rules.py,On Sales Order Submission,Li ser radestkirina Fermana Firotanê
 DocType: Bank Transaction,Transaction ID,ID ya muameleyan
 DocType: Payroll Entry,Deduct Tax For Unsubmitted Tax Exemption Proof,Ji bo Daxistina Bacê ya Paqijkirina Bacê ya Unsubmitted Tax
 DocType: Volunteer,Anytime,Herdem
@@ -3282,7 +3293,6 @@
 DocType: Employee Tax Exemption Proof Submission,Employee Tax Exemption Proof Submission,Xweseriya Xweseriya Xweseriya Hilbijartinê
 DocType: Patient,Surgical History,Dîroka Surgical
 DocType: Bank Statement Settings Item,Mapped Header,Mapped Header
-apps/erpnext/erpnext/hr/doctype/employee/employee.py,Please setup Employee Naming System in Human Resource &gt; HR Settings,Ji kerema xwe di Resavkaniya Mirovan de&gt; Sîstema Nomisyonkirina Karmendan saz bikin
 DocType: Employee,Resignation Letter Date,Îstîfa Date Letter
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Pricing Rules are further filtered based on quantity.,Rules Pricing bi zêdetir li ser bingeha dorpêçê de tê fîltrekirin.
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py,Please set the Date Of Joining for employee {0},Xêra xwe li Date Of bizaveka bo karker {0}
@@ -3297,6 +3307,7 @@
 DocType: Bank Statement Settings,Mapped Items,Mapped Items
 DocType: Amazon MWS Settings,IT,EW
 DocType: Chapter,Chapter,Beş
+,Fixed Asset Register,Xeydkirî Mîna Verastkirî
 apps/erpnext/erpnext/utilities/user_progress.py,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,Select BOM and Qty for Production,Select BOM û Qty bo Production
@@ -3697,6 +3708,7 @@
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py,Exchange Gain/Loss,Exchange Gain / Loss
 DocType: Opportunity,Lost Reason,ji dest Sedem
 DocType: Amazon MWS Settings,Enable Amazon,Amazon
+apps/erpnext/erpnext/controllers/accounts_controller.py,Row #{0}: Account {1} does not belong to company {2},Row # {0}: Hesabê {1} ji pargîdaniya {2} re nabe
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py,Unable to find DocType {0},DucType nikare bibîne {0}
 apps/erpnext/erpnext/public/js/templates/address_list.html,New Address,New Address
 DocType: Quality Inspection,Sample Size,Size rate
@@ -4204,7 +4216,6 @@
 DocType: Journal Entry,Accounting Entries,Arşîva Accounting
 DocType: Job Card Time Log,Job Card Time Log,Kêmûreya Karta Karker
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,"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;."
-apps/erpnext/erpnext/education/doctype/instructor/instructor.py,Please setup Instructor Naming System in Education &gt; Education Settings,Ji kerema xwe Li Perwerde&gt; Mîhengên Perwerdehiyê Sîstema Nomisandina Sêwiran saz bikin
 DocType: Journal Entry,Paid Loan,Lînansê Paid
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py,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ê
@@ -4221,7 +4232,6 @@
 apps/erpnext/erpnext/templates/pages/projects.html,No time sheets,No sheets dem
 DocType: GoCardless Mandate,GoCardless Customer,Xerîdarê GoCardless
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py,Leave Type {0} cannot be carry-forwarded,Dev ji Type {0} ne dikare were hilgirtin-bicîkirin
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Item Code &gt; Item Group &gt; Brand,Koda Babetê&gt; Koma Rêzan&gt; Brand
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py,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
 DocType: Leave Encashment,Payroll,Rêza yomîya
@@ -4336,7 +4346,6 @@
 DocType: Stock Ledger Entry,Actual Qty After Transaction,Qty rastî Piştî Transaction
 ,Pending SO Items For Purchase Request,Hîn SO Nawy Ji bo Daxwaza Purchase
 apps/erpnext/erpnext/education/doctype/student_admission/student_admission.py,Student Admissions,Admissions Student
-apps/erpnext/erpnext/accounts/party.py,{0} {1} is disabled,{0} {1} neçalak e
 DocType: Supplier,Billing Currency,Billing Exchange
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py,Extra Large,Extra Large
 DocType: Loan,Loan Application,Serlêdanê deyn
@@ -4413,7 +4422,6 @@
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py,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/accounts/doctype/accounting_dimension/accounting_dimension.py,Creating Dimensions...,Dimîne Afirandin ...
 apps/erpnext/erpnext/education/doctype/student_group_creation_tool/student_group_creation_tool.py,Student Group Name is mandatory in row {0},Xwendekarên Navê babetî Pula li row wêneke e {0}
-DocType: Customer Credit Limit,Bypass credit limit_check,Qedexeya krediyê derbas bikin_check
 DocType: Homepage,Products to be shown on website homepage,Products ji bo li ser malpera Malpera bê nîşandan
 DocType: HR Settings,Password Policy,Siyaseta şîfreyê
 apps/erpnext/erpnext/setup/doctype/customer_group/customer_group.js,This is a root customer group and cannot be edited.,Ev komeke mişterî root e û ne jî dikarim di dahatûyê de were.
@@ -4702,6 +4710,7 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py,Row {0}: Advance against Customer must be credit,"Row {0}: Advance dijî Mişterî, divê credit be"
 DocType: Quality Meeting,Quality Meeting,Civîna Quality
 apps/erpnext/erpnext/accounts/doctype/account/account.js,Non-Group to Group,Non-Pol to Group
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,Ji kerema xwe Sêwirandina Navên foran ji bo {0} bi hêla Setup&gt; Mîhengên&gt; Navên Navnîşan bikin
 DocType: Employee,ERPNext User,ERPNext Bikarhêner
 apps/erpnext/erpnext/education/doctype/student_group_creation_tool/student_group_creation_tool.py,Batch is mandatory in row {0},Batch li row wêneke e {0}
 apps/erpnext/erpnext/education/doctype/student_group_creation_tool/student_group_creation_tool.py,Batch is mandatory in row {0},Batch li row wêneke e {0}
@@ -4996,6 +5005,7 @@
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py,No {0} found for Inter Company Transactions.,No {0} ji bo Kompaniya Navnetewî ve tê dîtin.
 DocType: Travel Itinerary,Rented Car,Car Hire
 apps/erpnext/erpnext/public/js/hub/components/profile_dialog.js,About your Company,Der barê şirketa we
+apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.js,Show Stock Ageing Data,Daneyên Agirkujiyê Stock destnîşan bikin
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py,Credit To account must be a Balance Sheet account,"Credit To account, divê hesabekî Bîlançoya be"
 DocType: Donor,Donor,Donor
 DocType: Global Defaults,Disable In Words,Disable Li Words
@@ -5009,8 +5019,10 @@
 DocType: Patient,Patient ID,Nasnameya nûnerê
 DocType: Practitioner Schedule,Schedule Name,Navnîşa Navîn
 DocType: Currency Exchange,For Buying,Ji Kirînê
+apps/erpnext/erpnext/setup/default_energy_point_rules.py,On Purchase Order Submission,Li ser radestkirina Fermana Kirînê
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js,Add All Suppliers,All Suppliers
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py,Row #{0}: Allocated Amount cannot be greater than outstanding amount.,Row # {0}: butçe ne dikarin bibin mezintir mayî bidin.
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Customer &gt; Customer Group &gt; Territory,Mişterî&gt; Koma Xerîdar&gt; Herêm
 DocType: Tally Migration,Parties,Partî
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js,Browse BOM,Browse BOM
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py,Secured Loans,"Loans temînatê,"
@@ -5041,6 +5053,7 @@
 apps/erpnext/erpnext/stock/doctype/item_alternative/item_alternative.py,Not allow to set alternative item for the item {0},Ne destûrê ji bo tiştek alternatîf hilbijêre {0}
 apps/erpnext/erpnext/hr/doctype/leave_block_list/leave_block_list.py,Date is repeated,Date tê dubarekirin
 apps/erpnext/erpnext/accounts/print_format/payment_receipt_voucher/payment_receipt_voucher.html,Authorized Signatory,mafdar
+apps/erpnext/erpnext/education/doctype/instructor/instructor.py,Please setup Instructor Naming System in Education &gt; Education Settings,Ji kerema xwe Li Perwerde&gt; Mîhengên Perwerdehiyê Sîstema Nomisandina Sêwiran saz bikin
 apps/erpnext/erpnext/regional/doctype/gstr_3b_report/gstr_3b_report.html,Net ITC Available(A) - (B),Net ITC ITapkirî (A) - (B)
 apps/erpnext/erpnext/education/doctype/fee_schedule/fee_schedule.js,Create Fees,Pêvek çêbikin
 DocType: Project,Total Purchase Cost (via Purchase Invoice),Total Cost Purchase (via Purchase bi fatûreyên)
@@ -5061,6 +5074,7 @@
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.js,Message Sent,Peyam nehat şandin
 apps/erpnext/erpnext/accounts/doctype/account/account.py,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/assets/report/fixed_asset_register/fixed_asset_register.py,Vendor Name,Navê vendor
 DocType: Quiz Result,Wrong,Qelp
 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)
@@ -5300,6 +5314,7 @@
 DocType: Stock Settings,Auto Material Request,Daxwaza Auto Material
 DocType: Woocommerce Settings,API consumer secret,API-yê veşartî
 DocType: Delivery Note Item,Available Batch Qty at From Warehouse,Qty Batch li From Warehouse
+,Received Qty Amount,Mîqdara Qiymet werdigirt
 DocType: Salary Slip,Gross Pay - Total Deduction - Loan Repayment,Pay Gross - dabirîna Total - Loan vegerandinê
 DocType: Bank Account,Last Integration Date,Dîroka yekbûna paşîn
 DocType: Expense Claim,Expense Taxes and Charges,Bacan û berdêlên mehane
@@ -5756,6 +5771,8 @@
 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,Please select Qty against item {0},Ji kerema xwe Qty li dijî hilbijêre {0}
+apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py,Latest Age,Serdema Dawîn
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js,Transfer Material to Supplier,Materyalê ji Pêşkêşker re veguhestin
 apps/erpnext/erpnext/hr/report/loan_repayment/loan_repayment.py,EMI,EMI
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py,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
@@ -5778,7 +5795,6 @@
 apps/erpnext/erpnext/hr/doctype/employee_benefit_application/employee_benefit_application.py,"An amount of {0} already claimed for the component {1},\
 						 set the amount equal or greater than {2}","Gelek {0} ji berê ve ji bo beşek {1} hat pejirandin, \ neya mêjeya wekhev an jî ji bilî mezintir veke {2}"
 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
 DocType: BOM Update Tool,The new BOM after replacement,The BOM nû piştî gotina
 ,Point of Sale,Point of Sale
@@ -5897,7 +5913,6 @@
 DocType: Purchase Order Item,Blanket Order Rate,Pirtûka Pelê ya Blanket
 ,Customer Ledger Summary,Kurteya Mişterî Ledger
 apps/erpnext/erpnext/hooks.py,Certification,Şehadet
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js,Are you sure you want to make debit note?,Ma hûn guman dikin ku hûn dixwazin nîşana debîtiyê bikin?
 DocType: Bank Guarantee,Clauses and Conditions,Şert û Şertên
 DocType: Serial No,Creation Document Type,Creation Corî dokumênt
 DocType: Amazon MWS Settings,ES,ES
@@ -6013,6 +6028,7 @@
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py,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,Send Supplier Emails,Send Emails Supplier
+DocType: Asset Movement,ACC-ASM-.YYYY.-,ACC-ASM-.YYYY.-
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py,"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
 apps/erpnext/erpnext/hr/doctype/employee_onboarding/employee_onboarding.py,Submit this to create the Employee record,Vê şîfre bikin ku ji qeydkirina karmendê
@@ -6089,7 +6105,6 @@
 DocType: Sales Team,Contact No.,Contact No.
 apps/erpnext/erpnext/templates/includes/cart/cart_address.html,Billing Address is same as Shipping Address,Navnîşana billing heman navnîşa barkirinê ye
 DocType: Bank Reconciliation,Payment Entries,Arşîva Payment
-apps/erpnext/erpnext/erpnext_integrations/doctype/shopify_settings/shopify_settings.py,Access token or Shopify URL missing,URL binivîse navnîşan an şîfreya Shopify
 DocType: Location,Latitude,Firehî
 DocType: Work Order,Scrap Warehouse,Warehouse xurde
 DocType: Work Order,Check if material transfer entry is not required,Check eger entry transfer maddî ne hewceyî
@@ -6132,7 +6147,6 @@
 DocType: Job Offer Term,Value / Description,Nirx / Description
 apps/erpnext/erpnext/controllers/accounts_controller.py,"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
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js,Are you sure you want to make credit note?,Ma hûn guman dikin ku hûn dixwazin hêjayê krediyê bikin?
 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,Debit and Credit not equal for {0} #{1}. Difference is {2}.,Debit û Credit ji bo {0} # wekhev ne {1}. Cudahiya e {2}.
@@ -6255,6 +6269,7 @@
 DocType: Purchase Invoice,Taxes and Charges Added,Bac û tawana Ev babete ji layê
 apps/erpnext/erpnext/assets/doctype/asset/asset.py,Depreciation Row {0}: Next Depreciation Date cannot be before Available-for-use Date,Berê Nerazîbûnê Rûber {0}: Piştre Dîroka Nirxandina Berî Berî Berî Berî Bikaranîna Dîrok-pey-be
 ,Sales Funnel,govekeke Sales
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Item Code &gt; Item Group &gt; Brand,Koda Babetê&gt; Koma Rêzan&gt; Brand
 apps/erpnext/erpnext/setup/doctype/company/company.py,Abbreviation is mandatory,Abbreviation wêneke e
 DocType: Project,Task Progress,Task Progress
 apps/erpnext/erpnext/templates/includes/navbar/navbar_items.html,Cart,Ereboka destan
@@ -6497,6 +6512,7 @@
 DocType: Employee Grade,Employee Grade,Dibistana
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py,Piecework,Piecework
 DocType: GSTR 3B Report,June,Pûşper
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Supplier &gt; Supplier Type,Hilberîner&gt; Tîpa pêşkêşkar
 DocType: Share Balance,From No,Ji Na
 DocType: Shift Type,Early Exit Grace Period,Serdema Grace Exit zû
 DocType: Task,Actual Time (in Hours),Time rastî (di Hours)
@@ -6969,6 +6985,7 @@
 DocType: Quality Inspection Reading,Quality Inspection Reading,Reading Berhemên Quality
 apps/erpnext/erpnext/stock/doctype/stock_settings/stock_settings.py,`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/stock/report/stock_balance/stock_balance.py,Earliest Age,Zûtirîn
 apps/erpnext/erpnext/utilities/user_progress.py,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.
 DocType: Quality Goal,Revision,Nûxwestin
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js,Healthcare Services,Xizmetên tenduristiyê
@@ -7012,6 +7029,7 @@
 apps/erpnext/erpnext/healthcare/doctype/patient_encounter/patient_encounter.js,Schedule Discharge,Discharge schedule
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py,Cheques and Deposits incorrectly cleared,Cheques û meden bi şaşî kenîştê
 DocType: Homepage Section Card,Homepage Section Card,Karta beşa rûpelê
+,Amount To Be Billed,Mîqdar Ku bêne Bilindkirin
 apps/erpnext/erpnext/accounts/doctype/account/account.py,Account {0}: You can not assign itself as parent account,Account {0}: Tu dikarî xwe wek account dê û bav bê peywirdarkirin ne
 DocType: Purchase Invoice Item,Price List Rate,Price List Rate
 apps/erpnext/erpnext/utilities/activation.py,Create customer quotes,Create quotes mişterî
@@ -7064,6 +7082,7 @@
 DocType: Supplier Scorecard Criteria,Supplier Scorecard Criteria,Supplier Scorecard Criteria
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py,Please select Start Date and End Date for Item {0},Ji kerema xwe ve Date Start û End Date ji bo babet hilbijêre {0}
 DocType: Maintenance Schedule,MAT-MSH-.YYYY.-,MAT-MSH-YYYY-
+,Amount to Receive,Tezmînata ji bo wergirtinê
 apps/erpnext/erpnext/education/doctype/student_group_creation_tool/student_group_creation_tool.py,Course is mandatory in row {0},Helbet li row wêneke e {0}
 apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py,From date can not be greater than than To date,Ji mêjû nikare ji Tîrêjê mezintir be
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py,To date cannot be before from date,To date nikarim li ber ji date be
@@ -7513,6 +7532,7 @@
 DocType: Delivery Note,Print Without Amount,Print Bê Mîqdar
 apps/erpnext/erpnext/accounts/report/asset_depreciation_ledger/asset_depreciation_ledger.py,Depreciation Date,Date Farhad.
 ,Work Orders in Progress,Pêşdebirina Karên Karên Pêşveçûn
+DocType: Customer Credit Limit,Bypass Credit Limit Check,Kontrolê Limit kredî ya Bypass
 DocType: Issue,Support Team,Team Support
 apps/erpnext/erpnext/stock/report/batch_item_expiry_status/batch_item_expiry_status.py,Expiry (In Days),Expiry (Di Days)
 DocType: Appraisal,Total Score (Out of 5),Total Score: (Out of 5)
@@ -7696,6 +7716,7 @@
 DocType: Sales Invoice,Customer GSTIN,GSTIN mişterî
 DocType: Crop Cycle,List of diseases detected on the field. When selected it'll automatically add a list of tasks to deal with the disease ,Lîsteya li nexweşiyên li ser axaftinê têne dîtin. Dema ku bijartî ew dê otomatîk lîsteya karûbarên xwe zêde bike ku ji bo nexweşiyê ve girêdayî bike
 apps/erpnext/erpnext/manufacturing/page/bom_comparison_tool/bom_comparison_tool.js,BOM 1,BOM 1
+apps/erpnext/erpnext/assets/report/fixed_asset_register/fixed_asset_register.py,Asset Id,Asset Id
 apps/erpnext/erpnext/healthcare/doctype/healthcare_service_unit/healthcare_service_unit.js,This is a root healthcare service unit and cannot be edited.,Ev yekîneya xizmeta lênerîna lênêrînê ya bingehîn e û nikare guherandinê ne.
 DocType: Asset Repair,Repair Status,Rewşa Rewşê
 apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.js,"Requested Qty: Quantity requested for purchase, but not ordered.","Dahat Dûre: Hêjahî ji bo kirînê xwestiye, lê nehatiye ferman kirin."
diff --git a/erpnext/translations/lo.csv b/erpnext/translations/lo.csv
index 17f0408..960ef15 100644
--- a/erpnext/translations/lo.csv
+++ b/erpnext/translations/lo.csv
@@ -289,7 +289,6 @@
 DocType: Loan,Repay Over Number of Periods,ຕອບບຸນແທນຄຸນໃນໄລຍະຈໍານວນຂອງໄລຍະເວລາ
 apps/erpnext/erpnext/manufacturing/report/bom_stock_report/bom_stock_report.py,Quantity to Produce can not be less than Zero,ປະລິມານການຜະລິດບໍ່ສາມາດຕ່ ຳ ກວ່າສູນ
 DocType: Stock Entry,Additional Costs,ຄ່າໃຊ້ຈ່າຍເພີ່ມເຕີມ
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Customer &gt; Customer Group &gt; Territory,ລູກຄ້າ&gt; ກຸ່ມລູກຄ້າ&gt; ອານາເຂດ
 apps/erpnext/erpnext/accounts/doctype/account/account.py,Account with existing transaction can not be converted to group.,ບັນຊີກັບທຸລະກໍາທີ່ມີຢູ່ແລ້ວບໍ່ສາມາດປ່ຽນໃຈເຫລື້ອມໃສກຸ່ມ.
 DocType: Lead,Product Enquiry,ສອບຖາມຂໍ້ມູນຜະລິດຕະພັນ
 DocType: Education Settings,Validate Batch for Students in Student Group,ກວດສອບຊຸດສໍາລັບນັກສຶກສາໃນກຸ່ມນັກສຶກສາ
@@ -587,6 +586,7 @@
 DocType: Healthcare Settings,Create documents for sample collection,ສ້າງເອກະສານສໍາລັບການເກັບຕົວຢ່າງ
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py,Payment against {0} {1} cannot be greater than Outstanding Amount {2},ຊໍາລະເງິນກັບ {0} {1} ບໍ່ສາມາດຈະມີຫຼາຍຂຶ້ນກ່ວາທີ່ພົ້ນເດັ່ນຈໍານວນ {2}
 apps/erpnext/erpnext/patches/v11_0/add_healthcare_service_unit_tree_root.py,All Healthcare Service Units,ທຸກຫນ່ວຍບໍລິການສຸຂະພາບ
+apps/erpnext/erpnext/setup/default_energy_point_rules.py,On Converting Opportunity,ກ່ຽວກັບການປ່ຽນແປງໂອກາດ
 DocType: Bank Account,Address HTML,ທີ່ຢູ່ HTML
 DocType: Lead,Mobile No.,ເບີມືຖື
 apps/erpnext/erpnext/selling/doctype/pos_closing_voucher/closing_voucher_details.html,Mode of Payments,Mode of Payments
@@ -651,7 +651,6 @@
 DocType: Accounting Dimension,Dimension Name,ຊື່ມິຕິ
 apps/erpnext/erpnext/healthcare/setup.py,Resistant,ທົນທານຕໍ່
 apps/erpnext/erpnext/hotels/doctype/hotel_room_reservation/hotel_room_reservation.py,Please set Hotel Room Rate on {},ກະລຸນາຕັ້ງໂຮງແຮມ Rate on {}
-apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py,Please setup numbering series for Attendance via Setup &gt; Numbering Series,ກະລຸນາຕິດຕັ້ງຊຸດ ໝາຍ ເລກ ສຳ ລັບການເຂົ້າຮຽນຜ່ານການຕິດຕັ້ງ&gt; ຊຸດເລກ ລຳ ດັບ
 DocType: Journal Entry,Multi Currency,ສະກຸນເງິນຫຼາຍ
 DocType: Bank Statement Transaction Invoice Item,Invoice Type,ປະເພດໃບເກັບເງິນ
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py,Valid from date must be less than valid upto date,ຖືກຕ້ອງຈາກວັນທີຕ້ອງມີ ໜ້ອຍ ກວ່າວັນທີທີ່ຖືກຕ້ອງ
@@ -769,6 +768,7 @@
 apps/erpnext/erpnext/accounts/page/pos/pos.js,Create a new Customer,ສ້າງລູກຄ້າໃຫມ່
 apps/erpnext/erpnext/non_profit/report/expiring_memberships/expiring_memberships.py,Expiring On,Expiring On
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,"If multiple Pricing Rules continue to prevail, users are asked to set Priority manually to resolve conflict.","ຖ້າຫາກວ່າກົດລະບຽບການຕັ້ງລາຄາທີ່ຫຼາກຫຼາຍສືບຕໍ່ໄຊຊະນະ, ຜູ້ໃຊ້ໄດ້ຮ້ອງຂໍໃຫ້ກໍານົດບຸລິມະສິດດ້ວຍຕົນເອງເພື່ອແກ້ໄຂບັນຫາຂໍ້ຂັດແຍ່ງ."
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js,Purchase Return,Return ຊື້
 apps/erpnext/erpnext/utilities/activation.py,Create Purchase Orders,ສ້າງໃບສັ່ງຊື້
 ,Purchase Register,ລົງທະບຽນການຊື້
 apps/erpnext/erpnext/healthcare/doctype/patient/patient.py,Patient not found,ບໍ່ພົບຄົນເຈັບ
@@ -784,7 +784,6 @@
 DocType: Location,Area UOM,ພື້ນທີ່ UOM
 apps/erpnext/erpnext/manufacturing/doctype/workstation/workstation.py,Workstation is closed on the following dates as per Holiday List: {0},Workstation ຈະປິດໃນວັນທີດັ່ງຕໍ່ໄປນີ້ຕໍ່ຊີ Holiday: {0}
 apps/erpnext/erpnext/selling/page/sales_funnel/sales_funnel.py,Opportunities,ກາລະໂອກາດ
-apps/erpnext/erpnext/www/all-products/index.html,Clear filters,ລ້າງຕົວກອງ
 DocType: Lab Test Template,Single,ດຽວ
 DocType: Compensatory Leave Request,Work From Date,ເຮັດວຽກຈາກວັນທີ
 DocType: Salary Slip,Total Loan Repayment,ທັງຫມົດຊໍາລະຄືນເງິນກູ້
@@ -828,6 +827,7 @@
 apps/erpnext/erpnext/education/doctype/program_enrollment_tool/program_enrollment_tool.py,Mandatory field - Academic Year,ພາກສະຫນາມບັງຄັບ - ປີທາງວິຊາການ
 apps/erpnext/erpnext/education/doctype/program_enrollment_tool/program_enrollment_tool.py,Mandatory field - Academic Year,ພາກສະຫນາມບັງຄັບ - ປີທາງວິຊາການ
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py,{0} {1} is not associated with {2} {3},{0} {1} ບໍ່ກ່ຽວຂ້ອງກັບ {2} {3}
+DocType: Opportunity,Converted By,ປ່ຽນໃຈເຫລື້ອມໃສໂດຍ
 apps/erpnext/erpnext/public/js/hub/components/ReviewArea.vue,You need to login as a Marketplace User before you can add any reviews.,ທ່ານຕ້ອງເຂົ້າສູ່ລະບົບເປັນຜູ້ ນຳ ໃຊ້ Marketplace ກ່ອນທີ່ທ່ານຈະສາມາດເພີ່ມ ຄຳ ຕິຊົມໃດໆ.
 apps/erpnext/erpnext/manufacturing/doctype/job_card/job_card.py,Row {0} : Operation is required against the raw material item {1},ແຖວ {0}: ຕ້ອງມີການດໍາເນີນການຕໍ່ກັບວັດຖຸດິບ {1}
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py,Please set default payable account for the company {0},ກະລຸນາຕັ້ງບັນຊີທີ່ຕ້ອງຈ່າຍໃນຕອນຕົ້ນສໍາລັບການບໍລິສັດ {0}
@@ -854,6 +854,8 @@
 DocType: Sales Invoice,Total Qty,ທັງຫມົດຈໍານວນ
 apps/erpnext/erpnext/education/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py,Guardian2 Email ID,ລະຫັດອີເມວ Guardian2
 apps/erpnext/erpnext/education/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py,Guardian2 Email ID,ລະຫັດອີເມວ Guardian2
+apps/erpnext/erpnext/hr/doctype/employee_transfer/employee_transfer.py,"Please delete the Employee <a href=""#Form/Employee/{0}"">{0}</a>\
+					to cancel this document","ກະລຸນາລຶບພະນັກງານ <a href=""#Form/Employee/{0}"">{0}</a> \ ເພື່ອຍົກເລີກເອກະສານນີ້"
 DocType: Item,Show in Website (Variant),ສະແດງໃຫ້ເຫັນໃນເວັບໄຊທ໌ (Variant)
 DocType: Employee,Health Concerns,ຄວາມກັງວົນສຸຂະພາບ
 DocType: Payroll Entry,Select Payroll Period,ເລືອກ Payroll ໄລຍະເວລາ
@@ -914,7 +916,6 @@
 DocType: Codification Table,Codification Table,ຕາຕະລາງການອ້າງອີງ
 DocType: Timesheet Detail,Hrs,ຊົ່ວໂມງ
 apps/erpnext/erpnext/manufacturing/page/bom_comparison_tool/bom_comparison_tool.js,Changes in {0},ການປ່ຽນແປງໃນ {0}
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js,Please select Company,ກະລຸນາເລືອກບໍລິສັດ
 DocType: Employee Skill,Employee Skill,ທັກສະຂອງພະນັກງານ
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.js,Difference Account,ບັນຊີທີ່ແຕກຕ່າງກັນ
 DocType: Pricing Rule,Discount on Other Item,ຫຼຸດລາຄາສິນຄ້າອື່ນໆ
@@ -983,6 +984,7 @@
 DocType: BOM,Operating Cost,ຄ່າໃຊ້ຈ່າຍປະຕິບັດການ
 DocType: Crop,Produced Items,ຜະລິດສິນຄ້າ
 DocType: Bank Statement Transaction Entry,Match Transaction to Invoices,ຄໍາວ່າການຄ້າກັບໃບແຈ້ງຫນີ້
+apps/erpnext/erpnext/erpnext_integrations/exotel_integration.py,Error in Exotel incoming call,ຂໍ້ຜິດພາດໃນການໂທເຂົ້າ Exotel
 DocType: Sales Order Item,Gross Profit,ກໍາໄຮຂັ້ນຕົ້ນ
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js,Unblock Invoice,Unblock Invoice
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py,Increment cannot be 0,ການເພີ່ມຂຶ້ນບໍ່ສາມາດຈະເປັນ 0
@@ -1198,6 +1200,7 @@
 DocType: Activity Cost,Activity Type,ປະເພດຂອງກິດຈະກໍາ
 DocType: Request for Quotation,For individual supplier,ສໍາລັບການສະຫນອງບຸກຄົນ
 DocType: BOM Operation,Base Hour Rate(Company Currency),ຖານອັດຕາຊົ່ວໂມງ (ບໍລິສັດສະກຸນເງິນ)
+,Qty To Be Billed,Qty ທີ່ຈະຖືກເກັບເງິນ
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py,Delivered Amount,ຈໍານວນເງິນສົ່ງ
 apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.js,Reserved Qty for Production: Raw materials quantity to make manufacturing items.,Qty ສຳ ລັບການຜະລິດ: ຈຳ ນວນວັດຖຸດິບເພື່ອຜະລິດເປັນສິນຄ້າ.
 DocType: Loyalty Point Entry Redemption,Redemption Date,ວັນທີ່ຖືກໄຖ່
@@ -1319,7 +1322,7 @@
 apps/erpnext/erpnext/education/doctype/student_group/student_group.py,Please select Program,ກະລຸນາເລືອກໂຄງການ
 apps/erpnext/erpnext/education/doctype/student_group/student_group.py,Please select Program,ກະລຸນາເລືອກໂຄງການ
 DocType: Project,Estimated Cost,ຕົ້ນທຶນຄາດຄະເນ
-DocType: Request for Quotation,Link to material requests,ການເຊື່ອມຕໍ່ກັບການຮ້ອງຂໍອຸປະກອນການ
+DocType: Supplier Quotation,Link to material requests,ການເຊື່ອມຕໍ່ກັບການຮ້ອງຂໍອຸປະກອນການ
 apps/erpnext/erpnext/public/js/hub/pages/Publish.vue,Publish,ເຜີຍແຜ່
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py,Aerospace,ຍານອະວະກາດ
 ,Fichier des Ecritures Comptables [FEC],Fichier des Ecritures Accounts [FEC]
@@ -1332,6 +1335,7 @@
 apps/erpnext/erpnext/utilities/transaction_base.py,Invalid Posting Time,ເວລາໂພດບໍ່ຖືກຕ້ອງ
 DocType: Salary Component,Condition and Formula,ເງື່ອນໄຂແລະສູດ
 DocType: Lead,Campaign Name,ຊື່ການໂຄສະນາ
+apps/erpnext/erpnext/setup/default_energy_point_rules.py,On Task Completion,ກ່ຽວກັບການ ສຳ ເລັດວຽກງານ
 apps/erpnext/erpnext/hr/doctype/compensatory_leave_request/compensatory_leave_request.py,There is no leave period in between {0} and {1},ບໍ່ມີໄລຍະເວລາອອກຈາກລະຫວ່າງ {0} ກັບ {1}
 DocType: Fee Validity,Healthcare Practitioner,Healthcare Practitioner
 DocType: Hotel Room,Capacity,ຄວາມສາມາດ
@@ -1677,7 +1681,6 @@
 DocType: Quality Feedback Template,Quality Feedback Template,ແມ່ແບບ ຄຳ ຕິຊົມຄຸນນະພາບ
 apps/erpnext/erpnext/config/education.py,LMS Activity,LMS ກິດຈະ ກຳ
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py,Internet Publishing,Publishing ອິນເຕີເນັດ
-DocType: Prescription Duration,Number,ຈໍານວນ
 apps/erpnext/erpnext/accounts/doctype/opening_invoice_creation_tool/opening_invoice_creation_tool.js,Creating {0} Invoice,ການສ້າງ {0} ໃບເກັບເງິນ
 DocType: Medical Code,Medical Code Standard,Medical Code Standard
 DocType: Soil Texture,Clay Composition (%),ສ່ວນປະກອບຂອງດິນເຜົາ (%)
@@ -1752,6 +1755,7 @@
 DocType: Support Settings,Get Started Sections,ເລີ່ມຕົ້ນພາກສ່ວນຕ່າງໆ
 DocType: Lead,CRM-LEAD-.YYYY.-,CRM-LEAD -YYYY.-
 DocType: Invoice Discounting,Sanctioned,ທີ່ຖືກເກືອດຫ້າມ
+,Base Amount,ຈຳ ນວນພື້ນຖານ
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.js,Total Contribution Amount: {0},ຈໍານວນເງິນສະສົມລວມ: {0}
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py,Row #{0}: Please specify Serial No for Item {1},"ຕິດຕໍ່ກັນ, {0}: ກະລຸນາລະບຸ Serial No ສໍາລັບລາຍການ {1}"
 DocType: Payroll Entry,Salary Slips Submitted,Salary Slips Submitted
@@ -1974,6 +1978,7 @@
 DocType: Accounting Dimension,Dimension Defaults,ຄ່າເລີ່ມຕົ້ນມິຕິ
 apps/erpnext/erpnext/crm/report/prospects_engaged_but_not_converted/prospects_engaged_but_not_converted.js,Minimum Lead Age (Days),Lead ຂັ້ນຕ່ໍາອາຍຸ (ວັນ)
 apps/erpnext/erpnext/crm/report/prospects_engaged_but_not_converted/prospects_engaged_but_not_converted.js,Minimum Lead Age (Days),Lead ຂັ້ນຕ່ໍາອາຍຸ (ວັນ)
+apps/erpnext/erpnext/assets/report/fixed_asset_register/fixed_asset_register.py,Available For Use Date,ມີໃຫ້ ສຳ ລັບວັນທີ ນຳ ໃຊ້
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py,All BOMs,ແອບເປີ້ນທັງຫມົດ
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js,Create Inter Company Journal Entry,ສ້າງລາຍການວາລະສານ Inter Company
 DocType: Company,Parent Company,ບໍລິສັດແມ່
@@ -2038,6 +2043,7 @@
 ,IRS 1099,IRS 1099
 DocType: Salary Slip,Leave Without Pay,ອອກຈາກໂດຍບໍ່ມີການຈ່າຍ
 DocType: Payment Request,Outward,ພາຍນອກ
+apps/erpnext/erpnext/setup/default_energy_point_rules.py,On {0} Creation,ໃນ {0} ການສ້າງ
 apps/erpnext/erpnext/regional/doctype/gstr_3b_report/gstr_3b_report.html,State/UT Tax,ພາສີຂອງລັດ / UT
 ,Trial Balance for Party,ດຸນການທົດລອງສໍາລັບການພັກ
 ,Gross and Net Profit Report,ບົດລາຍງານລວມຍອດແລະຜົນ ກຳ ໄລສຸດທິ
@@ -2155,6 +2161,7 @@
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js,Make Stock Entry,ເຮັດໃຫ້ການເຂົ້າຫຸ້ນ
 DocType: Hotel Room Reservation,Hotel Reservation User,Hotel Reservation User
 apps/erpnext/erpnext/projects/doctype/project/project.js,Set Status,ຕັ້ງສະຖານະພາບ
+apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py,Please setup numbering series for Attendance via Setup &gt; Numbering Series,ກະລຸນາຕິດຕັ້ງຊຸດ ໝາຍ ເລກ ສຳ ລັບການເຂົ້າຮຽນຜ່ານການຕັ້ງຄ່າ&gt; ເລກ ລຳ ດັບ
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py,Please select prefix first,ກະລຸນາເລືອກຄໍານໍາຫນ້າທໍາອິດ
 DocType: Contract,Fulfilment Deadline,Fulfillment Deadline
 apps/erpnext/erpnext/public/js/hub/pages/Home.vue,Near you,ໃກ້ທ່ານ
@@ -2170,6 +2177,7 @@
 DocType: Announcement,All Students,ນັກສຶກສາທັງຫມົດ
 apps/erpnext/erpnext/assets/doctype/asset/asset.py,Item {0} must be a non-stock item,ລາຍການ {0} ຈະຕ້ອງເປັນລາຍການບໍ່ແມ່ນຫຼັກຊັບ
 apps/erpnext/erpnext/stock/doctype/batch/batch.js,View Ledger,View Ledger
+DocType: Cost Center,Lft,ຊ້າຍ
 DocType: Grading Scale,Intervals,ໄລຍະ
 DocType: Bank Statement Transaction Entry,Reconciled Transactions,Reconciled Transactions
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py,Earliest,ທໍາອິດ
@@ -2285,6 +2293,7 @@
 apps/erpnext/erpnext/hr/doctype/employee_benefit_application/employee_benefit_application.py,As per your assigned Salary Structure you cannot apply for benefits,ຕາມການກໍານົດຄ່າເງິນເດືອນທີ່ທ່ານໄດ້ມອບໃຫ້ທ່ານບໍ່ສາມາດສະຫມັກຂໍຜົນປະໂຫຍດໄດ້
 apps/erpnext/erpnext/stock/doctype/item/item.py,Website Image should be a public file or website URL,ເວັບໄຊທ໌ຮູບພາບຄວນຈະເປັນເອກະສານສາທາລະນະຫຼືທີ່ຢູ່ເວັບເວັບໄຊທ໌
 DocType: Purchase Invoice Item,BOM,BOM
+apps/erpnext/erpnext/stock/doctype/item/item.py,Duplicate entry in Manufacturers table,ການຊໍ້າຊ້ອນເຂົ້າໃນຕາຕະລາງຜູ້ຜະລິດ
 apps/erpnext/erpnext/setup/doctype/item_group/item_group.js,This is a root item group and cannot be edited.,ນີ້ເປັນກຸ່ມລາຍການຮາກແລະບໍ່ສາມາດໄດ້ຮັບການແກ້ໄຂ.
 apps/erpnext/erpnext/accounts/doctype/account/account.js,Merge,ປ້ອນຂໍ້ມູນ
 DocType: Journal Entry Account,Purchase Order,ໃບສັ່ງຊື້
@@ -2431,7 +2440,6 @@
 DocType: Asset,Depreciation Schedules,ຕາຕະລາງຄ່າເສື່ອມລາຄາ
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.js,Create Sales Invoice,ສ້າງໃບເກັບເງິນການຂາຍ
 apps/erpnext/erpnext/regional/doctype/gstr_3b_report/gstr_3b_report.html,Ineligible ITC,ITC ທີ່ບໍ່ມີສິດໄດ້ຮັບ
-apps/erpnext/erpnext/erpnext_integrations/doctype/shopify_settings/shopify_settings.py,"Support for public app is deprecated. Please setup private app, for more details refer user manual",ສະຫນັບສະຫນູນສໍາລັບ app ສາທາລະນະແມ່ນ deprecated. ກະລຸນາຕັ້ງແອັບຯເອກະຊົນເພື່ອເບິ່ງລາຍະລະອຽດເພີ່ມເຕີມໃນຄູ່ມືການໃຊ້ງານ
 DocType: Task,Dependent Tasks,ໜ້າ ວຽກເພິ່ງພາອາໄສ
 apps/erpnext/erpnext/regional/report/gstr_1/gstr_1.py,Following accounts might be selected in GST Settings:,ບັນຊີດັ່ງຕໍ່ໄປນີ້ອາດຈະຖືກເລືອກໃນການຕັ້ງຄ່າ GST:
 apps/erpnext/erpnext/manufacturing/report/bom_stock_report/bom_stock_report.js,Quantity to Produce,ຈຳ ນວນເພື່ອຜະລິດ
@@ -2683,6 +2691,7 @@
 DocType: Water Analysis,Container,Container
 apps/erpnext/erpnext/regional/report/gstr_1/gstr_1.py,Please set valid GSTIN No. in Company Address,ກະລຸນາຕັ້ງ ໝາຍ ເລກ GSTIN ທີ່ຖືກຕ້ອງໃນທີ່ຢູ່ຂອງບໍລິສັດ
 apps/erpnext/erpnext/education/utils.py,Student {0} - {1} appears Multiple times in row {2} & {3},ນັກສຶກສາ {0} - {1} ປະກົດວ່າເວລາຫຼາຍໃນການຕິດຕໍ່ກັນ {2} ແລະ {3}
+apps/erpnext/erpnext/selling/doctype/customer/customer.py,Following fields are mandatory to create address:,ຊ່ອງຂໍ້ມູນຕໍ່ໄປນີ້ແມ່ນບັງຄັບທີ່ຈະສ້າງທີ່ຢູ່:
 DocType: Item Alternative,Two-way,ສອງທາງ
 DocType: Item,Manufacturers,ຜູ້ຜະລິດ
 apps/erpnext/erpnext/accounts/deferred_revenue.py,Error while processing deferred accounting for {0},ມີຂໍ້ຜິດພາດໃນຂະນະທີ່ ດຳ ເນີນການບັນຊີທີ່ບໍ່ຖືກຕ້ອງ ສຳ ລັບ {0}
@@ -2758,9 +2767,9 @@
 DocType: Employee,HR-EMP-,HR-EMP-
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py,User {0} doesn't have any default POS Profile. Check Default at Row {1} for this User.,ຜູ້ໃຊ້ {0} ບໍ່ມີໂປແກຼມ POS ແບບສະເພາະໃດຫນຶ່ງ. ກວດເບິ່ງຄ່າເລີ່ມຕົ້ນຢູ່ແຖວ {1} ສໍາລັບຜູ້ໃຊ້ນີ້.
 DocType: Quality Meeting Minutes,Quality Meeting Minutes,ນາທີກອງປະຊຸມຄຸນນະພາບ
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Supplier &gt; Supplier Type,ຜູ້ສະ ໜອງ ສິນຄ້າ&gt; ປະເພດຜູ້ສະ ໜອງ ສິນຄ້າ
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py,Employee Referral,ພະນັກງານແນະນໍາ
 DocType: Student Group,Set 0 for no limit,ກໍານົດ 0 ສໍາລັບທີ່ບໍ່ມີຂອບເຂດຈໍາກັດ
+DocType: Cost Center,rgt,rgt
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py,The day(s) on which you are applying for leave are holidays. You need not apply for leave.,ມື້ (s) ທີ່ທ່ານກໍາລັງສະຫມັກສໍາລັບໃບມີວັນພັກ. ທ່ານບໍ່ຈໍາເປັນຕ້ອງນໍາໃຊ້ສໍາລັບການອອກຈາກ.
 DocType: Customer,Primary Address and Contact Detail,ທີ່ຢູ່ເບື້ອງຕົ້ນແລະລາຍລະອຽດການຕິດຕໍ່
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.js,Resend Payment Email,resend ການຊໍາລະເງິນ Email
@@ -2870,7 +2879,6 @@
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py,Against Supplier Invoice {0} dated {1},ຕໍ່ Supplier Invoice {0} ວັນ {1}
 DocType: Customer,Default Price List,ລາຄາມາດຕະຖານ
 apps/erpnext/erpnext/assets/doctype/asset/asset.py,Asset Movement record {0} created,ການບັນທຶກການເຄື່ອນໄຫວຊັບສິນ {0} ສ້າງ
-apps/erpnext/erpnext/utilities/page/leaderboard/leaderboard.js,No items found.,ບໍ່ພົບລາຍການ.
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py,You cannot delete Fiscal Year {0}. Fiscal Year {0} is set as default in Global Settings,ທ່ານບໍ່ສາມາດລົບປະຈໍາປີ {0}. ປີງົບປະມານ {0} ກໍານົດເປັນມາດຕະຖານໃນການຕັ້ງຄ່າ Global
 DocType: Share Transfer,Equity/Liability Account,ບັນຊີ Equity / Liability
 apps/erpnext/erpnext/setup/doctype/customer_group/customer_group.py,A customer with the same name already exists,ລູກຄ້າທີ່ມີຊື່ດຽວກັນກໍ່ມີຢູ່ແລ້ວ
@@ -2886,6 +2894,7 @@
 apps/erpnext/erpnext/selling/doctype/customer/customer.py,Credit limit has been crossed for customer {0} ({1}/{2}),ຂອບເຂດການປ່ອຍສິນເຊື່ອໄດ້ຖືກຂ້າມຜ່ານສໍາລັບລູກຄ້າ {0} ({1} / {2})
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py,Customer required for 'Customerwise Discount',ລູກຄ້າທີ່ຕ້ອງການສໍາລັບການ &#39;Customerwise ສ່ວນລົດ&#39;
 apps/erpnext/erpnext/config/accounting.py,Update bank payment dates with journals.,ປັບປຸງຂໍ້ມູນວັນຈ່າຍເງິນທະນາຄານທີ່ມີວາລະສານ.
+,Billed Qty,ໃບບິນຄ່າ Qty
 apps/erpnext/erpnext/stock/doctype/item/item_dashboard.py,Pricing,ການຕັ້ງລາຄາ
 DocType: Employee,Attendance Device ID (Biometric/RF tag ID),ID ອຸປະກອນທີ່ເຂົ້າຮຽນ (ID ID Biometric / RF)
 DocType: Quotation,Term Details,ລາຍລະອຽດໃນໄລຍະ
@@ -2909,6 +2918,7 @@
 DocType: Share Transfer,Asset Account,ບັນຊີຊັບສິນ
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js,New release date should be in the future,ວັນປ່ອຍລຸ້ນ ໃໝ່ ຄວນຈະເປັນໃນອະນາຄົດ
 DocType: Purchase Invoice,End date of current invoice's period,ວັນທີໃນຕອນທ້າຍຂອງໄລຍະເວລາໃບເກັບເງິນໃນປັດຈຸບັນ
+apps/erpnext/erpnext/hr/doctype/employee/employee.py,Please setup Employee Naming System in Human Resource &gt; HR Settings,ກະລຸນາຕິດຕັ້ງລະບົບການຕັ້ງຊື່ພະນັກງານໃນຊັບພະຍາກອນມະນຸດ&gt; ການຕັ້ງຄ່າ HR
 DocType: Lab Test,Technician Name,ຊື່ Technician
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py,"Cannot ensure delivery by Serial No as \
 					Item {0} is added with and without Ensure Delivery by \
@@ -2916,6 +2926,7 @@
 DocType: Accounts Settings,Unlink Payment on Cancellation of Invoice,Unlink ການຊໍາລະເງິນກ່ຽວກັບການຍົກເລີກການໃບເກັບເງິນ
 DocType: Bank Reconciliation,From Date,ຈາກວັນທີ່
 apps/erpnext/erpnext/hr/doctype/vehicle_log/vehicle_log.py,Current Odometer reading entered should be greater than initial Vehicle Odometer {0},ອ່ານໄມປັດຈຸບັນເຂົ້າໄປຄວນຈະເປັນຫຼາຍກ່ວາເບື້ອງຕົ້ນພາຫະນະໄມ {0}
+,Purchase Order Items To Be Received or Billed,ລາຍການສັ່ງຊື້ທີ່ຈະໄດ້ຮັບຫຼືເກັບເງິນ
 DocType: Restaurant Reservation,No Show,ບໍ່ມີສະແດງ
 apps/erpnext/erpnext/regional/india/utils.py,You must be a registered supplier to generate e-Way Bill,ທ່ານຕ້ອງເປັນຜູ້ສະ ໜອງ ຈົດທະບຽນເພື່ອຜະລິດໃບບິນ e-Way
 DocType: Shipping Rule Country,Shipping Rule Country,Shipping ກົດລະບຽບປະເທດ
@@ -2958,6 +2969,7 @@
 apps/erpnext/erpnext/templates/generators/item/item_add_to_cart.html,View in Cart,ເບິ່ງໃນໂຄງຮ່າງການ
 DocType: Employee Checkin,Shift Actual Start,ເລື່ອນການເລີ່ມຕົ້ນຕົວຈິງ
 DocType: Tally Migration,Is Day Book Data Imported,ແມ່ນຂໍ້ມູນປື້ມວັນທີ່ ນຳ ເຂົ້າ
+,Purchase Order Items To Be Received or Billed1,ລາຍການສັ່ງຊື້ທີ່ຈະໄດ້ຮັບຫຼືເກັບເງິນ 1
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py,Marketing Expenses,ຄ່າໃຊ້ຈ່າຍການຕະຫຼາດ
 apps/erpnext/erpnext/stock/doctype/pick_list/pick_list.py,{0} units of {1} is not available.,{0} ຫົວ ໜ່ວຍ ຂອງ {1} ບໍ່ມີບໍລິການ.
 ,Item Shortage Report,ບົດລາຍງານການຂາດແຄນສິນຄ້າ
@@ -3186,7 +3198,6 @@
 apps/erpnext/erpnext/public/js/call_popup/call_popup.js,View all issues from {0},ເບິ່ງທຸກປັນຫາຈາກ {0}
 DocType: Quality Inspection,MAT-QA-.YYYY.-,MAT-QA-.YYYY.-
 DocType: Quality Meeting Table,Quality Meeting Table,ຕາຕະລາງກອງປະຊຸມຄຸນນະພາບ
-apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,ກະລຸນາຕັ້ງຊຸດການໃສ່ຊື່ ສຳ ລັບ {0} ຜ່ານການຕັ້ງຄ່າ&gt; ການຕັ້ງຄ່າ&gt; ຊຸດການຕັ້ງຊື່
 apps/erpnext/erpnext/templates/pages/help.html,Visit the forums,ຢ້ຽມຊົມຟໍລັ່ມ
 DocType: Student,Student Mobile Number,ຈໍານວນໂທລະສັບມືຖືນັກສຶກສາ
 DocType: Item,Has Variants,ມີ Variants
@@ -3330,6 +3341,7 @@
 ,Campaign Efficiency,ປະສິດທິພາບຂະບວນການ
 ,Campaign Efficiency,ປະສິດທິພາບຂະບວນການ
 DocType: Discussion,Discussion,ການສົນທະນາ
+apps/erpnext/erpnext/setup/default_energy_point_rules.py,On Sales Order Submission,ກ່ຽວກັບການຍື່ນສະ ເໜີ ການຂາຍ
 DocType: Bank Transaction,Transaction ID,ID Transaction
 DocType: Payroll Entry,Deduct Tax For Unsubmitted Tax Exemption Proof,ເອົາພາສີອາກອນສໍາລັບການຍົກເວັ້ນພາສີທີ່ບໍ່ໄດ້ມອບໃຫ້
 DocType: Volunteer,Anytime,ທຸກເວລາ
@@ -3337,7 +3349,6 @@
 DocType: Employee Tax Exemption Proof Submission,Employee Tax Exemption Proof Submission,ຂໍ້ສະເຫນີຕົວຍົກເວັ້ນພາສີຂອງພະນັກງານ
 DocType: Patient,Surgical History,Surgical History
 DocType: Bank Statement Settings Item,Mapped Header,Mapped Header
-apps/erpnext/erpnext/hr/doctype/employee/employee.py,Please setup Employee Naming System in Human Resource &gt; HR Settings,ກະລຸນາຕິດຕັ້ງລະບົບການຕັ້ງຊື່ພະນັກງານໃນຊັບພະຍາກອນມະນຸດ&gt; ການຕັ້ງຄ່າ HR
 DocType: Employee,Resignation Letter Date,ການລາອອກວັນທີ່ສະຫມັກຈົດຫມາຍສະບັບ
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Pricing Rules are further filtered based on quantity.,ກົດລະບຽບການຕັ້ງລາຄາໄດ້ຖືກກັ່ນຕອງຕື່ມອີກໂດຍອີງໃສ່ປະລິມານ.
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py,Please set the Date Of Joining for employee {0},ກະລຸນາຕັ້ງວັນທີ່ຂອງການເຂົ້າຮ່ວມສໍາລັບພະນັກງານທີ່ {0}
@@ -3352,6 +3363,7 @@
 DocType: Bank Statement Settings,Mapped Items,Mapped Items
 DocType: Amazon MWS Settings,IT,IT
 DocType: Chapter,Chapter,ຫມວດ
+,Fixed Asset Register,ລົງທະບຽນຊັບສິນທີ່ມີ ກຳ ນົດ
 apps/erpnext/erpnext/utilities/user_progress.py,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,Select BOM and Qty for Production,ເລືອກ BOM ແລະຈໍານວນການຜະລິດ
@@ -3487,7 +3499,6 @@
 apps/erpnext/erpnext/templates/emails/reorder_item.html,Following Material Requests have been raised automatically based on Item's re-order level,ປະຕິບັດຕາມການຮ້ອງຂໍການວັດສະດຸໄດ້ຮັບການຍົກຂຶ້ນມາອັດຕະໂນມັດອີງຕາມລະດັບ Re: ສັ່ງຊື້ສິນຄ້າຂອງ
 apps/erpnext/erpnext/controllers/accounts_controller.py,Account {0} is invalid. Account Currency must be {1},ບັນຊີ {0} ບໍ່ຖືກຕ້ອງ. ບັນຊີສະກຸນເງິນຈະຕ້ອງ {1}
 apps/erpnext/erpnext/hr/doctype/salary_structure_assignment/salary_structure_assignment.py,From Date {0} cannot be after employee's relieving Date {1},ຈາກວັນ {0} ບໍ່ສາມາດຢູ່ພາຍຫຼັງວັນທີ່ Relieving ຂອງພະນັກງານ {1}
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py,Debit Note {0} has been created automatically,ໝາຍ ເຫດ Debit {0} ໄດ້ຖືກສ້າງຂື້ນໂດຍອັດຕະໂນມັດ
 apps/erpnext/erpnext/accounts/doctype/payment_order/payment_order.js,Create Payment Entries,ສ້າງລາຍການຊໍາລະເງິນ
 DocType: Supplier,Is Internal Supplier,ແມ່ນຜູ້ຊື້ພາຍໃນ
 DocType: Employee,Create User Permission,ສ້າງການອະນຸຍາດໃຫ້ຜູ້ໃຊ້
@@ -4051,7 +4062,6 @@
 DocType: Project User,Project Status,ສະຖານະການ
 DocType: UOM,Check this to disallow fractions. (for Nos),ກວດສອບນີ້ຈະບໍ່ອະນຸຍາດແຕ່ສ່ວນຫນຶ່ງ. (ສໍາລັບພວກເຮົາ)
 DocType: Student Admission Program,Naming Series (for Student Applicant),ການຕັ້ງຊື່ Series (ສໍາລັບນັກສຶກສາສະຫມັກ)
-apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.py,UOM Conversion factor ({0} -&gt; {1}) not found for item: {2},ປັດໄຈການປ່ຽນ UOM ({0} -&gt; {1}) ບໍ່ພົບ ສຳ ລັບລາຍການ: {2}
 apps/erpnext/erpnext/hr/doctype/retention_bonus/retention_bonus.py,Bonus Payment Date cannot be a past date,ວັນທີຊໍາລະເງິນໂບນັດບໍ່ສາມາດເປັນວັນທີ່ຜ່ານມາ
 DocType: Travel Request,Copy of Invitation/Announcement,Copy of Invitation / Announcement
 DocType: Practitioner Service Unit Schedule,Practitioner Service Unit Schedule,Schedule of Unit Practitioner Service Unit
@@ -4067,6 +4077,7 @@
 DocType: Task Depends On,Task Depends On,ວຽກງານຂຶ້ນໃນ
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js,Opportunity,ໂອກາດ
 DocType: Options,Option,ທາງເລືອກ
+apps/erpnext/erpnext/accounts/general_ledger.py,You can't create accounting entries in the closed accounting period {0},ທ່ານບໍ່ສາມາດສ້າງລາຍການບັນຊີໃນຊ່ວງບັນຊີທີ່ປິດ {0}
 DocType: Operation,Default Workstation,Workstation ມາດຕະຖານ
 DocType: Payment Entry,Deductions or Loss,ຫັກຄ່າໃຊ້ຈ່າຍຫຼືການສູນເສຍ
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py,{0} {1} is closed,{0} {1} ແມ່ນປິດ
@@ -4199,6 +4210,7 @@
 apps/erpnext/erpnext/utilities/user_progress.py,Setup Company,ຕິດຕັ້ງບໍລິສັດ
 ,Lab Test Report,Lab Report Test
 DocType: Employee Benefit Application,Employee Benefit Application,Application Benefit Employee
+apps/erpnext/erpnext/accounts/doctype/invoice_discounting/invoice_discounting.py,Row({0}): {1} is already discounted in {2},ແຖວ ({0}): {1} ແມ່ນຫຼຸດລົງແລ້ວໃນ {2}
 apps/erpnext/erpnext/hr/doctype/additional_salary/additional_salary.py,Additional Salary Component Exists.,ອົງປະກອບເງິນເດືອນເພີ່ມເຕີມ.
 DocType: Purchase Invoice,Unregistered,ບໍ່ໄດ້ລົງທະບຽນ
 DocType: Student Applicant,Application Date,ຄໍາຮ້ອງສະຫມັກວັນທີ່
@@ -4278,7 +4290,6 @@
 DocType: Journal Entry,Accounting Entries,ການອອກສຽງການບັນຊີ
 DocType: Job Card Time Log,Job Card Time Log,ບັນທຶກເວລາເຮັດວຽກຂອງບັດ
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,"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;."
-apps/erpnext/erpnext/education/doctype/instructor/instructor.py,Please setup Instructor Naming System in Education &gt; Education Settings,ກະລຸນາຕິດຕັ້ງລະບົບການຕັ້ງຊື່ຜູ້ສອນໃນການສຶກສາ&gt; ການຕັ້ງຄ່າການສຶກສາ
 DocType: Journal Entry,Paid Loan,ເງິນກູ້ຢືມ
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py,Duplicate Entry. Please check Authorization Rule {0},ຊ້ໍາເຂົ້າ. ກະລຸນາກວດສອບການອະນຸຍາດກົດລະບຽບ {0}
 DocType: Journal Entry Account,Reference Due Date,Date Due Date
@@ -4295,7 +4306,6 @@
 apps/erpnext/erpnext/templates/pages/projects.html,No time sheets,ບໍ່ມີແຜ່ນທີ່ໃຊ້ເວລາ
 DocType: GoCardless Mandate,GoCardless Customer,ລູກຄ້າ GoCardless
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py,Leave Type {0} cannot be carry-forwarded,"ອອກຈາກປະເພດ {0} ບໍ່ສາມາດໄດ້ຮັບການປະຕິບັດ, ການສົ່ງ"
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Item Code &gt; Item Group &gt; Brand,ລະຫັດສິນຄ້າ&gt; ກຸ່ມລາຍການ&gt; ຍີ່ຫໍ້
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py,Maintenance Schedule is not generated for all the items. Please click on 'Generate Schedule',ບໍາລຸງຮັກສາເປັນເວລາທີ່ບໍ່ໄດ້ສ້າງຂຶ້ນສໍາລັບການລາຍການທັງຫມົດ. ກະລຸນາຄລິກໃສ່ &quot;ສ້າງຕາຕະລາງ&quot;
 ,To Produce,ກັບຜະລິດຕະພັນ
 DocType: Leave Encashment,Payroll,Payroll
@@ -4411,7 +4421,6 @@
 DocType: Stock Ledger Entry,Actual Qty After Transaction,ຈໍານວນຕົວຈິງຫຼັງຈາກການ
 ,Pending SO Items For Purchase Request,ທີ່ຍັງຄ້າງ SO ລາຍການສໍາລັບການຈອງຊື້
 apps/erpnext/erpnext/education/doctype/student_admission/student_admission.py,Student Admissions,ຮັບສະຫມັກນັກສຶກສາ
-apps/erpnext/erpnext/accounts/party.py,{0} {1} is disabled,{0} {1} ເປັນຄົນພິການ
 DocType: Supplier,Billing Currency,ສະກຸນເງິນ Billing
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py,Extra Large,ຂະຫນາດໃຫຍ່ພິເສດ
 DocType: Loan,Loan Application,Application Loan
@@ -4488,7 +4497,6 @@
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py,Only Leave Applications with status 'Approved' and 'Rejected' can be submitted,ອອກພຽງແຕ່ຄໍາຮ້ອງສະຫມັກທີ່ມີສະຖານະພາບ &#39;ອະນຸມັດ&#39; ແລະ &#39;ປະຕິເສດ&#39; ສາມາດໄດ້ຮັບການສົ່ງ
 apps/erpnext/erpnext/accounts/doctype/accounting_dimension/accounting_dimension.py,Creating Dimensions...,ກຳ ລັງສ້າງຂະ ໜາດ ...
 apps/erpnext/erpnext/education/doctype/student_group_creation_tool/student_group_creation_tool.py,Student Group Name is mandatory in row {0},ນັກສຶກສາ Group Name ເປັນຂໍ້ບັງຄັບໃນການຕິດຕໍ່ກັນ {0}
-DocType: Customer Credit Limit,Bypass credit limit_check,limit_check ສິນເຊື່ອແບບຜິດປົກກະຕິ
 DocType: Homepage,Products to be shown on website homepage,ຜະລິດຕະພັນທີ່ຈະໄດ້ຮັບການສະແດງໃຫ້ເຫັນໃນຫນ້າທໍາອິດເວັບໄຊທ໌
 DocType: HR Settings,Password Policy,ນະໂຍບາຍລະຫັດຜ່ານ
 apps/erpnext/erpnext/setup/doctype/customer_group/customer_group.js,This is a root customer group and cannot be edited.,ນີ້ເປັນກຸ່ມລູກຄ້າຮາກແລະບໍ່ສາມາດໄດ້ຮັບການແກ້ໄຂ.
@@ -4782,6 +4790,7 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py,Row {0}: Advance against Customer must be credit,ຕິດຕໍ່ກັນ {0}: Advance ຕໍ່ລູກຄ້າຈະຕ້ອງເປັນການປ່ອຍສິນເຊື່ອ
 DocType: Quality Meeting,Quality Meeting,ກອງປະຊຸມຄຸນນະພາບ
 apps/erpnext/erpnext/accounts/doctype/account/account.js,Non-Group to Group,ທີ່ບໍ່ແມ່ນກຸ່ມ Group
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,ກະລຸນາຕັ້ງຊຸດການໃສ່ຊື່ ສຳ ລັບ {0} ຜ່ານການຕັ້ງຄ່າ&gt; ການຕັ້ງຄ່າ&gt; ຊຸດການຕັ້ງຊື່
 DocType: Employee,ERPNext User,ERPNext User
 apps/erpnext/erpnext/education/doctype/student_group_creation_tool/student_group_creation_tool.py,Batch is mandatory in row {0},batch ເປັນຂໍ້ບັງຄັບໃນການຕິດຕໍ່ກັນ {0}
 apps/erpnext/erpnext/education/doctype/student_group_creation_tool/student_group_creation_tool.py,Batch is mandatory in row {0},batch ເປັນຂໍ້ບັງຄັບໃນການຕິດຕໍ່ກັນ {0}
@@ -5081,6 +5090,7 @@
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py,No {0} found for Inter Company Transactions.,ບໍ່ພົບ {0} ສໍາລັບ Inter Company Transactions.
 DocType: Travel Itinerary,Rented Car,ເຊົ່າລົດ
 apps/erpnext/erpnext/public/js/hub/components/profile_dialog.js,About your Company,ກ່ຽວກັບບໍລິສັດຂອງທ່ານ
+apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.js,Show Stock Ageing Data,ສະແດງຂໍ້ມູນຜູ້ສູງອາຍຸຂອງຫຸ້ນ
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py,Credit To account must be a Balance Sheet account,ການປ່ອຍສິນເຊື່ອການບັນຊີຈະຕ້ອງບັນຊີງົບດຸນ
 DocType: Donor,Donor,ຜູ້ໃຫ້ທຶນ
 DocType: Global Defaults,Disable In Words,ປິດການໃຊ້ງານໃນຄໍາສັບຕ່າງໆ
@@ -5095,8 +5105,10 @@
 DocType: Practitioner Schedule,Schedule Name,ຊື່ຕາຕະລາງ
 apps/erpnext/erpnext/regional/doctype/gstr_3b_report/gstr_3b_report.py,Please enter GSTIN and state for the Company Address {0},ກະລຸນາໃສ່ GSTIN ແລະລັດ ສຳ ລັບທີ່ຢູ່ບໍລິສັດ {0}
 DocType: Currency Exchange,For Buying,ສໍາລັບການຊື້
+apps/erpnext/erpnext/setup/default_energy_point_rules.py,On Purchase Order Submission,ກ່ຽວກັບການຍື່ນສະ ເໜີ ການສັ່ງຊື້
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js,Add All Suppliers,ຕື່ມການສະຫນອງທັງຫມົດ
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py,Row #{0}: Allocated Amount cannot be greater than outstanding amount.,ແຖວ # {0}: ຈັດສັນຈໍານວນບໍ່ສາມາດຈະມີຫຼາຍຂຶ້ນກ່ວາປະລິມານທີ່ຍັງຄ້າງຄາ.
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Customer &gt; Customer Group &gt; Territory,ລູກຄ້າ&gt; ກຸ່ມລູກຄ້າ&gt; ອານາເຂດ
 DocType: Tally Migration,Parties,ພາກສ່ວນຕ່າງໆ
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js,Browse BOM,Browse BOM
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py,Secured Loans,ກູ້ໄພ
@@ -5128,6 +5140,7 @@
 apps/erpnext/erpnext/stock/doctype/item_alternative/item_alternative.py,Not allow to set alternative item for the item {0},ບໍ່ອະນຸຍາດໃຫ້ຕັ້ງຄ່າລາຍການທາງເລືອກສໍາລັບລາຍການ {0}
 apps/erpnext/erpnext/hr/doctype/leave_block_list/leave_block_list.py,Date is repeated,ວັນທີ່ຖືກຊ້ໍາ
 apps/erpnext/erpnext/accounts/print_format/payment_receipt_voucher/payment_receipt_voucher.html,Authorized Signatory,ລົງນາມອະນຸຍາດ
+apps/erpnext/erpnext/education/doctype/instructor/instructor.py,Please setup Instructor Naming System in Education &gt; Education Settings,ກະລຸນາຕັ້ງລະບົບການຕັ້ງຊື່ຜູ້ສອນໃນການສຶກສາ&gt; ການຕັ້ງຄ່າການສຶກສາ
 apps/erpnext/erpnext/regional/doctype/gstr_3b_report/gstr_3b_report.html,Net ITC Available(A) - (B),ມີ ITC ສຸດທິ (A) - (B)
 apps/erpnext/erpnext/education/doctype/fee_schedule/fee_schedule.js,Create Fees,ສ້າງຄ່າທໍານຽມ
 DocType: Project,Total Purchase Cost (via Purchase Invoice),ມູນຄ່າທັງຫມົດຊື້ (ຜ່ານຊື້ Invoice)
@@ -5148,6 +5161,7 @@
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.js,Message Sent,ຂໍ້ຄວາມທີ່ສົ່ງ
 apps/erpnext/erpnext/accounts/doctype/account/account.py,Account with child nodes cannot be set as ledger,ບັນຊີທີ່ມີຂໍ້ເດັກນ້ອຍທີ່ບໍ່ສາມາດໄດ້ຮັບການກໍານົດໄວ້ເປັນຊີແຍກປະເພດ
 DocType: C-Form,II,II
+apps/erpnext/erpnext/assets/report/fixed_asset_register/fixed_asset_register.py,Vendor Name,ຊື່ຜູ້ຂາຍ
 DocType: Quiz Result,Wrong,ຜິດ
 DocType: Sales Invoice,Rate at which Price list currency is converted to customer's base currency,ອັດຕາການທີ່ສະເຫນີລາຄາສະກຸນເງິນຈະປ່ຽນເປັນສະກຸນເງິນຂອງລູກຄ້າຂອງພື້ນຖານ
 DocType: Purchase Invoice Item,Net Amount (Company Currency),ຈໍານວນສຸດທິ (ບໍລິສັດສະກຸນເງິນ)
@@ -5393,6 +5407,7 @@
 DocType: Stock Settings,Auto Material Request,ວັດສະດຸອັດຕະໂນມັດຄໍາຮ້ອງຂໍ
 DocType: Woocommerce Settings,API consumer secret,ຄວາມລັບຂອງຜູ້ບໍລິໂພກ API
 DocType: Delivery Note Item,Available Batch Qty at From Warehouse,ຈໍານວນ Batch ມີຢູ່ຈາກ Warehouse
+,Received Qty Amount,ໄດ້ຮັບ ຈຳ ນວນ Qty
 DocType: Salary Slip,Gross Pay - Total Deduction - Loan Repayment,ຈ່າຍລວມທັງຫມົດ - ການຫັກທັງຫມົດ - ການຊໍາລະຫນີ້
 DocType: Bank Account,Last Integration Date,ວັນທີປະສົມປະສານສຸດທ້າຍ
 DocType: Expense Claim,Expense Taxes and Charges,ພາສີແລະຄ່າບໍລິການ
@@ -5857,6 +5872,8 @@
 DocType: Drug Prescription,Hour,ຊົ່ວໂມງ
 DocType: Restaurant Order Entry,Last Sales Invoice,ໃບຄໍາສັ່ງຊື້ຂາຍສຸດທ້າຍ
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py,Please select Qty against item {0},ກະລຸນາເລືອກ Qty ຕໍ່ກັບລາຍການ {0}
+apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py,Latest Age,ອາຍຸລ້າສຸດ
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js,Transfer Material to Supplier,ໂອນເອກະສານໃຫ້ຜູ້ສະ ໜອງ
 apps/erpnext/erpnext/hr/report/loan_repayment/loan_repayment.py,EMI,EMI
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py,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,ປະເພດນໍາ
@@ -5880,7 +5897,6 @@
 apps/erpnext/erpnext/hr/doctype/employee_benefit_application/employee_benefit_application.py,"An amount of {0} already claimed for the component {1},\
 						 set the amount equal or greater than {2}","ຈໍານວນເງິນທີ່ {0} ອ້າງແລ້ວສໍາລັບສ່ວນປະກອບ {1}, \ ກໍານົດຈໍານວນເທົ່າທຽມກັນຫລືສູງກວ່າ {2}"
 DocType: Shipping Rule,Shipping Rule Conditions,ເງື່ອນໄຂການຂົນສົ່ງ
-DocType: Purchase Invoice,Export Type,ປະເພດການສົ່ງອອກ
 DocType: Salary Slip Loan,Salary Slip Loan,Salary Slip Loan
 DocType: BOM Update Tool,The new BOM after replacement,The BOM ໃຫມ່ຫຼັງຈາກທົດແທນ
 ,Point of Sale,ຈຸດຂອງການຂາຍ
@@ -6002,7 +6018,6 @@
 DocType: Purchase Order Item,Blanket Order Rate,Blanket Order Rate
 ,Customer Ledger Summary,ບົດສະຫຼຸບລູກຄ້າ
 apps/erpnext/erpnext/hooks.py,Certification,ການຢັ້ງຢືນ
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js,Are you sure you want to make debit note?,ທ່ານແນ່ໃຈບໍ່ວ່າທ່ານຕ້ອງການທີ່ຈະເຮັດບັດເດບິດບໍ?
 DocType: Bank Guarantee,Clauses and Conditions,ເງື່ອນໄຂແລະເງື່ອນໄຂ
 DocType: Serial No,Creation Document Type,ການສ້າງປະເພດເອກະສານ
 DocType: Amazon MWS Settings,ES,ES
@@ -6040,8 +6055,6 @@
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py,Financial Services,ການບໍລິການທາງດ້ານການເງິນ
 DocType: Student Sibling,Student ID,ID ນັກສຶກສາ
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.js,For Quantity must be greater than zero,ສໍາລັບຈໍານວນຕ້ອງເກີນກວ່າສູນ
-apps/erpnext/erpnext/hr/doctype/employee_transfer/employee_transfer.py,"Please delete the Employee <a href=""#Form/Employee/{0}"">{0}</a>\
-					to cancel this document","ກະລຸນາລຶບພະນັກງານ <a href=""#Form/Employee/{0}"">{0}</a> \ ເພື່ອຍົກເລີກເອກະສານນີ້"
 apps/erpnext/erpnext/config/projects.py,Types of activities for Time Logs,ປະເພດຂອງກິດຈະກໍາສໍາລັບການທີ່ໃຊ້ເວລາບັນທຶກ
 DocType: Opening Invoice Creation Tool,Sales,Sales
 DocType: Stock Entry Detail,Basic Amount,ຈໍານວນພື້ນຖານ
@@ -6120,6 +6133,7 @@
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py,Print and Stationery,Print ແລະເຄື່ອງຮັບໃຊ້ຫ້ອງ
 DocType: Stock Settings,Show Barcode Field,ສະແດງໃຫ້ເຫັນພາກສະຫນາມ Barcode
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js,Send Supplier Emails,ສົ່ງອີເມວ Supplier
+DocType: Asset Movement,ACC-ASM-.YYYY.-,ACC-ASM-.YYYY.-
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py,"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,ສ້າງໂດຍອັດຕະໂນມັດ
 apps/erpnext/erpnext/hr/doctype/employee_onboarding/employee_onboarding.py,Submit this to create the Employee record,ສົ່ງຂໍ້ມູນນີ້ເພື່ອສ້າງບັນທຶກພະນັກງານ
@@ -6200,7 +6214,6 @@
 DocType: Sales Team,Contact No.,ເລກທີ່
 apps/erpnext/erpnext/templates/includes/cart/cart_address.html,Billing Address is same as Shipping Address,ທີ່ຢູ່ໃບບິນແມ່ນຄືກັນກັບທີ່ຢູ່ສົ່ງ
 DocType: Bank Reconciliation,Payment Entries,ການອອກສຽງການຊໍາລະເງິນ
-apps/erpnext/erpnext/erpnext_integrations/doctype/shopify_settings/shopify_settings.py,Access token or Shopify URL missing,ລຶບ URL ຂອງໂທຈັນຫຼື Shopify
 DocType: Location,Latitude,Latitude
 DocType: Work Order,Scrap Warehouse,Scrap Warehouse
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py,"Warehouse required at Row No {0}, please set default warehouse for the item {1} for the company {2}","ຄັງສິນຄ້າທີ່ຕ້ອງການຢູ່ແຖວບໍ່ມີ {0}, ກະລຸນາຕັ້ງຄ່າສາງສໍາລັບລາຍການ {1} ສໍາລັບບໍລິສັດ {2}"
@@ -6245,7 +6258,6 @@
 DocType: Job Offer Term,Value / Description,ມູນຄ່າ / ລາຍລະອຽດ
 apps/erpnext/erpnext/controllers/accounts_controller.py,"Row #{0}: Asset {1} cannot be submitted, it is already {2}","ຕິດຕໍ່ກັນ, {0}: Asset {1} ບໍ່ສາມາດໄດ້ຮັບການສົ່ງ, ມັນແມ່ນແລ້ວ {2}"
 DocType: Tax Rule,Billing Country,ປະເທດໃບບິນ
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js,Are you sure you want to make credit note?,ທ່ານແນ່ໃຈບໍ່ວ່າທ່ານຕ້ອງການເຮັດບັນທຶກສິນເຊື່ອ?
 DocType: Purchase Order Item,Expected Delivery Date,ວັນທີຄາດວ່າການຈັດສົ່ງ
 DocType: Restaurant Order Entry,Restaurant Order Entry,Restaurant Order Entry
 apps/erpnext/erpnext/accounts/general_ledger.py,Debit and Credit not equal for {0} #{1}. Difference is {2}.,ບັດເດບິດແລະເຄຣດິດບໍ່ເທົ່າທຽມກັນສໍາລັບ {0} # {1}. ຄວາມແຕກຕ່າງກັນເປັນ {2}.
@@ -6370,6 +6382,7 @@
 DocType: Purchase Invoice,Taxes and Charges Added,ພາສີອາກອນແລະຄ່າບໍລິການເພີ່ມ
 apps/erpnext/erpnext/assets/doctype/asset/asset.py,Depreciation Row {0}: Next Depreciation Date cannot be before Available-for-use Date,ໄລຍະຫັກຄ່າທໍານຽມ {0}: ວັນທີຄ່າເສື່ອມລາຄາຕໍ່ໄປບໍ່ສາມາດຢູ່ໃນວັນທີ່ມີຢູ່
 ,Sales Funnel,ຊ່ອງທາງການຂາຍ
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Item Code &gt; Item Group &gt; Brand,ລະຫັດສິນຄ້າ&gt; ກຸ່ມລາຍການ&gt; ຍີ່ຫໍ້
 apps/erpnext/erpnext/setup/doctype/company/company.py,Abbreviation is mandatory,ຊື່ຫຍໍ້ເປັນການບັງຄັບ
 DocType: Project,Task Progress,ຄວາມຄືບຫນ້າວຽກງານ
 apps/erpnext/erpnext/templates/includes/navbar/navbar_items.html,Cart,ໂຄງຮ່າງການ
@@ -6615,6 +6628,7 @@
 DocType: Employee Grade,Employee Grade,ລະດັບພະນັກງານ
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py,Piecework,ເຫມົາ
 DocType: GSTR 3B Report,June,ມິຖຸນາ
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Supplier &gt; Supplier Type,ຜູ້ສະ ໜອງ ສິນຄ້າ&gt; ປະເພດຜູ້ສະ ໜອງ ສິນຄ້າ
 DocType: Share Balance,From No,ຈາກ No
 DocType: Shift Type,Early Exit Grace Period,ໄລຍະເວລາ Grace ອອກກ່ອນໄວອັນຄວນ
 DocType: Task,Actual Time (in Hours),ທີ່ໃຊ້ເວລາຕົວຈິງ (ໃນຊົ່ວໂມງ)
@@ -6901,6 +6915,7 @@
 DocType: Warehouse,Warehouse Name,ຊື່ Warehouse
 DocType: Naming Series,Select Transaction,ເລືອກເຮັດທຸລະກໍາ
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py,Please enter Approving Role or Approving User,ກະລຸນາໃສ່ອະນຸມັດການພາລະບົດບາດຫຼືອະນຸມັດຜູ້ໃຊ້
+apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.py,UOM Conversion factor ({0} -&gt; {1}) not found for item: {2},ປັດໄຈການປ່ຽນ UOM ({0} -&gt; {1}) ບໍ່ພົບ ສຳ ລັບລາຍການ: {2}
 apps/erpnext/erpnext/support/doctype/service_level_agreement/service_level_agreement.py,Service Level Agreement with Entity Type {0} and Entity {1} already exists.,ຂໍ້ຕົກລົງລະດັບການບໍລິການກັບປະເພດຫົວ ໜ່ວຍ {0} ແລະ ໜ່ວຍ ງານ {1} ມີຢູ່ແລ້ວ.
 DocType: Journal Entry,Write Off Entry,ຂຽນ Off Entry
 DocType: BOM,Rate Of Materials Based On,ອັດຕາຂອງວັດສະດຸພື້ນຖານກ່ຽວກັບ
@@ -7092,6 +7107,7 @@
 DocType: Quality Inspection Reading,Quality Inspection Reading,ມີຄຸນະພາບກວດສອບການອ່ານຫນັງສື
 apps/erpnext/erpnext/stock/doctype/stock_settings/stock_settings.py,`Freeze Stocks Older Than` should be smaller than %d days.,`Freeze ຫຸ້ນເກົ່າ Than` ຄວນຈະເປັນຂະຫນາດນ້ອຍກ່ວາ% d ມື້.
 DocType: Tax Rule,Purchase Tax Template,ຊື້ແມ່ແບບພາສີ
+apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py,Earliest Age,ອາຍຸກ່ອນ
 apps/erpnext/erpnext/utilities/user_progress.py,Set a sales goal you'd like to achieve for your company.,ກໍານົດເປົ້າຫມາຍການຂາຍທີ່ທ່ານຢາກຈະບັນລຸສໍາລັບບໍລິສັດຂອງທ່ານ.
 DocType: Quality Goal,Revision,ການດັດແກ້
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js,Healthcare Services,ສຸຂະພາບບໍລິການ
@@ -7135,6 +7151,7 @@
 apps/erpnext/erpnext/healthcare/doctype/patient_encounter/patient_encounter.js,Schedule Discharge,ຕາຕະລາງໄຫຼ
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py,Cheques and Deposits incorrectly cleared,ເຊັກແລະເງິນຝາກການເກັບກູ້ບໍ່ຖືກຕ້ອງ
 DocType: Homepage Section Card,Homepage Section Card,ບັດພາກສ່ວນ ໜ້າ ທຳ ອິດ
+,Amount To Be Billed,ຈຳ ນວນເງິນທີ່ຈະຖືກເກັບ
 apps/erpnext/erpnext/accounts/doctype/account/account.py,Account {0}: You can not assign itself as parent account,ບັນຊີ {0}: ທ່ານບໍ່ສາມາດກໍາຫນົດຕົວຂອງມັນເອງເປັນບັນຊີຂອງພໍ່ແມ່
 DocType: Purchase Invoice Item,Price List Rate,ລາຄາອັດຕາ
 apps/erpnext/erpnext/utilities/activation.py,Create customer quotes,ສ້າງລູກຄ້າ
@@ -7187,6 +7204,7 @@
 DocType: Supplier Scorecard Criteria,Supplier Scorecard Criteria,ເງື່ອນໄຂຜູ້ສະຫນອງ Scorecard
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py,Please select Start Date and End Date for Item {0},ກະລຸນາເລືອກເອົາວັນທີເລີ່ມຕົ້ນແລະການສິ້ນສຸດວັນທີ່ສໍາລັບລາຍການ {0}
 DocType: Maintenance Schedule,MAT-MSH-.YYYY.-,MAT-MSH-.YYYY.-
+,Amount to Receive,ຈຳ ນວນເງິນທີ່ຈະໄດ້ຮັບ
 apps/erpnext/erpnext/education/doctype/student_group_creation_tool/student_group_creation_tool.py,Course is mandatory in row {0},ຂອງລາຍວິຊາແມ່ນບັງຄັບໃນການຕິດຕໍ່ກັນ {0}
 apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py,From date can not be greater than than To date,ຈາກວັນທີບໍ່ສາມາດໃຫຍ່ກວ່າວັນທີ
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py,To date cannot be before from date,ວັນທີບໍ່ສາມາດຈະກ່ອນທີ່ຈະຈາກວັນທີ່
@@ -7437,7 +7455,6 @@
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js,BOM and Manufacturing Quantity are required,BOM ແລະປະລິມານການຜະລິດຈໍາເປັນຕ້ອງ
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js,Ageing Range 2,Range Ageing 2
 DocType: SG Creation Tool Course,Max Strength,ຄວາມສູງສຸດທີ່ເຄຍ
-apps/erpnext/erpnext/accounts/doctype/account/account.py,"Account {0} already exists in child company {1}. The following fields have different values, they should be same:<ul><li>{2}</li></ul>","ບັນຊີ {0} ມີຢູ່ແລ້ວໃນບໍລິສັດເດັກ {1}. ບັນດາຂົງເຂດຕໍ່ໄປນີ້ມີຄຸນຄ່າທີ່ແຕກຕ່າງກັນ, ພວກມັນຄວນຈະຄືກັນ: <ul><li> {2} </li></ul>"
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py,Installing presets,ການຕິດຕັ້ງ presets
 DocType: Fee Schedule,EDU-FSH-.YYYY.-,EDU-FSH-yYYY.-
 apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js,No Delivery Note selected for Customer {},ບໍ່ມີການຈັດສົ່ງຂໍ້ມູນສໍາລັບລູກຄ້າ {}
@@ -7649,6 +7666,7 @@
 DocType: Delivery Note,Print Without Amount,ພິມໂດຍບໍ່ມີການຈໍານວນ
 apps/erpnext/erpnext/accounts/report/asset_depreciation_ledger/asset_depreciation_ledger.py,Depreciation Date,ວັນທີ່ສະຫມັກຄ່າເສື່ອມລາຄາ
 ,Work Orders in Progress,ຄໍາສັ່ງເຮັດວຽກໃນຄວາມຄືບຫນ້າ
+DocType: Customer Credit Limit,Bypass Credit Limit Check,ການກວດສອບ ຈຳ ກັດການປ່ອຍສິນເຊື່ອ Bypass
 DocType: Issue,Support Team,ທີມງານສະຫນັບສະຫນູນ
 apps/erpnext/erpnext/stock/report/batch_item_expiry_status/batch_item_expiry_status.py,Expiry (In Days),ຫມົດອາຍຸ (ໃນວັນ)
 DocType: Appraisal,Total Score (Out of 5),ຄະແນນທັງຫມົດ (Out of 5)
@@ -7835,6 +7853,7 @@
 DocType: Sales Invoice,Customer GSTIN,GSTIN Customer
 DocType: Crop Cycle,List of diseases detected on the field. When selected it'll automatically add a list of tasks to deal with the disease ,ລາຍຊື່ຂອງພະຍາດທີ່ພົບໃນພາກສະຫນາມ. ເມື່ອເລືອກແລ້ວມັນຈະເພີ່ມບັນຊີລາຍຊື່ຂອງວຽກເພື່ອຈັດການກັບພະຍາດ
 apps/erpnext/erpnext/manufacturing/page/bom_comparison_tool/bom_comparison_tool.js,BOM 1,BOM 1
+apps/erpnext/erpnext/assets/report/fixed_asset_register/fixed_asset_register.py,Asset Id,Id ຊັບສິນ
 apps/erpnext/erpnext/healthcare/doctype/healthcare_service_unit/healthcare_service_unit.js,This is a root healthcare service unit and cannot be edited.,ນີ້ແມ່ນຫນ່ວຍບໍລິການສຸຂະພາບຮາກແລະບໍ່ສາມາດແກ້ໄຂໄດ້.
 DocType: Asset Repair,Repair Status,Repair Status
 apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.js,"Requested Qty: Quantity requested for purchase, but not ordered.","Qty ທີ່ຖືກຮ້ອງຂໍ: ຈຳ ນວນທີ່ຕ້ອງການຊື້, ແຕ່ບໍ່ໄດ້ສັ່ງ."
diff --git a/erpnext/translations/lt.csv b/erpnext/translations/lt.csv
index c914280..90776f1 100644
--- a/erpnext/translations/lt.csv
+++ b/erpnext/translations/lt.csv
@@ -289,7 +289,6 @@
 DocType: Loan,Repay Over Number of Periods,Grąžinti Over periodų skaičius
 apps/erpnext/erpnext/manufacturing/report/bom_stock_report/bom_stock_report.py,Quantity to Produce can not be less than Zero,Produkcijos kiekis negali būti mažesnis už nulį
 DocType: Stock Entry,Additional Costs,Papildomos išlaidos
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Customer &gt; Customer Group &gt; Territory,Klientas&gt; Klientų grupė&gt; Teritorija
 apps/erpnext/erpnext/accounts/doctype/account/account.py,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
@@ -587,6 +586,7 @@
 DocType: Healthcare Settings,Create documents for sample collection,Sukurkite dokumentus pavyzdžių rinkimui
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py,Payment against {0} {1} cannot be greater than Outstanding Amount {2},Mokėjimo prieš {0} {1} negali būti didesnis nei nesumokėtos sumos {2}
 apps/erpnext/erpnext/patches/v11_0/add_healthcare_service_unit_tree_root.py,All Healthcare Service Units,Visi sveikatos priežiūros tarnybos vienetai
+apps/erpnext/erpnext/setup/default_energy_point_rules.py,On Converting Opportunity,Apie galimybės konvertavimą
 DocType: Bank Account,Address HTML,adresas HTML
 DocType: Lead,Mobile No.,Mobilus Ne
 apps/erpnext/erpnext/selling/doctype/pos_closing_voucher/closing_voucher_details.html,Mode of Payments,Mokėjimų būdas
@@ -651,7 +651,6 @@
 DocType: Accounting Dimension,Dimension Name,Matmens pavadinimas
 apps/erpnext/erpnext/healthcare/setup.py,Resistant,Atsparus
 apps/erpnext/erpnext/hotels/doctype/hotel_room_reservation/hotel_room_reservation.py,Please set Hotel Room Rate on {},Prašome nustatyti viešbučio kambario kainą už ()
-apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py,Please setup numbering series for Attendance via Setup &gt; Numbering Series,Prašome nustatyti numeracijos serijas lankymui per sąranką&gt; Numeravimo serijos
 DocType: Journal Entry,Multi Currency,Daugiafunkciniai Valiuta
 DocType: Bank Statement Transaction Invoice Item,Invoice Type,Sąskaitos faktūros tipas
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py,Valid from date must be less than valid upto date,"Galioja nuo datos, turi būti mažesnė už galiojančią datą"
@@ -769,6 +768,7 @@
 apps/erpnext/erpnext/accounts/page/pos/pos.js,Create a new Customer,Sukurti naują klientų
 apps/erpnext/erpnext/non_profit/report/expiring_memberships/expiring_memberships.py,Expiring On,Pabaiga
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,"If multiple Pricing Rules continue to prevail, users are asked to set Priority manually to resolve conflict.","Jei ir toliau vyrauja daug kainodaros taisyklės, vartotojai, prašoma, kad prioritetas rankiniu būdu išspręsti konfliktą."
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js,Purchase Return,pirkimo Grįžti
 apps/erpnext/erpnext/utilities/activation.py,Create Purchase Orders,Sukurti Pirkimų užsakymus
 ,Purchase Register,pirkimo Registruotis
 apps/erpnext/erpnext/healthcare/doctype/patient/patient.py,Patient not found,Pacientas nerastas
@@ -784,7 +784,6 @@
 DocType: Location,Area UOM,Plotas UOM
 apps/erpnext/erpnext/manufacturing/doctype/workstation/workstation.py,Workstation is closed on the following dates as per Holiday List: {0},"Kompiuterizuotos darbo vietos yra uždarytas šių datų, kaip už Atostogų sąrašas: {0}"
 apps/erpnext/erpnext/selling/page/sales_funnel/sales_funnel.py,Opportunities,galimybės
-apps/erpnext/erpnext/www/all-products/index.html,Clear filters,Išvalyti filtrus
 DocType: Lab Test Template,Single,vienas
 DocType: Compensatory Leave Request,Work From Date,Darbas nuo datos
 DocType: Salary Slip,Total Loan Repayment,Viso paskolų grąžinimas
@@ -828,6 +827,7 @@
 apps/erpnext/erpnext/education/doctype/program_enrollment_tool/program_enrollment_tool.py,Mandatory field - Academic Year,Privalomas laukas - akademiniai metai
 apps/erpnext/erpnext/education/doctype/program_enrollment_tool/program_enrollment_tool.py,Mandatory field - Academic Year,Privalomas laukas - akademiniai metai
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py,{0} {1} is not associated with {2} {3},{0} {1} nėra susietas su {2} {3}
+DocType: Opportunity,Converted By,Pavertė
 apps/erpnext/erpnext/public/js/hub/components/ReviewArea.vue,You need to login as a Marketplace User before you can add any reviews.,"Kad galėtumėte pridėti apžvalgas, turite prisijungti kaip prekyvietės vartotojas."
 apps/erpnext/erpnext/manufacturing/doctype/job_card/job_card.py,Row {0} : Operation is required against the raw material item {1},Eilutė {0}: reikalingas veiksmas prieš žaliavos elementą {1}
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py,Please set default payable account for the company {0},Prašome nustatyti numatytąją mokėtiną sąskaitos už bendrovės {0}
@@ -854,6 +854,8 @@
 DocType: Sales Invoice,Total Qty,viso Kiekis
 apps/erpnext/erpnext/education/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py,Guardian2 Email ID,Guardian2 E-mail ID
 apps/erpnext/erpnext/education/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py,Guardian2 Email ID,Guardian2 E-mail ID
+apps/erpnext/erpnext/hr/doctype/employee_transfer/employee_transfer.py,"Please delete the Employee <a href=""#Form/Employee/{0}"">{0}</a>\
+					to cancel this document","Ištrinkite darbuotoją <a href=""#Form/Employee/{0}"">{0}</a> \, kad galėtumėte atšaukti šį dokumentą"
 DocType: Item,Show in Website (Variant),Rodyti svetainė (variantas)
 DocType: Employee,Health Concerns,sveikatos problemas
 DocType: Payroll Entry,Select Payroll Period,Pasirinkite Darbo užmokesčio laikotarpis
@@ -913,7 +915,6 @@
 DocType: Codification Table,Codification Table,Kodifikavimo lentelė
 DocType: Timesheet Detail,Hrs,Valandos
 apps/erpnext/erpnext/manufacturing/page/bom_comparison_tool/bom_comparison_tool.js,Changes in {0},{0} pokyčiai
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js,Please select Company,Prašome pasirinkti kompaniją
 DocType: Employee Skill,Employee Skill,Darbuotojų įgūdžiai
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.js,Difference Account,skirtumas paskyra
 DocType: Pricing Rule,Discount on Other Item,Nuolaida kitai prekei
@@ -982,6 +983,7 @@
 DocType: BOM,Operating Cost,Operacinė Kaina
 DocType: Crop,Produced Items,Pagaminti daiktai
 DocType: Bank Statement Transaction Entry,Match Transaction to Invoices,Derinti operaciją su sąskaitomis faktūromis
+apps/erpnext/erpnext/erpnext_integrations/exotel_integration.py,Error in Exotel incoming call,Klaida įeinant į „Exotel“ skambutį
 DocType: Sales Order Item,Gross Profit,Bendrasis pelnas
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js,Unblock Invoice,Atblokuoti sąskaitą faktūrą
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py,Increment cannot be 0,"Prieaugis negali būti 0,"
@@ -1197,6 +1199,7 @@
 DocType: Activity Cost,Activity Type,veiklos rūšis
 DocType: Request for Quotation,For individual supplier,Dėl individualaus tiekėjo
 DocType: BOM Operation,Base Hour Rate(Company Currency),Bazinė valandą greičiu (Įmonės valiuta)
+,Qty To Be Billed,Kiekis turi būti apmokestintas
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py,Delivered Amount,Paskelbta suma
 apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.js,Reserved Qty for Production: Raw materials quantity to make manufacturing items.,Gamybinis kiekis: Žaliavų kiekis gaminant gaminius.
 DocType: Loyalty Point Entry Redemption,Redemption Date,Išpirkimo data
@@ -1318,7 +1321,7 @@
 apps/erpnext/erpnext/education/doctype/student_group/student_group.py,Please select Program,Prašome pasirinkti programą
 apps/erpnext/erpnext/education/doctype/student_group/student_group.py,Please select Program,Prašome pasirinkti programą
 DocType: Project,Estimated Cost,Numatoma kaina
-DocType: Request for Quotation,Link to material requests,Nuoroda į materialinių prašymus
+DocType: Supplier Quotation,Link to material requests,Nuoroda į materialinių prašymus
 apps/erpnext/erpnext/public/js/hub/pages/Publish.vue,Publish,Paskelbti
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py,Aerospace,Aviacija
 ,Fichier des Ecritures Comptables [FEC],Fichier des Ecritures Comptables [FEC]
@@ -1331,6 +1334,7 @@
 apps/erpnext/erpnext/utilities/transaction_base.py,Invalid Posting Time,Neteisingas skelbimo laikas
 DocType: Salary Component,Condition and Formula,Būklė ir formulė
 DocType: Lead,Campaign Name,Kampanijos pavadinimas
+apps/erpnext/erpnext/setup/default_energy_point_rules.py,On Task Completion,Įvykdžius užduotį
 apps/erpnext/erpnext/hr/doctype/compensatory_leave_request/compensatory_leave_request.py,There is no leave period in between {0} and {1},Tarp {0} ir {1} nėra atostogų laikotarpio.
 DocType: Fee Validity,Healthcare Practitioner,Sveikatos priežiūros specialistas
 DocType: Hotel Room,Capacity,Talpa
@@ -1676,7 +1680,6 @@
 DocType: Quality Feedback Template,Quality Feedback Template,Kokybės atsiliepimų šablonas
 apps/erpnext/erpnext/config/education.py,LMS Activity,LMS veikla
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py,Internet Publishing,Interneto leidyba
-DocType: Prescription Duration,Number,Numeris
 apps/erpnext/erpnext/accounts/doctype/opening_invoice_creation_tool/opening_invoice_creation_tool.js,Creating {0} Invoice,Kuriama {0} sąskaita faktūra
 DocType: Medical Code,Medical Code Standard,Medicinos kodekso standartas
 DocType: Soil Texture,Clay Composition (%),Molio sudėtis (%)
@@ -1751,6 +1754,7 @@
 DocType: Support Settings,Get Started Sections,Pradėti skyrių
 DocType: Lead,CRM-LEAD-.YYYY.-,CRM-LEAD-.YYYY.-
 DocType: Invoice Discounting,Sanctioned,sankcijos
+,Base Amount,Bazinė suma
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.js,Total Contribution Amount: {0},Bendra įnašo suma: {0}
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py,Row #{0}: Please specify Serial No for Item {1},Eilutės # {0}: Prašome nurodyti Serijos Nr už prekę {1}
 DocType: Payroll Entry,Salary Slips Submitted,Pateiktos atlyginimų lentelės
@@ -1973,6 +1977,7 @@
 DocType: Accounting Dimension,Dimension Defaults,Numatytieji matmenys
 apps/erpnext/erpnext/crm/report/prospects_engaged_but_not_converted/prospects_engaged_but_not_converted.js,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,Minimum Lead Age (Days),Minimalus Švinas Amžius (dienomis)
+apps/erpnext/erpnext/assets/report/fixed_asset_register/fixed_asset_register.py,Available For Use Date,Galima naudoti data
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py,All BOMs,Visi BOMs
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js,Create Inter Company Journal Entry,Sukurkite „Inter Company“ žurnalo įrašą
 DocType: Company,Parent Company,Motininė kompanija
@@ -2037,6 +2042,7 @@
 ,IRS 1099,IRS 1099
 DocType: Salary Slip,Leave Without Pay,Palikite be darbo užmokesčio
 DocType: Payment Request,Outward,Išvykimas
+apps/erpnext/erpnext/setup/default_energy_point_rules.py,On {0} Creation,Apie {0} kūrimą
 apps/erpnext/erpnext/regional/doctype/gstr_3b_report/gstr_3b_report.html,State/UT Tax,Valstybinis / UT mokestis
 ,Trial Balance for Party,Bandomoji likutis partijos
 ,Gross and Net Profit Report,Bendrojo ir grynojo pelno ataskaita
@@ -2155,6 +2161,7 @@
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js,Make Stock Entry,Padaryti akcijų įrašą
 DocType: Hotel Room Reservation,Hotel Reservation User,Viešbučių rezervavimo vartotojas
 apps/erpnext/erpnext/projects/doctype/project/project.js,Set Status,Nustatyti būseną
+apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py,Please setup numbering series for Attendance via Setup &gt; Numbering Series,Prašome nustatyti numeracijos serijas lankymui per sąranką&gt; Numeravimo serijos
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py,Please select prefix first,Prašome pasirinkti prefiksą pirmas
 DocType: Contract,Fulfilment Deadline,Įvykdymo terminas
 apps/erpnext/erpnext/public/js/hub/pages/Home.vue,Near you,Šalia jūsų
@@ -2170,6 +2177,7 @@
 DocType: Announcement,All Students,Visi studentai
 apps/erpnext/erpnext/assets/doctype/asset/asset.py,Item {0} must be a non-stock item,Prekė {0} turi būti ne akcijų punktas
 apps/erpnext/erpnext/stock/doctype/batch/batch.js,View Ledger,Peržiūrėti Ledgeris
+DocType: Cost Center,Lft,LFT
 DocType: Grading Scale,Intervals,intervalai
 DocType: Bank Statement Transaction Entry,Reconciled Transactions,Suderinti sandoriai
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py,Earliest,Seniausi
@@ -2285,6 +2293,7 @@
 apps/erpnext/erpnext/hr/doctype/employee_benefit_application/employee_benefit_application.py,As per your assigned Salary Structure you cannot apply for benefits,Pagal jūsų paskirtą darbo užmokesčio struktūrą negalite kreiptis dėl išmokų
 apps/erpnext/erpnext/stock/doctype/item/item.py,Website Image should be a public file or website URL,Interneto svetainė Paveikslėlis turėtų būti valstybės failą ar svetainės URL
 DocType: Purchase Invoice Item,BOM,BOM
+apps/erpnext/erpnext/stock/doctype/item/item.py,Duplicate entry in Manufacturers table,Pakartotinis įrašas lentelėje Gamintojai
 apps/erpnext/erpnext/setup/doctype/item_group/item_group.js,This is a root item group and cannot be edited.,Tai yra šaknis punktas grupė ir negali būti pakeisti.
 apps/erpnext/erpnext/accounts/doctype/account/account.js,Merge,Sujungti
 DocType: Journal Entry Account,Purchase Order,Pirkimo užsakymas
@@ -2431,7 +2440,6 @@
 DocType: Asset,Depreciation Schedules,nusidėvėjimo Tvarkaraščiai
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.js,Create Sales Invoice,Sukurkite pardavimo sąskaitą
 apps/erpnext/erpnext/regional/doctype/gstr_3b_report/gstr_3b_report.html,Ineligible ITC,Netinkamas ITC
-apps/erpnext/erpnext/erpnext_integrations/doctype/shopify_settings/shopify_settings.py,"Support for public app is deprecated. Please setup private app, for more details refer user manual","Parama viešajai programai nebeteikiama. Prašome konfigūruoti privačią programą, norėdami sužinoti daugiau, skaitykite vartotojo vadovą"
 DocType: Task,Dependent Tasks,Priklausomos užduotys
 apps/erpnext/erpnext/regional/report/gstr_1/gstr_1.py,Following accounts might be selected in GST Settings:,GST nustatymuose gali būti parinktos šios paskyros:
 apps/erpnext/erpnext/manufacturing/report/bom_stock_report/bom_stock_report.js,Quantity to Produce,Pagaminamas kiekis
@@ -2683,6 +2691,7 @@
 DocType: Water Analysis,Container,Konteineris
 apps/erpnext/erpnext/regional/report/gstr_1/gstr_1.py,Please set valid GSTIN No. in Company Address,Nurodykite galiojantį GSTIN Nr. Įmonės adresą
 apps/erpnext/erpnext/education/utils.py,Student {0} - {1} appears Multiple times in row {2} & {3},Studentų {0} - {1} pasirodo kelis kartus iš eilės {2} ir {3}
+apps/erpnext/erpnext/selling/doctype/customer/customer.py,Following fields are mandatory to create address:,Šie laukai yra privalomi kuriant adresą:
 DocType: Item Alternative,Two-way,Dvipusis
 DocType: Item,Manufacturers,Gamintojai
 apps/erpnext/erpnext/accounts/deferred_revenue.py,Error while processing deferred accounting for {0},Apdorojant atidėtą {0} apskaitą įvyko klaida
@@ -2758,9 +2767,9 @@
 DocType: Employee,HR-EMP-,HR-EMP-
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py,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: Quality Meeting Minutes,Quality Meeting Minutes,Kokybės susitikimo protokolas
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Supplier &gt; Supplier Type,Tiekėjas&gt; Tiekėjo tipas
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py,Employee Referral,Darbuotojo kreipimasis
 DocType: Student Group,Set 0 for no limit,Nustatykite 0 jokios ribos
+DocType: Cost Center,rgt,RGT
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py,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ų."
 DocType: Customer,Primary Address and Contact Detail,Pirminis adresas ir kontaktiniai duomenys
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.js,Resend Payment Email,Persiųsti Mokėjimo paštu
@@ -2868,7 +2877,6 @@
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py,Against Supplier Invoice {0} dated {1},Prieš tiekėjo sąskaitoje {0} data {1}
 DocType: Customer,Default Price List,Numatytasis Kainų sąrašas
 apps/erpnext/erpnext/assets/doctype/asset/asset.py,Asset Movement record {0} created,Turto Judėjimo įrašas {0} sukūrė
-apps/erpnext/erpnext/utilities/page/leaderboard/leaderboard.js,No items found.,Nerasta daiktų.
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py,You cannot delete Fiscal Year {0}. Fiscal Year {0} is set as default in Global Settings,Jūs negalite trinti finansiniai metai {0}. Finansiniai metai {0} yra numatytoji Global Settings
 DocType: Share Transfer,Equity/Liability Account,Nuosavybės / atsakomybės sąskaita
 apps/erpnext/erpnext/setup/doctype/customer_group/customer_group.py,A customer with the same name already exists,Klientas tokiu pačiu vardu jau yra
@@ -2884,6 +2892,7 @@
 apps/erpnext/erpnext/selling/doctype/customer/customer.py,Credit limit has been crossed for customer {0} ({1}/{2}),Kredito limitas buvo perkeltas klientui {0} ({1} / {2})
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py,Customer required for 'Customerwise Discount',Klientų reikalinga &quot;Customerwise nuolaidų&quot;
 apps/erpnext/erpnext/config/accounting.py,Update bank payment dates with journals.,Atnaujinkite banko mokėjimo datos ir žurnaluose.
+,Billed Qty,Apmokėtas kiekis
 apps/erpnext/erpnext/stock/doctype/item/item_dashboard.py,Pricing,Kainos
 DocType: Employee,Attendance Device ID (Biometric/RF tag ID),Lankomumo įrenginio ID (biometrinis / RF žymos ID)
 DocType: Quotation,Term Details,Terminuoti detalės
@@ -2907,6 +2916,7 @@
 DocType: Share Transfer,Asset Account,Turto sąskaita
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js,New release date should be in the future,Nauja išleidimo data turėtų būti ateityje
 DocType: Purchase Invoice,End date of current invoice's period,Pabaigos data einamųjų sąskaitos faktūros laikotarpį
+apps/erpnext/erpnext/hr/doctype/employee/employee.py,Please setup Employee Naming System in Human Resource &gt; HR Settings,Prašome nustatyti darbuotojų įvardijimo sistemą skyriuje Žmogiškieji ištekliai&gt; HR nustatymai
 DocType: Lab Test,Technician Name,Technikos vardas
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py,"Cannot ensure delivery by Serial No as \
 					Item {0} is added with and without Ensure Delivery by \
@@ -2914,6 +2924,7 @@
 DocType: Accounts Settings,Unlink Payment on Cancellation of Invoice,Atsieti Apmokėjimas atšaukimas sąskaita faktūra
 DocType: Bank Reconciliation,From Date,nuo data
 apps/erpnext/erpnext/hr/doctype/vehicle_log/vehicle_log.py,Current Odometer reading entered should be greater than initial Vehicle Odometer {0},Dabartinis Odometro skaitymo įvesta turėtų būti didesnis nei pradinis transporto priemonės hodometro {0}
+,Purchase Order Items To Be Received or Billed,"Pirkimo užsakymo elementai, kuriuos reikia gauti ar išrašyti"
 DocType: Restaurant Reservation,No Show,Nr šou
 apps/erpnext/erpnext/regional/india/utils.py,You must be a registered supplier to generate e-Way Bill,"Norėdami sugeneruoti e-Way sąskaitą, turite būti registruotas tiekėjas"
 DocType: Shipping Rule Country,Shipping Rule Country,Pristatymas taisyklė Šalis
@@ -2956,6 +2967,7 @@
 apps/erpnext/erpnext/templates/generators/item/item_add_to_cart.html,View in Cart,Žiūrėti krepšelį
 DocType: Employee Checkin,Shift Actual Start,„Shift“ faktinė pradžia
 DocType: Tally Migration,Is Day Book Data Imported,Ar dienos knygos duomenys importuoti
+,Purchase Order Items To Be Received or Billed1,"Pirkimo užsakymo elementai, kuriuos reikia gauti ar už kuriuos reikia sumokėti1"
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py,Marketing Expenses,rinkodaros išlaidos
 apps/erpnext/erpnext/stock/doctype/pick_list/pick_list.py,{0} units of {1} is not available.,{0} {1} vienetų nėra.
 ,Item Shortage Report,Prekė trūkumas ataskaita
@@ -3327,6 +3339,7 @@
 ,Campaign Efficiency,Kampanijos efektyvumas
 ,Campaign Efficiency,Kampanijos efektyvumas
 DocType: Discussion,Discussion,Diskusija
+apps/erpnext/erpnext/setup/default_energy_point_rules.py,On Sales Order Submission,Pateikus pardavimo užsakymą
 DocType: Bank Transaction,Transaction ID,sandorio ID
 DocType: Payroll Entry,Deduct Tax For Unsubmitted Tax Exemption Proof,Išskyrus mokesčius už neapmokestinamojo mokesčio išimties įrodymą
 DocType: Volunteer,Anytime,Anytime
@@ -3334,7 +3347,6 @@
 DocType: Employee Tax Exemption Proof Submission,Employee Tax Exemption Proof Submission,Darbuotojų atleidimo nuo mokesčio įrodymas pateikimas
 DocType: Patient,Surgical History,Chirurginė istorija
 DocType: Bank Statement Settings Item,Mapped Header,Mape Header
-apps/erpnext/erpnext/hr/doctype/employee/employee.py,Please setup Employee Naming System in Human Resource &gt; HR Settings,Prašome nustatyti darbuotojų įvardijimo sistemą skyriuje Žmogiškieji ištekliai&gt; HR nustatymai
 DocType: Employee,Resignation Letter Date,Atsistatydinimas raštas data
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Pricing Rules are further filtered based on quantity.,Kainodaros taisyklės yra toliau filtruojamas remiantis kiekį.
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py,Please set the Date Of Joining for employee {0},Prašome nustatykite data Prisijungimas darbuotojo {0}
@@ -3349,6 +3361,7 @@
 DocType: Bank Statement Settings,Mapped Items,Priskirti elementai
 DocType: Amazon MWS Settings,IT,IT
 DocType: Chapter,Chapter,Skyrius
+,Fixed Asset Register,Ilgalaikio turto registras
 apps/erpnext/erpnext/utilities/user_progress.py,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,Select BOM and Qty for Production,Pasirinkite BOM ir Kiekis dėl gamybos
@@ -3484,7 +3497,6 @@
 apps/erpnext/erpnext/templates/emails/reorder_item.html,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
 apps/erpnext/erpnext/controllers/accounts_controller.py,Account {0} is invalid. Account Currency must be {1},Sąskaita {0} yra neteisinga. Sąskaitos valiuta turi būti {1}
 apps/erpnext/erpnext/hr/doctype/salary_structure_assignment/salary_structure_assignment.py,From Date {0} cannot be after employee's relieving Date {1},Nuo datos {0} negali būti po darbuotojo atleidimo data {1}
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py,Debit Note {0} has been created automatically,Debeto pastaba {0} buvo sukurta automatiškai
 apps/erpnext/erpnext/accounts/doctype/payment_order/payment_order.js,Create Payment Entries,Sukurkite mokėjimo įrašus
 DocType: Supplier,Is Internal Supplier,Ar yra vidinis tiekėjas
 DocType: Employee,Create User Permission,Sukurti vartotojo leidimą
@@ -4047,7 +4059,6 @@
 DocType: Project User,Project Status,projekto statusas
 DocType: UOM,Check this to disallow fractions. (for Nos),Pažymėkite tai norėdami atmesti frakcijas. (Už Nr)
 DocType: Student Admission Program,Naming Series (for Student Applicant),Pavadinimų serija (Studentų pareiškėjas)
-apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.py,UOM Conversion factor ({0} -&gt; {1}) not found for item: {2},UOM konversijos koeficientas ({0} -&gt; {1}) nerastas elementui: {2}
 apps/erpnext/erpnext/hr/doctype/retention_bonus/retention_bonus.py,Bonus Payment Date cannot be a past date,Premijos mokėjimo data negali būti ankstesnė data
 DocType: Travel Request,Copy of Invitation/Announcement,Kvietimo / skelbimo kopija
 DocType: Practitioner Service Unit Schedule,Practitioner Service Unit Schedule,Praktikos tarnybos tarnybų tvarkaraštis
@@ -4196,6 +4207,7 @@
 apps/erpnext/erpnext/utilities/user_progress.py,Setup Company,Sąrankos kompanija
 ,Lab Test Report,Lab testo ataskaita
 DocType: Employee Benefit Application,Employee Benefit Application,Darbuotojų išmokų prašymas
+apps/erpnext/erpnext/accounts/doctype/invoice_discounting/invoice_discounting.py,Row({0}): {1} is already discounted in {2},Eilutė ({0}): {1} jau diskontuojamas {2}
 apps/erpnext/erpnext/hr/doctype/additional_salary/additional_salary.py,Additional Salary Component Exists.,Papildomas atlyginimo komponentas egzistuoja.
 DocType: Purchase Invoice,Unregistered,Neregistruota
 DocType: Student Applicant,Application Date,paraiškos pateikimo datos
@@ -4275,7 +4287,6 @@
 DocType: Journal Entry,Accounting Entries,apskaitos įrašai
 DocType: Job Card Time Log,Job Card Time Log,Darbo kortelės laiko žurnalas
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,"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;."
-apps/erpnext/erpnext/education/doctype/instructor/instructor.py,Please setup Instructor Naming System in Education &gt; Education Settings,Prašome įdiegti instruktoriaus pavadinimo sistemą švietime&gt; Švietimo nustatymai
 DocType: Journal Entry,Paid Loan,Mokama paskola
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py,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
@@ -4292,7 +4303,6 @@
 apps/erpnext/erpnext/templates/pages/projects.html,No time sheets,Nėra darbo laiko apskaitos žiniaraščiai
 DocType: GoCardless Mandate,GoCardless Customer,&quot;GoCardless&quot; klientas
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py,Leave Type {0} cannot be carry-forwarded,"Palikite tipas {0}, negali būti atlikti, perduodami"
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Item Code &gt; Item Group &gt; Brand,Prekės kodas&gt; Prekių grupė&gt; Prekės ženklas
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py,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
 DocType: Leave Encashment,Payroll,Darbo užmokesčio
@@ -4408,7 +4418,6 @@
 DocType: Stock Ledger Entry,Actual Qty After Transaction,Tikrasis Kiekis Po Sandorio
 ,Pending SO Items For Purchase Request,Kol SO daiktai įsigyti Užsisakyti
 apps/erpnext/erpnext/education/doctype/student_admission/student_admission.py,Student Admissions,studentų Priėmimo
-apps/erpnext/erpnext/accounts/party.py,{0} {1} is disabled,{0} {1} yra išjungtas
 DocType: Supplier,Billing Currency,atsiskaitymo Valiuta
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py,Extra Large,Labai didelis
 DocType: Loan,Loan Application,Paskolos taikymas
@@ -4485,7 +4494,6 @@
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py,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/accounts/doctype/accounting_dimension/accounting_dimension.py,Creating Dimensions...,Kuriami aspektai ...
 apps/erpnext/erpnext/education/doctype/student_group_creation_tool/student_group_creation_tool.py,Student Group Name is mandatory in row {0},Studentų grupės pavadinimas yra privalomas eilės {0}
-DocType: Customer Credit Limit,Bypass credit limit_check,Apeiti kredito limitą
 DocType: Homepage,Products to be shown on website homepage,Produktai turi būti rodomas svetainės puslapyje
 DocType: HR Settings,Password Policy,Slaptažodžio politika
 apps/erpnext/erpnext/setup/doctype/customer_group/customer_group.js,This is a root customer group and cannot be edited.,Tai yra šaknis klientas grupė ir negali būti pakeisti.
@@ -5078,6 +5086,7 @@
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py,No {0} found for Inter Company Transactions.,Nebuvo nustatyta {0} &quot;Inter&quot; kompanijos sandoriams.
 DocType: Travel Itinerary,Rented Car,Išnuomotas automobilis
 apps/erpnext/erpnext/public/js/hub/components/profile_dialog.js,About your Company,Apie jūsų įmonę
+apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.js,Show Stock Ageing Data,Rodyti atsargų senėjimo duomenis
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py,Credit To account must be a Balance Sheet account,Kreditas sąskaitos turi būti balansas sąskaitos
 DocType: Donor,Donor,Donoras
 DocType: Global Defaults,Disable In Words,Išjungti žodžiais
@@ -5092,8 +5101,10 @@
 DocType: Practitioner Schedule,Schedule Name,Tvarkaraščio pavadinimas
 apps/erpnext/erpnext/regional/doctype/gstr_3b_report/gstr_3b_report.py,Please enter GSTIN and state for the Company Address {0},Įveskite GSTIN ir nurodykite įmonės adresą {0}
 DocType: Currency Exchange,For Buying,Pirkimas
+apps/erpnext/erpnext/setup/default_energy_point_rules.py,On Purchase Order Submission,Pateikiant pirkimo užsakymą
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js,Add All Suppliers,Pridėti visus tiekėjus
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py,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/accounts/doctype/pricing_rule/pricing_rule.js,Customer &gt; Customer Group &gt; Territory,Klientas&gt; Klientų grupė&gt; Teritorija
 DocType: Tally Migration,Parties,Vakarėliai
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js,Browse BOM,Žmonės BOM
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py,Secured Loans,užtikrintos paskolos
@@ -5125,6 +5136,7 @@
 apps/erpnext/erpnext/stock/doctype/item_alternative/item_alternative.py,Not allow to set alternative item for the item {0},Neleisti nustatyti kito elemento elementui {0}
 apps/erpnext/erpnext/hr/doctype/leave_block_list/leave_block_list.py,Date is repeated,Data kartojamas
 apps/erpnext/erpnext/accounts/print_format/payment_receipt_voucher/payment_receipt_voucher.html,Authorized Signatory,Įgaliotas signataras
+apps/erpnext/erpnext/education/doctype/instructor/instructor.py,Please setup Instructor Naming System in Education &gt; Education Settings,Prašome įdiegti instruktoriaus pavadinimo sistemą švietime&gt; Švietimo nustatymai
 apps/erpnext/erpnext/regional/doctype/gstr_3b_report/gstr_3b_report.html,Net ITC Available(A) - (B),Galimas grynasis ITC (A) - (B)
 apps/erpnext/erpnext/education/doctype/fee_schedule/fee_schedule.js,Create Fees,Sukurkite mokesčius
 DocType: Project,Total Purchase Cost (via Purchase Invoice),Viso įsigijimo savikainą (per pirkimo sąskaitoje faktūroje)
@@ -5145,6 +5157,7 @@
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.js,Message Sent,Žinutė išsiųsta
 apps/erpnext/erpnext/accounts/doctype/account/account.py,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/assets/report/fixed_asset_register/fixed_asset_register.py,Vendor Name,Pardavėjo vardas
 DocType: Quiz Result,Wrong,Neteisinga
 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)
@@ -5389,6 +5402,7 @@
 DocType: Stock Settings,Auto Material Request,Auto Medžiaga Prašymas
 DocType: Woocommerce Settings,API consumer secret,API vartotojo paslaptis
 DocType: Delivery Note Item,Available Batch Qty at From Warehouse,Turimas Serija Kiekis ne iš sandėlio
+,Received Qty Amount,Gauta Kiekis Kiekis
 DocType: Salary Slip,Gross Pay - Total Deduction - Loan Repayment,Pilna darbo užmokestis - Iš viso išskaičiavimas - Paskolų grąžinimas
 DocType: Bank Account,Last Integration Date,Paskutinė integracijos data
 DocType: Expense Claim,Expense Taxes and Charges,Išlaidų mokesčiai ir rinkliavos
@@ -5852,6 +5866,8 @@
 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,Please select Qty against item {0},Pasirinkite kiekį prieš elementą {0}
+apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py,Latest Age,Naujausias amžius
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js,Transfer Material to Supplier,Perduoti medžiagą tiekėjui
 apps/erpnext/erpnext/hr/report/loan_repayment/loan_repayment.py,EMI,EMI
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py,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
@@ -5875,7 +5891,6 @@
 apps/erpnext/erpnext/hr/doctype/employee_benefit_application/employee_benefit_application.py,"An amount of {0} already claimed for the component {1},\
 						 set the amount equal or greater than {2}","{0} suma, kurią jau reikalaujama dėl komponento {1}, \ nustatyti sumą, lygią arba didesnę nei {2}"
 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
 DocType: BOM Update Tool,The new BOM after replacement,Naujas BOM po pakeitimo
 ,Point of Sale,Pardavimo punktas
@@ -5997,7 +6012,6 @@
 DocType: Purchase Order Item,Blanket Order Rate,Antklodžių užsakymų norma
 ,Customer Ledger Summary,Kliento knygos suvestinė
 apps/erpnext/erpnext/hooks.py,Certification,Sertifikavimas
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js,Are you sure you want to make debit note?,Ar tikrai norite padaryti debeto raštelį?
 DocType: Bank Guarantee,Clauses and Conditions,Taisyklės ir sąlygos
 DocType: Serial No,Creation Document Type,Kūrimas Dokumento tipas
 DocType: Amazon MWS Settings,ES,ES
@@ -6035,8 +6049,6 @@
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py,Financial Services,Finansinės paslaugos
 DocType: Student Sibling,Student ID,Studento pažymėjimas
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.js,For Quantity must be greater than zero,Kiekis turi būti didesnis už nulį
-apps/erpnext/erpnext/hr/doctype/employee_transfer/employee_transfer.py,"Please delete the Employee <a href=""#Form/Employee/{0}"">{0}</a>\
-					to cancel this document","Ištrinkite darbuotoją <a href=""#Form/Employee/{0}"">{0}</a> \, kad galėtumėte atšaukti šį dokumentą"
 apps/erpnext/erpnext/config/projects.py,Types of activities for Time Logs,Veiklos rūšys Time Įrašai
 DocType: Opening Invoice Creation Tool,Sales,pardavimų
 DocType: Stock Entry Detail,Basic Amount,bazinis dydis
@@ -6115,6 +6127,7 @@
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py,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,Send Supplier Emails,Siųsti Tiekėjo laiškus
+DocType: Asset Movement,ACC-ASM-.YYYY.-,ACC-ASM -YYYY.-
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py,"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
 apps/erpnext/erpnext/hr/doctype/employee_onboarding/employee_onboarding.py,Submit this to create the Employee record,"Pateikite šį, kad sukurtumėte Darbuotojo įrašą"
@@ -6195,7 +6208,6 @@
 DocType: Sales Team,Contact No.,Kontaktinė Nr
 apps/erpnext/erpnext/templates/includes/cart/cart_address.html,Billing Address is same as Shipping Address,Atsiskaitymo adresas sutampa su pristatymo adresu
 DocType: Bank Reconciliation,Payment Entries,Apmokėjimo įrašai
-apps/erpnext/erpnext/erpnext_integrations/doctype/shopify_settings/shopify_settings.py,Access token or Shopify URL missing,Trūksta prieigos raktų arba &quot;Shopify&quot; URL
 DocType: Location,Latitude,Platuma
 DocType: Work Order,Scrap Warehouse,laužas sandėlis
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py,"Warehouse required at Row No {0}, please set default warehouse for the item {1} for the company {2}","Sandėlis būtinas eilutėje {0}, nustatykite numatytą {1} prekės sandėlį įmonei {2}"
@@ -6240,7 +6252,6 @@
 DocType: Job Offer Term,Value / Description,Vertė / Aprašymas
 apps/erpnext/erpnext/controllers/accounts_controller.py,"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
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js,Are you sure you want to make credit note?,Ar tikrai norite sudaryti kredito pažymą?
 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,Debit and Credit not equal for {0} #{1}. Difference is {2}.,Debeto ir kredito nėra vienoda {0} # {1}. Skirtumas yra {2}.
@@ -6365,6 +6376,7 @@
 DocType: Purchase Invoice,Taxes and Charges Added,Mokesčiai ir rinkliavos Pridėta
 apps/erpnext/erpnext/assets/doctype/asset/asset.py,Depreciation Row {0}: Next Depreciation Date cannot be before Available-for-use Date,Nusidėvėjimo eilutė {0}: tolimesnė nusidėvėjimo data negali būti ankstesnė. Galima naudoti data
 ,Sales Funnel,pardavimų piltuvas
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Item Code &gt; Item Group &gt; Brand,Prekės kodas&gt; Prekių grupė&gt; Prekės ženklas
 apps/erpnext/erpnext/setup/doctype/company/company.py,Abbreviation is mandatory,Santrumpa yra privaloma
 DocType: Project,Task Progress,užduotis pažanga
 apps/erpnext/erpnext/templates/includes/navbar/navbar_items.html,Cart,krepšelis
@@ -6609,6 +6621,7 @@
 DocType: Employee Grade,Employee Grade,Darbuotojų vertinimas
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py,Piecework,vienetinį
 DocType: GSTR 3B Report,June,Birželio mėn
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Supplier &gt; Supplier Type,Tiekėjas&gt; Tiekėjo tipas
 DocType: Share Balance,From No,Iš Nr
 DocType: Shift Type,Early Exit Grace Period,Ankstyvasis išėjimo lengvatinis laikotarpis
 DocType: Task,Actual Time (in Hours),Tikrasis laikas (valandomis)
@@ -6895,6 +6908,7 @@
 DocType: Warehouse,Warehouse Name,Sandėlių Vardas
 DocType: Naming Series,Select Transaction,Pasirinkite Sandorio
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py,Please enter Approving Role or Approving User,Prašome įvesti patvirtinimo vaidmuo arba patvirtinimo vartotoją
+apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.py,UOM Conversion factor ({0} -&gt; {1}) not found for item: {2},UOM konversijos koeficientas ({0} -&gt; {1}) nerastas elementui: {2}
 apps/erpnext/erpnext/support/doctype/service_level_agreement/service_level_agreement.py,Service Level Agreement with Entity Type {0} and Entity {1} already exists.,Paslaugų lygio sutartis su {0} subjekto ir {1} subjektais jau yra.
 DocType: Journal Entry,Write Off Entry,Nurašyti įrašą
 DocType: BOM,Rate Of Materials Based On,Norma medžiagų pagrindu
@@ -7086,6 +7100,7 @@
 DocType: Quality Inspection Reading,Quality Inspection Reading,Kokybės inspekcija skaitymas
 apps/erpnext/erpnext/stock/doctype/stock_settings/stock_settings.py,`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/stock/report/stock_balance/stock_balance.py,Earliest Age,Ankstyviausias amžius
 apps/erpnext/erpnext/utilities/user_progress.py,Set a sales goal you'd like to achieve for your company.,"Nustatykite pardavimo tikslą, kurį norite pasiekti savo bendrovei."
 DocType: Quality Goal,Revision,Revizija
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js,Healthcare Services,Sveikatos priežiūros paslaugos
@@ -7129,6 +7144,7 @@
 apps/erpnext/erpnext/healthcare/doctype/patient_encounter/patient_encounter.js,Schedule Discharge,Tvarkaraščio įvykdymas
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py,Cheques and Deposits incorrectly cleared,Čekiai ir užstatai neteisingai išvalytas
 DocType: Homepage Section Card,Homepage Section Card,Pagrindinio puslapio skyrius
+,Amount To Be Billed,Apmokėtina suma
 apps/erpnext/erpnext/accounts/doctype/account/account.py,Account {0}: You can not assign itself as parent account,Sąskaita {0}: Jūs negalite priskirti save kaip patronuojančios sąskaitą
 DocType: Purchase Invoice Item,Price List Rate,Kainų sąrašas Balsuok
 apps/erpnext/erpnext/utilities/activation.py,Create customer quotes,Sukurti klientų citatos
@@ -7181,6 +7197,7 @@
 DocType: Supplier Scorecard Criteria,Supplier Scorecard Criteria,Tiekėjo rezultatų vertinimo kriterijai
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py,Please select Start Date and End Date for Item {0},Prašome pasirinkti pradžios ir pabaigos data punkte {0}
 DocType: Maintenance Schedule,MAT-MSH-.YYYY.-,MAT-MSH-.YYYY.-
+,Amount to Receive,Gautina suma
 apps/erpnext/erpnext/education/doctype/student_group_creation_tool/student_group_creation_tool.py,Course is mandatory in row {0},"Žinoma, yra privalomi eilės {0}"
 apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py,From date can not be greater than than To date,Nuo datos negali būti didesnis nei iki šiol
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py,To date cannot be before from date,Iki šiol gali būti ne anksčiau iš dienos
@@ -7431,7 +7448,6 @@
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js,BOM and Manufacturing Quantity are required,BOM ir gamyba Kiekis yra privalomi
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js,Ageing Range 2,Senėjimas klasės 2
 DocType: SG Creation Tool Course,Max Strength,Maksimali jėga
-apps/erpnext/erpnext/accounts/doctype/account/account.py,"Account {0} already exists in child company {1}. The following fields have different values, they should be same:<ul><li>{2}</li></ul>","Paskyra {0} jau yra vaikų bendrovėje {1}. Šie laukai turi skirtingas reikšmes, jie turėtų būti vienodi: <ul><li> {2} </li></ul>"
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py,Installing presets,Iš anksto įdiegti
 DocType: Fee Schedule,EDU-FSH-.YYYY.-,EDU-FSH-.YYYY.-
 apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js,No Delivery Note selected for Customer {},Kliento pasirinkta pristatymo pastaba ()
@@ -7643,6 +7659,7 @@
 DocType: Delivery Note,Print Without Amount,Spausdinti Be Suma
 apps/erpnext/erpnext/accounts/report/asset_depreciation_ledger/asset_depreciation_ledger.py,Depreciation Date,Nusidėvėjimas data
 ,Work Orders in Progress,Darbų užsakymai vyksta
+DocType: Customer Credit Limit,Bypass Credit Limit Check,Aplenkti kredito limito patikrinimą
 DocType: Issue,Support Team,Palaikymo komanda
 apps/erpnext/erpnext/stock/report/batch_item_expiry_status/batch_item_expiry_status.py,Expiry (In Days),Galiojimo (dienomis)
 DocType: Appraisal,Total Score (Out of 5),Iš viso balas (iš 5)
@@ -7829,6 +7846,7 @@
 DocType: Sales Invoice,Customer GSTIN,Klientų GSTIN
 DocType: Crop Cycle,List of diseases detected on the field. When selected it'll automatically add a list of tasks to deal with the disease ,"Lauke aptiktų ligų sąrašas. Pasirinkus, jis bus automatiškai pridėti užduočių sąrašą kovai su liga"
 apps/erpnext/erpnext/manufacturing/page/bom_comparison_tool/bom_comparison_tool.js,BOM 1,BOM 1
+apps/erpnext/erpnext/assets/report/fixed_asset_register/fixed_asset_register.py,Asset Id,Turto ID
 apps/erpnext/erpnext/healthcare/doctype/healthcare_service_unit/healthcare_service_unit.js,This is a root healthcare service unit and cannot be edited.,"Tai pagrindinė sveikatos priežiūros tarnybos dalis, kurios negalima redaguoti."
 DocType: Asset Repair,Repair Status,Taisyklės būklė
 apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.js,"Requested Qty: Quantity requested for purchase, but not ordered.","Prašomas kiekis: Prašomas pirkti kiekis, bet neužsakytas."
diff --git a/erpnext/translations/lv.csv b/erpnext/translations/lv.csv
index ebe0023..a22e637 100644
--- a/erpnext/translations/lv.csv
+++ b/erpnext/translations/lv.csv
@@ -288,7 +288,6 @@
 DocType: Loan,Repay Over Number of Periods,Atmaksāt Over periodu skaits
 apps/erpnext/erpnext/manufacturing/report/bom_stock_report/bom_stock_report.py,Quantity to Produce can not be less than Zero,Produkcijas daudzums nedrīkst būt mazāks par nulli
 DocType: Stock Entry,Additional Costs,Papildu izmaksas
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Customer &gt; Customer Group &gt; Territory,Klients&gt; Klientu grupa&gt; Teritorija
 apps/erpnext/erpnext/accounts/doctype/account/account.py,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
@@ -586,6 +585,7 @@
 DocType: Healthcare Settings,Create documents for sample collection,Izveidojiet dokumentus paraugu kolekcijai
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py,Payment against {0} {1} cannot be greater than Outstanding Amount {2},Maksājumu pret {0} {1} nevar būt lielāks par izcilu Summu {2}
 apps/erpnext/erpnext/patches/v11_0/add_healthcare_service_unit_tree_root.py,All Healthcare Service Units,Visas veselības aprūpes nodaļas
+apps/erpnext/erpnext/setup/default_energy_point_rules.py,On Converting Opportunity,Par iespēju konvertēšanu
 DocType: Bank Account,Address HTML,Adrese HTML
 DocType: Lead,Mobile No.,Mobile No.
 apps/erpnext/erpnext/selling/doctype/pos_closing_voucher/closing_voucher_details.html,Mode of Payments,Maksājumu veids
@@ -650,7 +650,6 @@
 DocType: Accounting Dimension,Dimension Name,Izmēra nosaukums
 apps/erpnext/erpnext/healthcare/setup.py,Resistant,Izturīgs
 apps/erpnext/erpnext/hotels/doctype/hotel_room_reservation/hotel_room_reservation.py,Please set Hotel Room Rate on {},"Lūdzu, iestatiet viesnīcu cenu par {}"
-apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py,Please setup numbering series for Attendance via Setup &gt; Numbering Series,"Lūdzu, iestatiet apmeklējumu numerācijas sērijas, izmantojot Iestatīšana&gt; Numerācijas sērija"
 DocType: Journal Entry,Multi Currency,Multi Valūtas
 DocType: Bank Statement Transaction Invoice Item,Invoice Type,Rēķins Type
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py,Valid from date must be less than valid upto date,Derīgam no datuma jābūt mazākam par derīgo līdz datumam
@@ -768,6 +767,7 @@
 apps/erpnext/erpnext/accounts/page/pos/pos.js,Create a new Customer,Izveidot jaunu Klientu
 apps/erpnext/erpnext/non_profit/report/expiring_memberships/expiring_memberships.py,Expiring On,Beidzas uz
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,"If multiple Pricing Rules continue to prevail, users are asked to set Priority manually to resolve conflict.","Ja vairāki Cenu Noteikumi turpina dominēt, lietotāji tiek aicināti noteikt prioritāti manuāli atrisināt konfliktu."
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js,Purchase Return,Pirkuma Return
 apps/erpnext/erpnext/utilities/activation.py,Create Purchase Orders,Izveidot pirkuma pasūtījumu
 ,Purchase Register,Pirkuma Reģistrēties
 apps/erpnext/erpnext/healthcare/doctype/patient/patient.py,Patient not found,Pacients nav atrasts
@@ -783,7 +783,6 @@
 DocType: Location,Area UOM,Platība UOM
 apps/erpnext/erpnext/manufacturing/doctype/workstation/workstation.py,Workstation is closed on the following dates as per Holiday List: {0},"Darbstacija ir slēgta šādos datumos, kā par Holiday saraksts: {0}"
 apps/erpnext/erpnext/selling/page/sales_funnel/sales_funnel.py,Opportunities,Iespējas
-apps/erpnext/erpnext/www/all-products/index.html,Clear filters,Notīrīt filtrus
 DocType: Lab Test Template,Single,Viens
 DocType: Compensatory Leave Request,Work From Date,Darbs no datuma
 DocType: Salary Slip,Total Loan Repayment,Kopā Aizdevuma atmaksa
@@ -827,6 +826,7 @@
 apps/erpnext/erpnext/education/doctype/program_enrollment_tool/program_enrollment_tool.py,Mandatory field - Academic Year,Obligāts lauks - akadēmiskais gads
 apps/erpnext/erpnext/education/doctype/program_enrollment_tool/program_enrollment_tool.py,Mandatory field - Academic Year,Obligāts lauks - akadēmiskais gads
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py,{0} {1} is not associated with {2} {3},{0} {1} nav saistīts ar {2} {3}
+DocType: Opportunity,Converted By,Pārveidoja
 apps/erpnext/erpnext/public/js/hub/components/ReviewArea.vue,You need to login as a Marketplace User before you can add any reviews.,"Pirms varat pievienot atsauksmes, jums jāpiesakās kā tirgus vietnes lietotājam."
 apps/erpnext/erpnext/manufacturing/doctype/job_card/job_card.py,Row {0} : Operation is required against the raw material item {1},Rinda {0}: darbībai nepieciešama izejvielu vienība {1}
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py,Please set default payable account for the company {0},Lūdzu iestatīt noklusēto maksājams konts uzņēmumam {0}
@@ -852,6 +852,8 @@
 DocType: BOM,Work Order,Darba kārtība
 DocType: Sales Invoice,Total Qty,Kopā Daudz
 apps/erpnext/erpnext/education/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py,Guardian2 Email ID,Guardian2 Email ID
+apps/erpnext/erpnext/hr/doctype/employee_transfer/employee_transfer.py,"Please delete the Employee <a href=""#Form/Employee/{0}"">{0}</a>\
+					to cancel this document","Lūdzu, izdzēsiet darbinieku <a href=""#Form/Employee/{0}"">{0}</a> \, lai atceltu šo dokumentu"
 DocType: Item,Show in Website (Variant),Show Website (Variant)
 DocType: Employee,Health Concerns,Veselības problēmas
 DocType: Payroll Entry,Select Payroll Period,Izvēlieties Payroll periods
@@ -911,7 +913,6 @@
 DocType: Codification Table,Codification Table,Kodifikācijas tabula
 DocType: Timesheet Detail,Hrs,h
 apps/erpnext/erpnext/manufacturing/page/bom_comparison_tool/bom_comparison_tool.js,Changes in {0},Izmaiņas {0}
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js,Please select Company,"Lūdzu, izvēlieties Uzņēmums"
 DocType: Employee Skill,Employee Skill,Darbinieka prasmes
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.js,Difference Account,Atšķirība konts
 DocType: Pricing Rule,Discount on Other Item,Atlaide citai precei
@@ -980,6 +981,7 @@
 DocType: BOM,Operating Cost,Darbības izmaksas
 DocType: Crop,Produced Items,Ražotie vienumi
 DocType: Bank Statement Transaction Entry,Match Transaction to Invoices,Darīt darījumu ar rēķiniem
+apps/erpnext/erpnext/erpnext_integrations/exotel_integration.py,Error in Exotel incoming call,Kļūda Exotel ienākošajā zvanā
 DocType: Sales Order Item,Gross Profit,Bruto peļņa
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js,Unblock Invoice,Atbloķēt rēķinu
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py,Increment cannot be 0,Pieaugums nevar būt 0
@@ -1195,6 +1197,7 @@
 DocType: Activity Cost,Activity Type,Pasākuma veids
 DocType: Request for Quotation,For individual supplier,Par individuālo piegādātāja
 DocType: BOM Operation,Base Hour Rate(Company Currency),Bāzes stundu likme (Company valūta)
+,Qty To Be Billed,Cik jāmaksā
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py,Delivered Amount,Pasludināts Summa
 apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.js,Reserved Qty for Production: Raw materials quantity to make manufacturing items.,"Ražošanas rezervētais daudzums: Izejvielu daudzums, lai izgatavotu ražošanas priekšmetus."
 DocType: Loyalty Point Entry Redemption,Redemption Date,Atpirkšanas datums
@@ -1315,7 +1318,7 @@
 apps/erpnext/erpnext/education/doctype/student_group/student_group.py,Please select Program,"Lūdzu, izvēlieties programma"
 apps/erpnext/erpnext/education/doctype/student_group/student_group.py,Please select Program,"Lūdzu, izvēlieties programma"
 DocType: Project,Estimated Cost,Paredzamās izmaksas
-DocType: Request for Quotation,Link to material requests,Saite uz materiālo pieprasījumiem
+DocType: Supplier Quotation,Link to material requests,Saite uz materiālo pieprasījumiem
 apps/erpnext/erpnext/public/js/hub/pages/Publish.vue,Publish,Publicēt
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py,Aerospace,Aerospace
 ,Fichier des Ecritures Comptables [FEC],Fichier des Ecritures Comptables [FEC]
@@ -1328,6 +1331,7 @@
 apps/erpnext/erpnext/utilities/transaction_base.py,Invalid Posting Time,Nederīgs publicēšanas laiks
 DocType: Salary Component,Condition and Formula,Nosacījums un formula
 DocType: Lead,Campaign Name,Kampaņas nosaukums
+apps/erpnext/erpnext/setup/default_energy_point_rules.py,On Task Completion,Par uzdevuma pabeigšanu
 apps/erpnext/erpnext/hr/doctype/compensatory_leave_request/compensatory_leave_request.py,There is no leave period in between {0} and {1},Atvaļinājuma periods nav starp {0} un {1}
 DocType: Fee Validity,Healthcare Practitioner,Veselības aprūpes speciāliste
 DocType: Hotel Room,Capacity,Jauda
@@ -1673,7 +1677,6 @@
 DocType: Quality Feedback Template,Quality Feedback Template,Kvalitatīvas atsauksmes veidne
 apps/erpnext/erpnext/config/education.py,LMS Activity,LMS aktivitāte
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py,Internet Publishing,Interneta Publishing
-DocType: Prescription Duration,Number,Numurs
 apps/erpnext/erpnext/accounts/doctype/opening_invoice_creation_tool/opening_invoice_creation_tool.js,Creating {0} Invoice,{0} rēķina izveide
 DocType: Medical Code,Medical Code Standard,Medicīnas kodeksa standarts
 DocType: Soil Texture,Clay Composition (%),Māla sastāvs (%)
@@ -1748,6 +1751,7 @@
 DocType: Support Settings,Get Started Sections,Sāciet sākuma sadaļas
 DocType: Lead,CRM-LEAD-.YYYY.-,CRM-LEAD-.YYYY.-
 DocType: Invoice Discounting,Sanctioned,sodīts
+,Base Amount,Pamatsumma
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.js,Total Contribution Amount: {0},Kopējais ieguldījuma apjoms: {0}
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py,Row #{0}: Please specify Serial No for Item {1},"Row # {0}: Lūdzu, norādiet Sērijas Nr postenī {1}"
 DocType: Payroll Entry,Salary Slips Submitted,Iesniegts atalgojuma slīdums
@@ -1970,6 +1974,7 @@
 DocType: Accounting Dimension,Dimension Defaults,Izmēra noklusējumi
 apps/erpnext/erpnext/crm/report/prospects_engaged_but_not_converted/prospects_engaged_but_not_converted.js,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,Minimum Lead Age (Days),Minimālā Lead Vecums (dienas)
+apps/erpnext/erpnext/assets/report/fixed_asset_register/fixed_asset_register.py,Available For Use Date,Pieejams lietošanai datums
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py,All BOMs,Visas BOMs
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js,Create Inter Company Journal Entry,Izveidot starpuzņēmumu žurnāla ierakstu
 DocType: Company,Parent Company,Mātes uzņēmums
@@ -2034,6 +2039,7 @@
 ,IRS 1099,IRS 1099
 DocType: Salary Slip,Leave Without Pay,Bezalgas atvaļinājums
 DocType: Payment Request,Outward,Uz āru
+apps/erpnext/erpnext/setup/default_energy_point_rules.py,On {0} Creation,Par {0} izveidi
 apps/erpnext/erpnext/regional/doctype/gstr_3b_report/gstr_3b_report.html,State/UT Tax,Valsts / UT nodoklis
 ,Trial Balance for Party,Trial Balance uz pusi
 ,Gross and Net Profit Report,Bruto un neto peļņas pārskats
@@ -2151,6 +2157,7 @@
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js,Make Stock Entry,Veikt krājumu ierakstu
 DocType: Hotel Room Reservation,Hotel Reservation User,Viesnīcu rezervācijas lietotājs
 apps/erpnext/erpnext/projects/doctype/project/project.js,Set Status,Iestatīt statusu
+apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py,Please setup numbering series for Attendance via Setup &gt; Numbering Series,"Lūdzu, iestatiet apmeklējumu numerācijas sērijas, izmantojot Iestatīšana&gt; Numerācijas sērija"
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py,Please select prefix first,"Lūdzu, izvēlieties kodu pirmais"
 DocType: Contract,Fulfilment Deadline,Izpildes termiņš
 apps/erpnext/erpnext/public/js/hub/pages/Home.vue,Near you,Pie jums
@@ -2166,6 +2173,7 @@
 DocType: Announcement,All Students,Visi studenti
 apps/erpnext/erpnext/assets/doctype/asset/asset.py,Item {0} must be a non-stock item,Prece {0} ir jābūt ne-akciju postenis
 apps/erpnext/erpnext/stock/doctype/batch/batch.js,View Ledger,View Ledger
+DocType: Cost Center,Lft,LFT
 DocType: Grading Scale,Intervals,intervāli
 DocType: Bank Statement Transaction Entry,Reconciled Transactions,Saskaņotie darījumi
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py,Earliest,Senākās
@@ -2281,6 +2289,7 @@
 apps/erpnext/erpnext/hr/doctype/employee_benefit_application/employee_benefit_application.py,As per your assigned Salary Structure you cannot apply for benefits,"Jūs nevarat pieteikties pabalstu saņemšanai, ņemot vērā jūsu piešķirto algu struktūru"
 apps/erpnext/erpnext/stock/doctype/item/item.py,Website Image should be a public file or website URL,Website Image vajadzētu būt publiski failu vai tīmekļa URL
 DocType: Purchase Invoice Item,BOM,BOM
+apps/erpnext/erpnext/stock/doctype/item/item.py,Duplicate entry in Manufacturers table,Ieraksta dublikāts tabulā Ražotāji
 apps/erpnext/erpnext/setup/doctype/item_group/item_group.js,This is a root item group and cannot be edited.,Tas ir sakne posteni grupas un to nevar rediģēt.
 apps/erpnext/erpnext/accounts/doctype/account/account.js,Merge,Sapludināt
 DocType: Journal Entry Account,Purchase Order,Pirkuma Pasūtījums
@@ -2427,7 +2436,6 @@
 DocType: Asset,Depreciation Schedules,amortizācijas grafiki
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.js,Create Sales Invoice,Izveidot pārdošanas rēķinu
 apps/erpnext/erpnext/regional/doctype/gstr_3b_report/gstr_3b_report.html,Ineligible ITC,Neatbilstošs ITC
-apps/erpnext/erpnext/erpnext_integrations/doctype/shopify_settings/shopify_settings.py,"Support for public app is deprecated. Please setup private app, for more details refer user manual","Atbalsts publiskai lietotnei ir novecojis. Lūdzu, konfigurējiet privātu lietotni, lai iegūtu sīkāku informāciju, iepazīstieties ar lietotāja rokasgrāmatu"
 DocType: Task,Dependent Tasks,Atkarīgie uzdevumi
 apps/erpnext/erpnext/regional/report/gstr_1/gstr_1.py,Following accounts might be selected in GST Settings:,GST iestatījumos var atlasīt šādus kontus:
 apps/erpnext/erpnext/manufacturing/report/bom_stock_report/bom_stock_report.js,Quantity to Produce,Produkcijas daudzums
@@ -2679,6 +2687,7 @@
 DocType: Water Analysis,Container,Konteiners
 apps/erpnext/erpnext/regional/report/gstr_1/gstr_1.py,Please set valid GSTIN No. in Company Address,"Lūdzu, uzņēmuma adresē iestatiet derīgu GSTIN numuru"
 apps/erpnext/erpnext/education/utils.py,Student {0} - {1} appears Multiple times in row {2} & {3},Student {0} - {1} parādās vairākas reizes pēc kārtas {2} un {3}
+apps/erpnext/erpnext/selling/doctype/customer/customer.py,Following fields are mandatory to create address:,"Lai izveidotu adresi, šie lauki ir obligāti:"
 DocType: Item Alternative,Two-way,Divvirzienu
 DocType: Item,Manufacturers,Ražotāji
 apps/erpnext/erpnext/accounts/deferred_revenue.py,Error while processing deferred accounting for {0},"Kļūda, apstrādājot {0} atlikto grāmatvedību"
@@ -2754,9 +2763,9 @@
 DocType: Employee,HR-EMP-,HR-EMP-
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py,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: Quality Meeting Minutes,Quality Meeting Minutes,Kvalitātes sanāksmes protokols
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Supplier &gt; Supplier Type,Piegādātājs&gt; Piegādātāja tips
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py,Employee Referral,Darbinieku nosūtīšana
 DocType: Student Group,Set 0 for no limit,Uzstādīt 0 bez ierobežojuma
+DocType: Cost Center,rgt,rgt
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py,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."
 DocType: Customer,Primary Address and Contact Detail,Primārā adrese un kontaktinformācija
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.js,Resend Payment Email,Atkārtoti nosūtīt maksājumu E-pasts
@@ -2866,7 +2875,6 @@
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py,Against Supplier Invoice {0} dated {1},Pret Piegādātāju rēķinu {0} datēts {1}
 DocType: Customer,Default Price List,Default Cenrādis
 apps/erpnext/erpnext/assets/doctype/asset/asset.py,Asset Movement record {0} created,Asset Kustība ierakstīt {0} izveidots
-apps/erpnext/erpnext/utilities/page/leaderboard/leaderboard.js,No items found.,Nav atrasts neviens vienums.
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py,You cannot delete Fiscal Year {0}. Fiscal Year {0} is set as default in Global Settings,Jūs nevarat izdzēst saimnieciskais gads {0}. Fiskālā gads {0} ir noteikta kā noklusējuma Global iestatījumi
 DocType: Share Transfer,Equity/Liability Account,Pašu kapitāls / Atbildības konts
 apps/erpnext/erpnext/setup/doctype/customer_group/customer_group.py,A customer with the same name already exists,Klients ar tādu pašu nosaukumu jau pastāv
@@ -2882,6 +2890,7 @@
 apps/erpnext/erpnext/selling/doctype/customer/customer.py,Credit limit has been crossed for customer {0} ({1}/{2}),Kredīta limits ir šķērsots klientam {0} ({1} / {2})
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py,Customer required for 'Customerwise Discount',"Klientam nepieciešams ""Customerwise Atlaide"""
 apps/erpnext/erpnext/config/accounting.py,Update bank payment dates with journals.,Atjaunināt banku maksājumu datumus ar žurnāliem.
+,Billed Qty,Rēķināmais daudzums
 apps/erpnext/erpnext/stock/doctype/item/item_dashboard.py,Pricing,Cenu
 DocType: Employee,Attendance Device ID (Biometric/RF tag ID),Apmeklējumu ierīces ID (biometriskās / RF atzīmes ID)
 DocType: Quotation,Term Details,Term Details
@@ -2905,6 +2914,7 @@
 DocType: Share Transfer,Asset Account,Aktīvu konts
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js,New release date should be in the future,Jaunā izlaišanas datumam vajadzētu būt nākotnē
 DocType: Purchase Invoice,End date of current invoice's period,Beigu datums no kārtējā rēķinā s perioda
+apps/erpnext/erpnext/hr/doctype/employee/employee.py,Please setup Employee Naming System in Human Resource &gt; HR Settings,"Lūdzu, iestatiet Personāla nosaukšanas sistēma personāla resursos&gt; HR iestatījumi"
 DocType: Lab Test,Technician Name,Tehniķa vārds
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py,"Cannot ensure delivery by Serial No as \
 					Item {0} is added with and without Ensure Delivery by \
@@ -2912,6 +2922,7 @@
 DocType: Accounts Settings,Unlink Payment on Cancellation of Invoice,Atsaistītu maksājumu par anulēšana rēķina
 DocType: Bank Reconciliation,From Date,No Datums
 apps/erpnext/erpnext/hr/doctype/vehicle_log/vehicle_log.py,Current Odometer reading entered should be greater than initial Vehicle Odometer {0},Pašreizējais Kilometru skaits stājās jābūt lielākam nekā sākotnēji Transportlīdzekļa odometra {0}
+,Purchase Order Items To Be Received or Billed,"Pirkuma pasūtījuma preces, kuras jāsaņem vai par kurām jāmaksā rēķins"
 DocType: Restaurant Reservation,No Show,Nav šovu
 apps/erpnext/erpnext/regional/india/utils.py,You must be a registered supplier to generate e-Way Bill,"Lai ģenerētu e-Way rēķinu, jums jābūt reģistrētam piegādātājam"
 DocType: Shipping Rule Country,Shipping Rule Country,Piegāde noteikums Country
@@ -2954,6 +2965,7 @@
 apps/erpnext/erpnext/templates/generators/item/item_add_to_cart.html,View in Cart,View in grozs
 DocType: Employee Checkin,Shift Actual Start,Shift Faktiskais sākums
 DocType: Tally Migration,Is Day Book Data Imported,Vai dienasgrāmatas dati ir importēti
+,Purchase Order Items To Be Received or Billed1,"Pirkuma pasūtījuma vienības, kuras jāsaņem vai par kurām jāmaksā rēķins1"
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py,Marketing Expenses,Mārketinga izdevumi
 apps/erpnext/erpnext/stock/doctype/pick_list/pick_list.py,{0} units of {1} is not available.,{0} vienības no {1} nav pieejamas.
 ,Item Shortage Report,Postenis trūkums ziņojums
@@ -3182,7 +3194,6 @@
 apps/erpnext/erpnext/public/js/call_popup/call_popup.js,View all issues from {0},Skatīt visas problēmas no vietnes {0}
 DocType: Quality Inspection,MAT-QA-.YYYY.-,MAT-QA-.YYYY.-
 DocType: Quality Meeting Table,Quality Meeting Table,Kvalitātes sanāksmju galds
-apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,"Lūdzu, iestatiet Nosaukšanas sērija uz {0}, izmantojot Iestatīšana&gt; Iestatījumi&gt; Sēriju nosaukšana"
 apps/erpnext/erpnext/templates/pages/help.html,Visit the forums,Apmeklējiet forumus
 DocType: Student,Student Mobile Number,Studentu Mobilā tālruņa numurs
 DocType: Item,Has Variants,Ir Varianti
@@ -3326,6 +3337,7 @@
 ,Campaign Efficiency,Kampaņas efektivitāte
 ,Campaign Efficiency,Kampaņas efektivitāte
 DocType: Discussion,Discussion,diskusija
+apps/erpnext/erpnext/setup/default_energy_point_rules.py,On Sales Order Submission,Par pārdošanas pasūtījuma iesniegšanu
 DocType: Bank Transaction,Transaction ID,darījuma ID
 DocType: Payroll Entry,Deduct Tax For Unsubmitted Tax Exemption Proof,Nodokļa atmaksa par neapstiprinātu nodokļu atbrīvojuma pierādījumu
 DocType: Volunteer,Anytime,Anytime
@@ -3333,7 +3345,6 @@
 DocType: Employee Tax Exemption Proof Submission,Employee Tax Exemption Proof Submission,Darbinieku atbrīvojums no nodokļiem Proof iesniegšana
 DocType: Patient,Surgical History,Ķirurģijas vēsture
 DocType: Bank Statement Settings Item,Mapped Header,Mape Header
-apps/erpnext/erpnext/hr/doctype/employee/employee.py,Please setup Employee Naming System in Human Resource &gt; HR Settings,"Lūdzu, iestatiet Personāla nosaukšanas sistēma personāla resursos&gt; HR iestatījumi"
 DocType: Employee,Resignation Letter Date,Atkāpšanās no amata vēstule Datums
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Pricing Rules are further filtered based on quantity.,"Cenu Noteikumi tālāk filtrē, pamatojoties uz daudzumu."
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py,Please set the Date Of Joining for employee {0},Lūdzu datumu nosaka Pievienojoties par darbiniekam {0}
@@ -3348,6 +3359,7 @@
 DocType: Bank Statement Settings,Mapped Items,Mapped Items
 DocType: Amazon MWS Settings,IT,IT
 DocType: Chapter,Chapter,Nodaļa
+,Fixed Asset Register,Pamatlīdzekļu reģistrs
 apps/erpnext/erpnext/utilities/user_progress.py,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,Select BOM and Qty for Production,Izvēlieties BOM un Daudzums nobarojamām
@@ -3483,7 +3495,6 @@
 apps/erpnext/erpnext/templates/emails/reorder_item.html,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ī"
 apps/erpnext/erpnext/controllers/accounts_controller.py,Account {0} is invalid. Account Currency must be {1},Konts {0} ir nederīgs. Konta valūta ir {1}
 apps/erpnext/erpnext/hr/doctype/salary_structure_assignment/salary_structure_assignment.py,From Date {0} cannot be after employee's relieving Date {1},No Datuma {0} nevar būt pēc darbinieku atlaišanas Datums {1}
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py,Debit Note {0} has been created automatically,Debeta piezīme {0} ir izveidota automātiski
 apps/erpnext/erpnext/accounts/doctype/payment_order/payment_order.js,Create Payment Entries,Izveidot maksājuma ierakstus
 DocType: Supplier,Is Internal Supplier,Iekšējais piegādātājs
 DocType: Employee,Create User Permission,Izveidot lietotāja atļauju
@@ -4047,7 +4058,6 @@
 DocType: Project User,Project Status,Projekta statuss
 DocType: UOM,Check this to disallow fractions. (for Nos),Pārbaudiet to neatļaut frakcijas. (Par Nr)
 DocType: Student Admission Program,Naming Series (for Student Applicant),Naming Series (par studentu Pieteikuma)
-apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.py,UOM Conversion factor ({0} -&gt; {1}) not found for item: {2},Vienumam: {2} nav atrasts UOM konversijas koeficients ({0} -&gt; {1}).
 apps/erpnext/erpnext/hr/doctype/retention_bonus/retention_bonus.py,Bonus Payment Date cannot be a past date,Bonusa maksājuma datums nevar būt pagājis datums
 DocType: Travel Request,Copy of Invitation/Announcement,Uzaicinājuma / paziņojuma kopija
 DocType: Practitioner Service Unit Schedule,Practitioner Service Unit Schedule,Prakses dienesta nodaļas grafiks
@@ -4196,6 +4206,7 @@
 apps/erpnext/erpnext/utilities/user_progress.py,Setup Company,Setup Company
 ,Lab Test Report,Laba testa atskaite
 DocType: Employee Benefit Application,Employee Benefit Application,Darbinieku pabalsta pieteikums
+apps/erpnext/erpnext/accounts/doctype/invoice_discounting/invoice_discounting.py,Row({0}): {1} is already discounted in {2},Rinda ({0}): {1} jau tiek diskontēts {2}
 apps/erpnext/erpnext/hr/doctype/additional_salary/additional_salary.py,Additional Salary Component Exists.,Papildu algas komponents pastāv.
 DocType: Purchase Invoice,Unregistered,Nereģistrēts
 DocType: Student Applicant,Application Date,pieteikums datums
@@ -4273,7 +4284,6 @@
 DocType: Journal Entry,Accounting Entries,Grāmatvedības Ieraksti
 DocType: Job Card Time Log,Job Card Time Log,Darba kartes laika žurnāls
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,"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;."
-apps/erpnext/erpnext/education/doctype/instructor/instructor.py,Please setup Instructor Naming System in Education &gt; Education Settings,"Lūdzu, iestatiet instruktora nosaukšanas sistēmu sadaļā Izglītība&gt; Izglītības iestatījumi"
 DocType: Journal Entry,Paid Loan,Apmaksāts aizdevums
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py,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ņš
@@ -4290,7 +4300,6 @@
 apps/erpnext/erpnext/templates/pages/projects.html,No time sheets,Nav laika uzskaites lapas
 DocType: GoCardless Mandate,GoCardless Customer,GoCardless klients
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py,Leave Type {0} cannot be carry-forwarded,"Atstājiet Type {0} nevar veikt, nosūta"
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Item Code &gt; Item Group &gt; Brand,Preces kods&gt; Vienību grupa&gt; Zīmols
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py,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
 DocType: Leave Encashment,Payroll,Algas
@@ -4406,7 +4415,6 @@
 DocType: Stock Ledger Entry,Actual Qty After Transaction,Faktiskais Daudz Pēc Darījuma
 ,Pending SO Items For Purchase Request,Kamēr SO šeit: pirkuma pieprasījumu
 apps/erpnext/erpnext/education/doctype/student_admission/student_admission.py,Student Admissions,studentu Uzņemšana
-apps/erpnext/erpnext/accounts/party.py,{0} {1} is disabled,{0} {1} ir izslēgts
 DocType: Supplier,Billing Currency,Norēķinu valūta
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py,Extra Large,Īpaši liels
 DocType: Loan,Loan Application,Kredīta pieteikums
@@ -4483,7 +4491,6 @@
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py,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/accounts/doctype/accounting_dimension/accounting_dimension.py,Creating Dimensions...,Notiek kategoriju izveidošana ...
 apps/erpnext/erpnext/education/doctype/student_group_creation_tool/student_group_creation_tool.py,Student Group Name is mandatory in row {0},Student Grupas nosaukums ir obligāta kārtas {0}
-DocType: Customer Credit Limit,Bypass credit limit_check,Apiet kredītlimita pārbaudi
 DocType: Homepage,Products to be shown on website homepage,"Produkti, kas jānorāda uz mājas lapā mājas lapā"
 DocType: HR Settings,Password Policy,Paroles politika
 apps/erpnext/erpnext/setup/doctype/customer_group/customer_group.js,This is a root customer group and cannot be edited.,"Tas ir sakne klientu grupai, un to nevar rediģēt."
@@ -4777,6 +4784,7 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py,Row {0}: Advance against Customer must be credit,Row {0}: Advance pret Klientu jābūt kredīts
 DocType: Quality Meeting,Quality Meeting,Kvalitātes sanāksme
 apps/erpnext/erpnext/accounts/doctype/account/account.js,Non-Group to Group,Non-Group grupas
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,"Lūdzu, iestatiet Nosaukšanas sērija uz {0}, izmantojot Iestatīšana&gt; Iestatījumi&gt; Sēriju nosaukšana"
 DocType: Employee,ERPNext User,ERPNext lietotājs
 apps/erpnext/erpnext/education/doctype/student_group_creation_tool/student_group_creation_tool.py,Batch is mandatory in row {0},Batch ir obligāta rindā {0}
 apps/erpnext/erpnext/education/doctype/student_group_creation_tool/student_group_creation_tool.py,Batch is mandatory in row {0},Batch ir obligāta rindā {0}
@@ -5076,6 +5084,7 @@
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py,No {0} found for Inter Company Transactions.,Netika atrasta neviena {0} starpuzņēmuma Darījumu gadījumā.
 DocType: Travel Itinerary,Rented Car,Izīrēts auto
 apps/erpnext/erpnext/public/js/hub/components/profile_dialog.js,About your Company,Par jūsu uzņēmumu
+apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.js,Show Stock Ageing Data,Rādīt krājumu novecošanās datus
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py,Credit To account must be a Balance Sheet account,Kredīts kontā jābūt bilance konts
 DocType: Donor,Donor,Donors
 DocType: Global Defaults,Disable In Words,Atslēgt vārdos
@@ -5090,8 +5099,10 @@
 DocType: Practitioner Schedule,Schedule Name,Saraksta nosaukums
 apps/erpnext/erpnext/regional/doctype/gstr_3b_report/gstr_3b_report.py,Please enter GSTIN and state for the Company Address {0},"Lūdzu, ievadiet GSTIN un norādiet uzņēmuma adresi {0}"
 DocType: Currency Exchange,For Buying,Pirkšanai
+apps/erpnext/erpnext/setup/default_energy_point_rules.py,On Purchase Order Submission,Par pirkuma pasūtījuma iesniegšanu
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js,Add All Suppliers,Pievienot visus piegādātājus
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py,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/accounts/doctype/pricing_rule/pricing_rule.js,Customer &gt; Customer Group &gt; Territory,Klients&gt; Klientu grupa&gt; Teritorija
 DocType: Tally Migration,Parties,Ballītes
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js,Browse BOM,Pārlūkot BOM
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py,Secured Loans,Nodrošināti aizdevumi
@@ -5123,6 +5134,7 @@
 apps/erpnext/erpnext/stock/doctype/item_alternative/item_alternative.py,Not allow to set alternative item for the item {0},Nevar atļaut iestatīt alternatīvu objektu vienumam {0}
 apps/erpnext/erpnext/hr/doctype/leave_block_list/leave_block_list.py,Date is repeated,Datums tiek atkārtots
 apps/erpnext/erpnext/accounts/print_format/payment_receipt_voucher/payment_receipt_voucher.html,Authorized Signatory,Autorizēts Parakstītājs
+apps/erpnext/erpnext/education/doctype/instructor/instructor.py,Please setup Instructor Naming System in Education &gt; Education Settings,"Lūdzu, iestatiet instruktora nosaukšanas sistēmu sadaļā Izglītība&gt; Izglītības iestatījumi"
 apps/erpnext/erpnext/regional/doctype/gstr_3b_report/gstr_3b_report.html,Net ITC Available(A) - (B),Pieejams neto ITC (A) - (B)
 apps/erpnext/erpnext/education/doctype/fee_schedule/fee_schedule.js,Create Fees,Izveidot maksas
 DocType: Project,Total Purchase Cost (via Purchase Invoice),Total Cost iegāde (via pirkuma rēķina)
@@ -5143,6 +5155,7 @@
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.js,Message Sent,Ziņojums nosūtīts
 apps/erpnext/erpnext/accounts/doctype/account/account.py,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/assets/report/fixed_asset_register/fixed_asset_register.py,Vendor Name,Pārdevēja nosaukums
 DocType: Quiz Result,Wrong,Nepareizi
 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)
@@ -5387,6 +5400,7 @@
 DocType: Stock Settings,Auto Material Request,Auto Materiāls Pieprasījums
 DocType: Woocommerce Settings,API consumer secret,API patērētāju noslēpums
 DocType: Delivery Note Item,Available Batch Qty at From Warehouse,Pieejams Partijas Daudz at No noliktavas
+,Received Qty Amount,Saņemts daudzums
 DocType: Salary Slip,Gross Pay - Total Deduction - Loan Repayment,Gross Pay - Kopā atskaitīšana - Kredīta atmaksas
 DocType: Bank Account,Last Integration Date,Pēdējais integrācijas datums
 DocType: Expense Claim,Expense Taxes and Charges,Izdevumu nodokļi un nodevas
@@ -5850,6 +5864,8 @@
 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,Please select Qty against item {0},"Lūdzu, izvēlieties Qty pret vienumu {0}"
+apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py,Latest Age,Jaunākais vecums
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js,Transfer Material to Supplier,Transfer Materiāls piegādātājam
 apps/erpnext/erpnext/hr/report/loan_repayment/loan_repayment.py,EMI,EMI
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py,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)
@@ -5873,7 +5889,6 @@
 apps/erpnext/erpnext/hr/doctype/employee_benefit_application/employee_benefit_application.py,"An amount of {0} already claimed for the component {1},\
 						 set the amount equal or greater than {2}","Summa {0}, kas jau ir pieprasīta komponentam {1}, \ nosaka summu, kas ir vienāda vai lielāka par {2}"
 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
 DocType: BOM Update Tool,The new BOM after replacement,Jaunais BOM pēc nomaiņas
 ,Point of Sale,Point of Sale
@@ -5995,7 +6010,6 @@
 DocType: Purchase Order Item,Blanket Order Rate,Sega pasūtījuma likme
 ,Customer Ledger Summary,Klienta virsgrāmatas kopsavilkums
 apps/erpnext/erpnext/hooks.py,Certification,Sertifikācija
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js,Are you sure you want to make debit note?,Vai tiešām vēlaties veikt debeta piezīmi?
 DocType: Bank Guarantee,Clauses and Conditions,Klauzulas un nosacījumi
 DocType: Serial No,Creation Document Type,Izveide Dokumenta tips
 DocType: Amazon MWS Settings,ES,ES
@@ -6033,8 +6047,6 @@
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py,Financial Services,Finanšu pakalpojumi
 DocType: Student Sibling,Student ID,Student ID
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.js,For Quantity must be greater than zero,Daudzumam jābūt lielākam par nulli
-apps/erpnext/erpnext/hr/doctype/employee_transfer/employee_transfer.py,"Please delete the Employee <a href=""#Form/Employee/{0}"">{0}</a>\
-					to cancel this document","Lūdzu, izdzēsiet darbinieku <a href=""#Form/Employee/{0}"">{0}</a> \, lai atceltu šo dokumentu"
 apps/erpnext/erpnext/config/projects.py,Types of activities for Time Logs,Darbības veidi Time Baļķi
 DocType: Opening Invoice Creation Tool,Sales,Pārdevums
 DocType: Stock Entry Detail,Basic Amount,Pamatsumma
@@ -6113,6 +6125,7 @@
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py,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,Send Supplier Emails,Nosūtīt Piegādātāja e-pastu
+DocType: Asset Movement,ACC-ASM-.YYYY.-,ACC-ASM-.GGGG.-
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py,"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
 apps/erpnext/erpnext/hr/doctype/employee_onboarding/employee_onboarding.py,Submit this to create the Employee record,"Iesniedziet to, lai izveidotu darbinieku ierakstu"
@@ -6193,7 +6206,6 @@
 DocType: Sales Team,Contact No.,Contact No.
 apps/erpnext/erpnext/templates/includes/cart/cart_address.html,Billing Address is same as Shipping Address,Norēķinu adrese ir tāda pati kā piegādes adrese
 DocType: Bank Reconciliation,Payment Entries,maksājumu Ieraksti
-apps/erpnext/erpnext/erpnext_integrations/doctype/shopify_settings/shopify_settings.py,Access token or Shopify URL missing,Trūkst pieejas marķiera vai Shopify numura
 DocType: Location,Latitude,Platums
 DocType: Work Order,Scrap Warehouse,lūžņi Noliktava
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py,"Warehouse required at Row No {0}, please set default warehouse for the item {1} for the company {2}","Vajadzīga noliktava rindā Nr. {0}, lūdzu, iestatiet noklusēto noliktavas vienumu {1} uzņēmumam {2}"
@@ -6238,7 +6250,6 @@
 DocType: Job Offer Term,Value / Description,Vērtība / Apraksts
 apps/erpnext/erpnext/controllers/accounts_controller.py,"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
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js,Are you sure you want to make credit note?,Vai tiešām vēlaties veikt kredītvēsturi?
 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,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}.
@@ -6363,6 +6374,7 @@
 DocType: Purchase Invoice,Taxes and Charges Added,Nodokļi un maksājumi Pievienoja
 apps/erpnext/erpnext/assets/doctype/asset/asset.py,Depreciation Row {0}: Next Depreciation Date cannot be before Available-for-use Date,Nolietojuma rinda {0}: Nākamais nolietojuma datums nevar būt pirms pieejamā datuma
 ,Sales Funnel,Pārdošanas piltuve
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Item Code &gt; Item Group &gt; Brand,Preces kods&gt; Vienību grupa&gt; Zīmols
 apps/erpnext/erpnext/setup/doctype/company/company.py,Abbreviation is mandatory,Saīsinājums ir obligāta
 DocType: Project,Task Progress,uzdevums Progress
 apps/erpnext/erpnext/templates/includes/navbar/navbar_items.html,Cart,Rati
@@ -6608,6 +6620,7 @@
 DocType: Employee Grade,Employee Grade,Darbinieku novērtējums
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py,Piecework,Gabaldarbs
 DocType: GSTR 3B Report,June,jūnijs
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Supplier &gt; Supplier Type,Piegādātājs&gt; Piegādātāja tips
 DocType: Share Balance,From No,No Nr
 DocType: Shift Type,Early Exit Grace Period,Agrīnās izejas labvēlības periods
 DocType: Task,Actual Time (in Hours),Faktiskais laiks (stundās)
@@ -6894,6 +6907,7 @@
 DocType: Warehouse,Warehouse Name,Noliktavas nosaukums
 DocType: Naming Series,Select Transaction,Izvēlieties Transaction
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py,Please enter Approving Role or Approving User,Ievadiet apstiprināšana loma vai apstiprināšana lietotāju
+apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.py,UOM Conversion factor ({0} -&gt; {1}) not found for item: {2},Vienumam: {2} nav atrasts UOM konversijas koeficients ({0} -&gt; {1}).
 apps/erpnext/erpnext/support/doctype/service_level_agreement/service_level_agreement.py,Service Level Agreement with Entity Type {0} and Entity {1} already exists.,Pakalpojuma līmeņa līgums ar entītijas veidu {0} un entītiju {1} jau pastāv.
 DocType: Journal Entry,Write Off Entry,Uzrakstiet Off Entry
 DocType: BOM,Rate Of Materials Based On,Novērtējiet materiālu specifikācijas Based On
@@ -7085,6 +7099,7 @@
 DocType: Quality Inspection Reading,Quality Inspection Reading,Kvalitātes pārbaudes Reading
 apps/erpnext/erpnext/stock/doctype/stock_settings/stock_settings.py,`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/stock/report/stock_balance/stock_balance.py,Earliest Age,Agrākais vecums
 apps/erpnext/erpnext/utilities/user_progress.py,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."
 DocType: Quality Goal,Revision,Pārskatīšana
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js,Healthcare Services,Veselības aprūpes pakalpojumi
@@ -7128,6 +7143,7 @@
 apps/erpnext/erpnext/healthcare/doctype/patient_encounter/patient_encounter.js,Schedule Discharge,Grafiks izlaidums
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py,Cheques and Deposits incorrectly cleared,Čeki un noguldījumi nepareizi noskaidroti
 DocType: Homepage Section Card,Homepage Section Card,Mājas lapas sadaļas karte
+,Amount To Be Billed,Rēķina summa
 apps/erpnext/erpnext/accounts/doctype/account/account.py,Account {0}: You can not assign itself as parent account,Konts {0}: Jūs nevarat piešķirt sevi kā mātes kontu
 DocType: Purchase Invoice Item,Price List Rate,Cenrādis Rate
 apps/erpnext/erpnext/utilities/activation.py,Create customer quotes,Izveidot klientu citātus
@@ -7180,6 +7196,7 @@
 DocType: Supplier Scorecard Criteria,Supplier Scorecard Criteria,Piegādātāju vērtēšanas kritēriju kritēriji
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py,Please select Start Date and End Date for Item {0},"Lūdzu, izvēlieties sākuma datumu un beigu datums postenim {0}"
 DocType: Maintenance Schedule,MAT-MSH-.YYYY.-,MAT-MSH-.YYYY.-
+,Amount to Receive,Saņemtā summa
 apps/erpnext/erpnext/education/doctype/student_group_creation_tool/student_group_creation_tool.py,Course is mandatory in row {0},Kurss ir obligāta kārtas {0}
 apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py,From date can not be greater than than To date,"Sākot no datuma, nevar būt lielāks par datumu"
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py,To date cannot be before from date,Līdz šim nevar būt agrāk no dienas
@@ -7430,7 +7447,6 @@
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js,BOM and Manufacturing Quantity are required,BOM un ražošana daudzums ir nepieciešami
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js,Ageing Range 2,Novecošana Range 2
 DocType: SG Creation Tool Course,Max Strength,Max Stiprums
-apps/erpnext/erpnext/accounts/doctype/account/account.py,"Account {0} already exists in child company {1}. The following fields have different values, they should be same:<ul><li>{2}</li></ul>","Konts {0} jau pastāv bērnu uzņēmumā {1}. Šiem laukiem ir dažādas vērtības, tiem jābūt vienādiem: <ul><li> {2} </li></ul>"
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py,Installing presets,Iepriekš iestatīto instalēšana
 DocType: Fee Schedule,EDU-FSH-.YYYY.-,EDU-FSH-.YYYY.-
 apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js,No Delivery Note selected for Customer {},Klientam nav izvēlēta piegādes piezīme {}
@@ -7642,6 +7658,7 @@
 DocType: Delivery Note,Print Without Amount,Izdrukāt Bez summa
 apps/erpnext/erpnext/accounts/report/asset_depreciation_ledger/asset_depreciation_ledger.py,Depreciation Date,nolietojums datums
 ,Work Orders in Progress,Darba uzdevumi tiek veikti
+DocType: Customer Credit Limit,Bypass Credit Limit Check,Apiet kredītlimita pārbaudi
 DocType: Issue,Support Team,Atbalsta komanda
 apps/erpnext/erpnext/stock/report/batch_item_expiry_status/batch_item_expiry_status.py,Expiry (In Days),Derīguma (dienās)
 DocType: Appraisal,Total Score (Out of 5),Total Score (no 5)
@@ -7828,6 +7845,7 @@
 DocType: Sales Invoice,Customer GSTIN,Klientu GSTIN
 DocType: Crop Cycle,List of diseases detected on the field. When selected it'll automatically add a list of tasks to deal with the disease ,"Laukā konstatēto slimību saraksts. Pēc izvēles tas automātiski pievienos uzdevumu sarakstu, lai risinātu šo slimību"
 apps/erpnext/erpnext/manufacturing/page/bom_comparison_tool/bom_comparison_tool.js,BOM 1,1. BOM
+apps/erpnext/erpnext/assets/report/fixed_asset_register/fixed_asset_register.py,Asset Id,Īpašuma ID
 apps/erpnext/erpnext/healthcare/doctype/healthcare_service_unit/healthcare_service_unit.js,This is a root healthcare service unit and cannot be edited.,"Šī ir galvenā veselības aprūpes pakalpojumu vienība, un to nevar rediģēt."
 DocType: Asset Repair,Repair Status,Remonta stāvoklis
 apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.js,"Requested Qty: Quantity requested for purchase, but not ordered.","Pieprasītais daudzums iegādei, bet nepasūta: pieprasīts Daudz."
diff --git a/erpnext/translations/mk.csv b/erpnext/translations/mk.csv
index 315ebb2..671a670 100644
--- a/erpnext/translations/mk.csv
+++ b/erpnext/translations/mk.csv
@@ -287,7 +287,6 @@
 DocType: Loan,Repay Over Number of Periods,Отплати текот број на периоди
 apps/erpnext/erpnext/manufacturing/report/bom_stock_report/bom_stock_report.py,Quantity to Produce can not be less than Zero,Количината за производство не може да биде помала од Нулта
 DocType: Stock Entry,Additional Costs,Е вклучена во цената
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Customer &gt; Customer Group &gt; Territory,Клиент&gt; Група на клиенти&gt; Територија
 apps/erpnext/erpnext/accounts/doctype/account/account.py,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 за студентите во студентските група
@@ -583,6 +582,7 @@
 DocType: Healthcare Settings,Create documents for sample collection,Креирајте документи за собирање примероци
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py,Payment against {0} {1} cannot be greater than Outstanding Amount {2},Плаќање против {0} {1} не може да биде поголем од преостанатиот износ за наплата {2}
 apps/erpnext/erpnext/patches/v11_0/add_healthcare_service_unit_tree_root.py,All Healthcare Service Units,Сите единици за здравствена заштита
+apps/erpnext/erpnext/setup/default_energy_point_rules.py,On Converting Opportunity,На можност за претворање
 DocType: Bank Account,Address HTML,HTML адреса
 DocType: Lead,Mobile No.,Мобилен број
 apps/erpnext/erpnext/selling/doctype/pos_closing_voucher/closing_voucher_details.html,Mode of Payments,Начин на плаќање
@@ -647,7 +647,6 @@
 DocType: Accounting Dimension,Dimension Name,Име на димензија
 apps/erpnext/erpnext/healthcare/setup.py,Resistant,Отпорна
 apps/erpnext/erpnext/hotels/doctype/hotel_room_reservation/hotel_room_reservation.py,Please set Hotel Room Rate on {},Те молам постави го Hotel Room Rate на {}
-apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py,Please setup numbering series for Attendance via Setup &gt; Numbering Series,Поставете серија за нумерирање за присуство преку Поставување&gt; Серии за нумерирање
 DocType: Journal Entry,Multi Currency,Мулти Валута
 DocType: Bank Statement Transaction Invoice Item,Invoice Type,Тип на фактура
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py,Valid from date must be less than valid upto date,Валиден од датумот мора да биде помал од важечкиот до датумот
@@ -763,6 +762,7 @@
 apps/erpnext/erpnext/accounts/page/pos/pos.js,Create a new Customer,Креирај нов клиент
 apps/erpnext/erpnext/non_profit/report/expiring_memberships/expiring_memberships.py,Expiring On,Истекува на
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,"If multiple Pricing Rules continue to prevail, users are asked to set Priority manually to resolve conflict.","Ако има повеќе Правила Цените и понатаму преовладуваат, корисниците се бара да поставите приоритет рачно за решавање на конфликтот."
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js,Purchase Return,Купување Враќање
 apps/erpnext/erpnext/utilities/activation.py,Create Purchase Orders,Создаде купување на налози
 ,Purchase Register,Купување Регистрирај се
 apps/erpnext/erpnext/healthcare/doctype/patient/patient.py,Patient not found,Пациентот не е пронајден
@@ -777,7 +777,6 @@
 DocType: Location,Area UOM,Површина UOM
 apps/erpnext/erpnext/manufacturing/doctype/workstation/workstation.py,Workstation is closed on the following dates as per Holiday List: {0},Работна станица е затворена на следните датуми како на летни Листа на: {0}
 apps/erpnext/erpnext/selling/page/sales_funnel/sales_funnel.py,Opportunities,Можности
-apps/erpnext/erpnext/www/all-products/index.html,Clear filters,Исчистете филтри
 DocType: Lab Test Template,Single,Еден
 DocType: Compensatory Leave Request,Work From Date,Работа од датум
 DocType: Salary Slip,Total Loan Repayment,Вкупно кредит Отплата
@@ -821,6 +820,7 @@
 apps/erpnext/erpnext/education/doctype/program_enrollment_tool/program_enrollment_tool.py,Mandatory field - Academic Year,Задолжително поле - академска година
 apps/erpnext/erpnext/education/doctype/program_enrollment_tool/program_enrollment_tool.py,Mandatory field - Academic Year,Задолжително поле - академска година
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py,{0} {1} is not associated with {2} {3},{0} {1} не е поврзан со {2} {3}
+DocType: Opportunity,Converted By,Претворено од
 apps/erpnext/erpnext/public/js/hub/components/ReviewArea.vue,You need to login as a Marketplace User before you can add any reviews.,Треба да се најавите како Корисник на пазарот пред да додадете коментари.
 apps/erpnext/erpnext/manufacturing/doctype/job_card/job_card.py,Row {0} : Operation is required against the raw material item {1},Ред {0}: Операцијата е потребна против елементот суровина {1}
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py,Please set default payable account for the company {0},Поставете стандардно треба да се плати сметка за компанијата {0}
@@ -846,6 +846,8 @@
 DocType: Sales Invoice,Total Qty,Вкупно Количина
 apps/erpnext/erpnext/education/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py,Guardian2 Email ID,Guardian2 e-mail проект
 apps/erpnext/erpnext/education/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py,Guardian2 Email ID,Guardian2 e-mail проект
+apps/erpnext/erpnext/hr/doctype/employee_transfer/employee_transfer.py,"Please delete the Employee <a href=""#Form/Employee/{0}"">{0}</a>\
+					to cancel this document","Избришете го вработениот <a href=""#Form/Employee/{0}"">{0}</a> \ за да го откажете овој документ"
 DocType: Item,Show in Website (Variant),Прикажи во веб-страница (варијанта)
 DocType: Employee,Health Concerns,Здравствени проблеми
 DocType: Payroll Entry,Select Payroll Period,Изберете Даноци Период
@@ -905,7 +907,6 @@
 apps/erpnext/erpnext/education/doctype/student_group/student_group.py,Please select Course,Ве молиме изберете курсот
 DocType: Codification Table,Codification Table,Табела за кодификација
 DocType: Timesheet Detail,Hrs,часот
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js,Please select Company,Ве молиме изберете ја компанијата
 DocType: Employee Skill,Employee Skill,Вештина на вработените
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.js,Difference Account,Разликата профил
 DocType: Pricing Rule,Discount on Other Item,Попуст на друга ставка
@@ -974,6 +975,7 @@
 DocType: BOM,Operating Cost,Оперативните трошоци
 DocType: Crop,Produced Items,Произведени предмети
 DocType: Bank Statement Transaction Entry,Match Transaction to Invoices,Трансферот на натпревар на фактури
+apps/erpnext/erpnext/erpnext_integrations/exotel_integration.py,Error in Exotel incoming call,Грешка во дојдовниот повик во Exotel
 DocType: Sales Order Item,Gross Profit,Бруто добивка
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js,Unblock Invoice,Деблокирај фактура
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py,Increment cannot be 0,Зголемување не може да биде 0
@@ -1185,6 +1187,7 @@
 DocType: Activity Cost,Activity Type,Тип на активност
 DocType: Request for Quotation,For individual supplier,За индивидуални снабдувач
 DocType: BOM Operation,Base Hour Rate(Company Currency),База час стапка (Фирма валута)
+,Qty To Be Billed,Количина за да се плати
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py,Delivered Amount,Дадени Износ
 apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.js,Reserved Qty for Production: Raw materials quantity to make manufacturing items.,Резервирана количина за производство: Количина на суровини за производство на производи.
 DocType: Loyalty Point Entry Redemption,Redemption Date,Датум на откуп
@@ -1306,7 +1309,7 @@
 apps/erpnext/erpnext/education/doctype/student_group/student_group.py,Please select Program,Ве молиме одберете програма
 apps/erpnext/erpnext/education/doctype/student_group/student_group.py,Please select Program,Ве молиме одберете програма
 DocType: Project,Estimated Cost,Проценетите трошоци
-DocType: Request for Quotation,Link to material requests,Линк материјал барања
+DocType: Supplier Quotation,Link to material requests,Линк материјал барања
 apps/erpnext/erpnext/public/js/hub/pages/Publish.vue,Publish,Објавете
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py,Aerospace,Воздухопловна
 ,Fichier des Ecritures Comptables [FEC],Fichier des Ecritures Comptables [FEC]
@@ -1319,6 +1322,7 @@
 apps/erpnext/erpnext/utilities/transaction_base.py,Invalid Posting Time,Невалидно време за објавување
 DocType: Salary Component,Condition and Formula,Состојба и формула
 DocType: Lead,Campaign Name,Име на кампања
+apps/erpnext/erpnext/setup/default_energy_point_rules.py,On Task Completion,Завршување на задачите
 apps/erpnext/erpnext/hr/doctype/compensatory_leave_request/compensatory_leave_request.py,There is no leave period in between {0} and {1},Нема период за одмор помеѓу {0} и {1}
 DocType: Fee Validity,Healthcare Practitioner,Здравствениот лекар
 DocType: Hotel Room,Capacity,Капацитет
@@ -1662,7 +1666,6 @@
 DocType: Quality Feedback Template,Quality Feedback Template,Шаблон за повратни информации за квалитет
 apps/erpnext/erpnext/config/education.py,LMS Activity,Активност на LMS
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py,Internet Publishing,Интернет издаваштво
-DocType: Prescription Duration,Number,Број
 apps/erpnext/erpnext/accounts/doctype/opening_invoice_creation_tool/opening_invoice_creation_tool.js,Creating {0} Invoice,Создавање {0} Фактура
 DocType: Medical Code,Medical Code Standard,Медицински законик стандард
 DocType: Soil Texture,Clay Composition (%),Состав на глина (%)
@@ -1737,6 +1740,7 @@
 DocType: Support Settings,Get Started Sections,Започни секции
 DocType: Lead,CRM-LEAD-.YYYY.-,CRM-LEAD-.YYYY.-
 DocType: Invoice Discounting,Sanctioned,санкционирани
+,Base Amount,Основна сума
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.js,Total Contribution Amount: {0},Вкупен износ на придонес: {0}
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py,Row #{0}: Please specify Serial No for Item {1},Ред # {0}: Ве молиме наведете Сериски Не за Точка {1}
 DocType: Payroll Entry,Salary Slips Submitted,План за плати поднесен
@@ -1959,6 +1963,7 @@
 DocType: Accounting Dimension,Dimension Defaults,Димензии стандардно
 apps/erpnext/erpnext/crm/report/prospects_engaged_but_not_converted/prospects_engaged_but_not_converted.js,Minimum Lead Age (Days),Минимална олово време (денови)
 apps/erpnext/erpnext/crm/report/prospects_engaged_but_not_converted/prospects_engaged_but_not_converted.js,Minimum Lead Age (Days),Минимална олово време (денови)
+apps/erpnext/erpnext/assets/report/fixed_asset_register/fixed_asset_register.py,Available For Use Date,Достапен за употреба Датум
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py,All BOMs,сите BOMs
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js,Create Inter Company Journal Entry,Креирај Влез во списанието Интер компанија
 DocType: Company,Parent Company,Родителска компанија
@@ -2137,6 +2142,7 @@
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js,Make Stock Entry,Направете запис на акции
 DocType: Hotel Room Reservation,Hotel Reservation User,Корисник за резервација на хотел
 apps/erpnext/erpnext/projects/doctype/project/project.js,Set Status,Поставете статус
+apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py,Please setup numbering series for Attendance via Setup &gt; Numbering Series,Поставете серија за нумерирање за присуство преку Поставување&gt; Серии за нумерирање
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py,Please select prefix first,Ве молиме изберете префикс прв
 DocType: Contract,Fulfilment Deadline,Рок на исполнување
 apps/erpnext/erpnext/public/js/hub/pages/Home.vue,Near you,Во близина на тебе
@@ -2152,6 +2158,7 @@
 DocType: Announcement,All Students,сите студенти
 apps/erpnext/erpnext/assets/doctype/asset/asset.py,Item {0} must be a non-stock item,Ставка {0} мора да биде не-складишни ставки
 apps/erpnext/erpnext/stock/doctype/batch/batch.js,View Ledger,Види Леџер
+DocType: Cost Center,Lft,Lft
 DocType: Grading Scale,Intervals,интервали
 DocType: Bank Statement Transaction Entry,Reconciled Transactions,Усогласени трансакции
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py,Earliest,Први
@@ -2266,6 +2273,7 @@
 apps/erpnext/erpnext/hr/doctype/employee_benefit_application/employee_benefit_application.py,As per your assigned Salary Structure you cannot apply for benefits,Според вашата распределена платежна структура не можете да аплицирате за бенефиции
 apps/erpnext/erpnext/stock/doctype/item/item.py,Website Image should be a public file or website URL,Веб-страница на слика треба да биде јавен датотеката или URL на веб страната
 DocType: Purchase Invoice Item,BOM,BOM (Список на материјали)
+apps/erpnext/erpnext/stock/doctype/item/item.py,Duplicate entry in Manufacturers table,Двоен влез во табелата на производители
 apps/erpnext/erpnext/setup/doctype/item_group/item_group.js,This is a root item group and cannot be edited.,Ова е корен елемент група и не може да се уредува.
 apps/erpnext/erpnext/accounts/doctype/account/account.js,Merge,Спојување
 DocType: Journal Entry Account,Purchase Order,Нарачката
@@ -2409,7 +2417,6 @@
 DocType: Asset,Depreciation Schedules,амортизација Распоред
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.js,Create Sales Invoice,Создадете фактура за продажба
 apps/erpnext/erpnext/regional/doctype/gstr_3b_report/gstr_3b_report.html,Ineligible ITC,Неподобен ITC
-apps/erpnext/erpnext/erpnext_integrations/doctype/shopify_settings/shopify_settings.py,"Support for public app is deprecated. Please setup private app, for more details refer user manual","Поддршката за јавна апликација е застарена. Поставете приватна апликација, за повеќе детали упатете го упатството за користење"
 DocType: Task,Dependent Tasks,Зависни задачи
 apps/erpnext/erpnext/regional/report/gstr_1/gstr_1.py,Following accounts might be selected in GST Settings:,Следните сметки може да бидат избрани во GST Settings:
 apps/erpnext/erpnext/manufacturing/report/bom_stock_report/bom_stock_report.js,Quantity to Produce,Количина за производство
@@ -2658,6 +2665,7 @@
 DocType: Water Analysis,Container,Контејнер
 apps/erpnext/erpnext/regional/report/gstr_1/gstr_1.py,Please set valid GSTIN No. in Company Address,Поставете валиден број на GSTIN на адреса на компанијата
 apps/erpnext/erpnext/education/utils.py,Student {0} - {1} appears Multiple times in row {2} & {3},Студентски {0} - {1} се појавува неколку пати по ред и {2} {3}
+apps/erpnext/erpnext/selling/doctype/customer/customer.py,Following fields are mandatory to create address:,Следниве полиња се задолжителни за креирање адреса:
 DocType: Item Alternative,Two-way,Двонасочен
 DocType: Item,Manufacturers,Производители
 ,Employee Billing Summary,Резиме за наплата на вработените
@@ -2732,9 +2740,9 @@
 DocType: Employee,HR-EMP-,HR-EMP-
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py,User {0} doesn't have any default POS Profile. Check Default at Row {1} for this User.,Корисникот {0} нема стандарден POS профил. Проверете стандардно на редот {1} за овој корисник.
 DocType: Quality Meeting Minutes,Quality Meeting Minutes,Минути за состаноци за квалитет
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Supplier &gt; Supplier Type,Добавувач&gt; Тип на снабдувач
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py,Employee Referral,Препораки за вработените
 DocType: Student Group,Set 0 for no limit,Поставете 0 за да нема ограничување
+DocType: Cost Center,rgt,rgt
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py,The day(s) on which you are applying for leave are holidays. You need not apply for leave.,Ден (а) на која аплицирате за дозвола се одмори. Вие не треба да аплицираат за одмор.
 DocType: Customer,Primary Address and Contact Detail,Примарна адреса и контакт детали
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.js,Resend Payment Email,Препратат на плаќање E-mail
@@ -2843,7 +2851,6 @@
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py,Against Supplier Invoice {0} dated {1},Против Добавувачот Фактура {0} датум {1}
 DocType: Customer,Default Price List,Стандардно Ценовник
 apps/erpnext/erpnext/assets/doctype/asset/asset.py,Asset Movement record {0} created,рекорд движење средства {0} создадена
-apps/erpnext/erpnext/utilities/page/leaderboard/leaderboard.js,No items found.,Нема пронајдени предмети.
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py,You cannot delete Fiscal Year {0}. Fiscal Year {0} is set as default in Global Settings,Не може да избришете фискалната {0}. Фискалната година {0} е поставена како стандардна во глобалните поставувања
 DocType: Share Transfer,Equity/Liability Account,Сметка за акционерски капитал / одговорност
 apps/erpnext/erpnext/setup/doctype/customer_group/customer_group.py,A customer with the same name already exists,Потрошувач со исто име веќе постои
@@ -2859,6 +2866,7 @@
 apps/erpnext/erpnext/selling/doctype/customer/customer.py,Credit limit has been crossed for customer {0} ({1}/{2}),Кредитниот лимит е преминал за клиент {0} ({1} / {2})
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py,Customer required for 'Customerwise Discount',Клиент потребни за &quot;Customerwise попуст&quot;
 apps/erpnext/erpnext/config/accounting.py,Update bank payment dates with journals.,Ажурирање на датуми банка плаќање со списанија.
+,Billed Qty,Фактурирана количина
 apps/erpnext/erpnext/stock/doctype/item/item_dashboard.py,Pricing,цените
 DocType: Employee,Attendance Device ID (Biometric/RF tag ID),ID на уредот за посетеност (биометриски / RF ознака за означување)
 DocType: Quotation,Term Details,Рок Детали за
@@ -2882,6 +2890,7 @@
 DocType: Share Transfer,Asset Account,Сметка на средства
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js,New release date should be in the future,Новиот датум на објавување треба да биде во иднина
 DocType: Purchase Invoice,End date of current invoice's period,Датум на завршување на периодот тековната сметка е
+apps/erpnext/erpnext/hr/doctype/employee/employee.py,Please setup Employee Naming System in Human Resource &gt; HR Settings,Поставете го системот за именување на вработените во човечки ресурси&gt; Поставки за човечки ресурси
 DocType: Lab Test,Technician Name,Име на техничар
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py,"Cannot ensure delivery by Serial No as \
 					Item {0} is added with and without Ensure Delivery by \
@@ -2889,6 +2898,7 @@
 DocType: Accounts Settings,Unlink Payment on Cancellation of Invoice,Прекин на врска плаќање за поништување на Фактура
 DocType: Bank Reconciliation,From Date,Од Датум
 apps/erpnext/erpnext/hr/doctype/vehicle_log/vehicle_log.py,Current Odometer reading entered should be greater than initial Vehicle Odometer {0},Тековни километражата влезе треба да биде поголема од првичната возила Километража {0}
+,Purchase Order Items To Be Received or Billed,Набавете предмети за нарачката што треба да се примат или фактурираат
 DocType: Restaurant Reservation,No Show,Нема шоу
 apps/erpnext/erpnext/regional/india/utils.py,You must be a registered supplier to generate e-Way Bill,Мора да бидете регистриран снабдувач за да генерирате сметка за е-начин
 DocType: Shipping Rule Country,Shipping Rule Country,Превозот Правило Земја
@@ -2929,6 +2939,7 @@
 apps/erpnext/erpnext/templates/generators/item/item_add_to_cart.html,View in Cart,Види во кошничката
 DocType: Employee Checkin,Shift Actual Start,Shift Actual Start
 DocType: Tally Migration,Is Day Book Data Imported,Дали се увезуваат податоци за дневна книга
+,Purchase Order Items To Be Received or Billed1,Набавка на артиклите за нарачката што треба да се примат или да се фактурираат
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py,Marketing Expenses,Маркетинг трошоци
 apps/erpnext/erpnext/stock/doctype/pick_list/pick_list.py,{0} units of {1} is not available.,{0} единици од {1} не се достапни.
 ,Item Shortage Report,Точка Недостаток Извештај
@@ -3156,7 +3167,6 @@
 apps/erpnext/erpnext/public/js/call_popup/call_popup.js,View all issues from {0},Погледнете ги сите проблеми од {0}
 DocType: Quality Inspection,MAT-QA-.YYYY.-,МАТ-QA-.YYYY.-
 DocType: Quality Meeting Table,Quality Meeting Table,Табела за состаноци за квалитет
-apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,Поставете Серија за именување за {0} преку Поставување&gt; Поставки&gt; Серии за именување
 apps/erpnext/erpnext/templates/pages/help.html,Visit the forums,Посетете ги форумите
 DocType: Student,Student Mobile Number,Студентски мобилен број
 DocType: Item,Has Variants,Има варијанти
@@ -3300,6 +3310,7 @@
 ,Campaign Efficiency,Ефикасноста кампања
 ,Campaign Efficiency,Ефикасноста кампања
 DocType: Discussion,Discussion,дискусија
+apps/erpnext/erpnext/setup/default_energy_point_rules.py,On Sales Order Submission,На поднесување на налог за продажба
 DocType: Bank Transaction,Transaction ID,трансакција проект
 DocType: Payroll Entry,Deduct Tax For Unsubmitted Tax Exemption Proof,Даночен данок за доказ за непотполно ослободување од данок
 DocType: Volunteer,Anytime,Во секое време
@@ -3307,7 +3318,6 @@
 DocType: Employee Tax Exemption Proof Submission,Employee Tax Exemption Proof Submission,Поднесување на доказ за ослободување од плаќање на вработените
 DocType: Patient,Surgical History,Хируршка историја
 DocType: Bank Statement Settings Item,Mapped Header,Мапирана насловот
-apps/erpnext/erpnext/hr/doctype/employee/employee.py,Please setup Employee Naming System in Human Resource &gt; HR Settings,Поставете го системот за именување на вработените во човечки ресурси&gt; Поставки за човечки ресурси
 DocType: Employee,Resignation Letter Date,Оставка писмо Датум
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Pricing Rules are further filtered based on quantity.,Правила цените се уште се филтрирани врз основа на квантитетот.
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py,Please set the Date Of Joining for employee {0},Поставете го датумот на пристап за вработените {0}
@@ -3322,6 +3332,7 @@
 DocType: Bank Statement Settings,Mapped Items,Мапирани ставки
 DocType: Amazon MWS Settings,IT,ИТ
 DocType: Chapter,Chapter,Поглавје
+,Fixed Asset Register,Регистар на фиксни средства
 apps/erpnext/erpnext/utilities/user_progress.py,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,Select BOM and Qty for Production,Изберете BOM и Количина за производство
@@ -3453,7 +3464,6 @@
 apps/erpnext/erpnext/templates/emails/reorder_item.html,Following Material Requests have been raised automatically based on Item's re-order level,Следните Материјал Барања биле воспитани автоматски врз основа на нивото повторно цел елемент
 apps/erpnext/erpnext/controllers/accounts_controller.py,Account {0} is invalid. Account Currency must be {1},Сметка {0} не е валиден. Валута сметка мора да биде {1}
 apps/erpnext/erpnext/hr/doctype/salary_structure_assignment/salary_structure_assignment.py,From Date {0} cannot be after employee's relieving Date {1},Од датумот {0} не може да биде по ослободување на вработениот Датум {1}
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py,Debit Note {0} has been created automatically,Дебитна белешка {0} е креирана автоматски
 apps/erpnext/erpnext/accounts/doctype/payment_order/payment_order.js,Create Payment Entries,Креирај записи за плаќање
 DocType: Supplier,Is Internal Supplier,Е внатрешен снабдувач
 DocType: Employee,Create User Permission,Креирај дозвола за корисници
@@ -4236,7 +4246,6 @@
 DocType: Journal Entry,Accounting Entries,Сметководствени записи
 DocType: Job Card Time Log,Job Card Time Log,Вклучен часовник со картички за работни места
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,"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;."
-apps/erpnext/erpnext/education/doctype/instructor/instructor.py,Please setup Instructor Naming System in Education &gt; Education Settings,"Ве молиме, поставете Систем за именување на инструктори во образованието&gt; Поставки за образование"
 DocType: Journal Entry,Paid Loan,Платен заем
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py,Duplicate Entry. Please check Authorization Rule {0},Дупликат внес. Ве молиме проверете Овластување Правило {0}
 DocType: Journal Entry Account,Reference Due Date,Референтен датум на достасување
@@ -4253,7 +4262,6 @@
 apps/erpnext/erpnext/templates/pages/projects.html,No time sheets,Нема време листови
 DocType: GoCardless Mandate,GoCardless Customer,GoCardless клиент
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py,Leave Type {0} cannot be carry-forwarded,Остави Тип {0} не може да се носат-пренасочат
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Item Code &gt; Item Group &gt; Brand,Код на точка&gt; Група на производи&gt; Бренд
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py,Maintenance Schedule is not generated for all the items. Please click on 'Generate Schedule',Распоред за одржување не е генерирана за сите предмети. Ве молиме кликнете на &quot;Генерирање Распоред &#39;
 ,To Produce,Да произведе
 DocType: Leave Encashment,Payroll,Даноци
@@ -4367,7 +4375,6 @@
 DocType: Stock Ledger Entry,Actual Qty After Transaction,Крај Количина По трансакцијата
 ,Pending SO Items For Purchase Request,Во очекување на ПА Теми за купување Барање
 apps/erpnext/erpnext/education/doctype/student_admission/student_admission.py,Student Admissions,студент Запишување
-apps/erpnext/erpnext/accounts/party.py,{0} {1} is disabled,{0} {1} е исклучен
 DocType: Supplier,Billing Currency,Платежна валута
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py,Extra Large,Extra Large
 DocType: Loan,Loan Application,Апликација за заем
@@ -4444,7 +4451,6 @@
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py,Only Leave Applications with status 'Approved' and 'Rejected' can be submitted,Оставете само апликации со статус &#39;одобрена &quot;и&quot; Отфрлени &quot;може да се поднесе
 apps/erpnext/erpnext/accounts/doctype/accounting_dimension/accounting_dimension.py,Creating Dimensions...,Создавање димензии ...
 apps/erpnext/erpnext/education/doctype/student_group_creation_tool/student_group_creation_tool.py,Student Group Name is mandatory in row {0},Група на студенти Името е задолжително во ред {0}
-DocType: Customer Credit Limit,Bypass credit limit_check,Заобиколи ја кредитната граница
 DocType: Homepage,Products to be shown on website homepage,Производи да бидат прикажани на веб-сајтот почетната страница од пребарувачот
 DocType: HR Settings,Password Policy,Политика за лозинка
 apps/erpnext/erpnext/setup/doctype/customer_group/customer_group.js,This is a root customer group and cannot be edited.,Ова е коренот на клиентите група и не може да се уредува.
@@ -4733,6 +4739,7 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py,Row {0}: Advance against Customer must be credit,Ред {0}: напредување во однос на клиентите мора да бидат кредит
 DocType: Quality Meeting,Quality Meeting,Средба за квалитет
 apps/erpnext/erpnext/accounts/doctype/account/account.js,Non-Group to Group,Не-група до група
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,Поставете Серија за именување за {0} преку Поставување&gt; Поставки&gt; Серии за именување
 DocType: Employee,ERPNext User,ERPNext корисник
 apps/erpnext/erpnext/education/doctype/student_group_creation_tool/student_group_creation_tool.py,Batch is mandatory in row {0},Серија е задолжително во ред {0}
 apps/erpnext/erpnext/education/doctype/student_group_creation_tool/student_group_creation_tool.py,Batch is mandatory in row {0},Серија е задолжително во ред {0}
@@ -5031,6 +5038,7 @@
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py,No {0} found for Inter Company Transactions.,Не {0} пронајдени за интер-трансакции на компанијата.
 DocType: Travel Itinerary,Rented Car,Изнајмен автомобил
 apps/erpnext/erpnext/public/js/hub/components/profile_dialog.js,About your Company,За вашата компанија
+apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.js,Show Stock Ageing Data,Прикажи податоци за стареење на акции
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py,Credit To account must be a Balance Sheet account,Кредит на сметка мора да биде на сметка Биланс на состојба
 DocType: Donor,Donor,Донатор
 DocType: Global Defaults,Disable In Words,Оневозможи со зборови
@@ -5044,8 +5052,10 @@
 DocType: Patient,Patient ID,ID на пациентот
 DocType: Practitioner Schedule,Schedule Name,Распоред име
 DocType: Currency Exchange,For Buying,За купување
+apps/erpnext/erpnext/setup/default_energy_point_rules.py,On Purchase Order Submission,На поднесување налог за набавка
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js,Add All Suppliers,Додај ги сите добавувачи
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py,Row #{0}: Allocated Amount cannot be greater than outstanding amount.,"Ред # {0}: лимит, не може да биде поголем од преостанатиот износ."
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Customer &gt; Customer Group &gt; Territory,Клиент&gt; Група на клиенти&gt; Територија
 DocType: Tally Migration,Parties,Забави
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js,Browse BOM,Преглед на бирото
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py,Secured Loans,Препорачана кредити
@@ -5077,6 +5087,7 @@
 apps/erpnext/erpnext/stock/doctype/item_alternative/item_alternative.py,Not allow to set alternative item for the item {0},Не дозволувајте да поставите алтернативен елемент за ставката {0}
 apps/erpnext/erpnext/hr/doctype/leave_block_list/leave_block_list.py,Date is repeated,Датум се повторува
 apps/erpnext/erpnext/accounts/print_format/payment_receipt_voucher/payment_receipt_voucher.html,Authorized Signatory,Овластен потписник
+apps/erpnext/erpnext/education/doctype/instructor/instructor.py,Please setup Instructor Naming System in Education &gt; Education Settings,"Ве молиме, поставете Систем за именување на инструктори во образованието&gt; Поставки за образование"
 apps/erpnext/erpnext/regional/doctype/gstr_3b_report/gstr_3b_report.html,Net ITC Available(A) - (B),Достапен нето ИТЦ (А) - (Б)
 apps/erpnext/erpnext/education/doctype/fee_schedule/fee_schedule.js,Create Fees,Направете такси
 DocType: Project,Total Purchase Cost (via Purchase Invoice),Вкупен трошок за Набавка (преку Влезна фактура)
@@ -5096,6 +5107,7 @@
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.js,Message Sent,Пораката испратена
 apps/erpnext/erpnext/accounts/doctype/account/account.py,Account with child nodes cannot be set as ledger,Сметка со дете јазли не можат да се постават како Леџер
 DocType: C-Form,II,II
+apps/erpnext/erpnext/assets/report/fixed_asset_register/fixed_asset_register.py,Vendor Name,Име на продавач
 DocType: Quiz Result,Wrong,Погрешно
 DocType: Sales Invoice,Rate at which Price list currency is converted to customer's base currency,Стапка по која Ценовник валута е претворена во основна валута купувачи
 DocType: Purchase Invoice Item,Net Amount (Company Currency),Нето износ (Фирма валута)
@@ -5337,6 +5349,7 @@
 DocType: Stock Settings,Auto Material Request,Авто материјал Барање
 DocType: Woocommerce Settings,API consumer secret,АПИ потрошувачка тајна
 DocType: Delivery Note Item,Available Batch Qty at From Warehouse,Серија на располагање Количина од магацин
+,Received Qty Amount,Доби Количина
 DocType: Salary Slip,Gross Pay - Total Deduction - Loan Repayment,Бруто плата - Вкупно Одбивање - Кредитот пресудите
 DocType: Bank Account,Last Integration Date,Последен датум за интеграција
 DocType: Expense Claim,Expense Taxes and Charges,Даноци и такси
@@ -5792,12 +5805,15 @@
 DocType: Drug Prescription,Hour,Час
 DocType: Restaurant Order Entry,Last Sales Invoice,Последна продажба фактура
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py,Please select Qty against item {0},Ве молиме изберете Кол против ставка {0}
+apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py,Latest Age,Најновата ера
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js,Transfer Material to Supplier,Пренос на материјал за да Добавувачот
 apps/erpnext/erpnext/hr/report/loan_repayment/loan_repayment.py,EMI,ЕМИ
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py,New Serial No cannot have Warehouse. Warehouse must be set by Stock Entry or Purchase Receipt,Нова серија № не може да има складиште. Склад мора да бидат поставени од страна берза за влез или купување Потврда
 DocType: Lead,Lead Type,Потенцијален клиент Тип
 apps/erpnext/erpnext/utilities/activation.py,Create Quotation,Креирај цитат
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py,You are not authorized to approve leaves on Block Dates,Немате дозвола да го одобри лисјата Забрани Термини
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py,All these items have already been invoiced,Сите овие ставки се веќе фактурирани
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py,No outstanding invoices found for the {0} {1} which qualify the filters you have specified.,Не се пронајдени извонредни фактури за {0} {1} кои ги исполнуваат квалификуваните филтри што сте ги навеле.
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js,Set New Release Date,Поставете нов датум на издавање
 DocType: Company,Monthly Sales Target,Месечна продажна цел
 apps/erpnext/erpnext/accounts/doctype/exchange_rate_revaluation/exchange_rate_revaluation.py,No outstanding invoices found,Не се пронајдени извонредни фактури
@@ -5813,7 +5829,6 @@
 apps/erpnext/erpnext/hr/doctype/employee_benefit_application/employee_benefit_application.py,"An amount of {0} already claimed for the component {1},\
 						 set the amount equal or greater than {2}","Количина од {0} веќе се тврди за компонентата {1}, \ поставете го износот еднаков или поголем од {2}"
 DocType: Shipping Rule,Shipping Rule Conditions,Услови за испорака Правило
-DocType: Purchase Invoice,Export Type,Тип на извоз
 DocType: Salary Slip Loan,Salary Slip Loan,Плата за лизгање на пензија
 DocType: BOM Update Tool,The new BOM after replacement,Новиот Бум по замена
 ,Point of Sale,Точка на продажба
@@ -5934,7 +5949,6 @@
 DocType: Purchase Order Item,Blanket Order Rate,Стапка на нарачка
 ,Customer Ledger Summary,Резиме на Леџер на клиенти
 apps/erpnext/erpnext/hooks.py,Certification,Сертификација
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js,Are you sure you want to make debit note?,Дали сте сигурни дека сакате да направите дебитна белешка?
 DocType: Bank Guarantee,Clauses and Conditions,Клаузули и услови
 DocType: Serial No,Creation Document Type,Креирање Вид на документ
 DocType: Amazon MWS Settings,ES,ES
@@ -5972,8 +5986,6 @@
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py,Financial Services,Финансиски Услуги
 DocType: Student Sibling,Student ID,студентски проект
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.js,For Quantity must be greater than zero,За количината мора да биде поголема од нула
-apps/erpnext/erpnext/hr/doctype/employee_transfer/employee_transfer.py,"Please delete the Employee <a href=""#Form/Employee/{0}"">{0}</a>\
-					to cancel this document","Избришете го вработениот <a href=""#Form/Employee/{0}"">{0}</a> \ за да го откажете овој документ"
 apps/erpnext/erpnext/config/projects.py,Types of activities for Time Logs,Типови на активности за Време на дневници
 DocType: Opening Invoice Creation Tool,Sales,Продажба
 DocType: Stock Entry Detail,Basic Amount,Основицата
@@ -6052,6 +6064,7 @@
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py,Print and Stationery,Печатење и идентитет
 DocType: Stock Settings,Show Barcode Field,Прикажи Баркод поле
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js,Send Supplier Emails,Испрати Добавувачот пораки
+DocType: Asset Movement,ACC-ASM-.YYYY.-,ACC-ASM-.YYYY.-
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py,"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,Автоматски креирано
 apps/erpnext/erpnext/hr/doctype/employee_onboarding/employee_onboarding.py,Submit this to create the Employee record,Поднесете го ова за да креирате записник за вработените
@@ -6131,7 +6144,6 @@
 DocType: Sales Team,Contact No.,Контакт број
 apps/erpnext/erpnext/templates/includes/cart/cart_address.html,Billing Address is same as Shipping Address,Адреса за наплата е иста како и адресата за испорака
 DocType: Bank Reconciliation,Payment Entries,записи плаќање
-apps/erpnext/erpnext/erpnext_integrations/doctype/shopify_settings/shopify_settings.py,Access token or Shopify URL missing,Недостасуваат URL-то за пристап или Успешно
 DocType: Location,Latitude,Latitude
 DocType: Work Order,Scrap Warehouse,отпад Магацински
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py,"Warehouse required at Row No {0}, please set default warehouse for the item {1} for the company {2}","Магацинот е потребен на редот бр. {0}, ве молиме поставете стандардно складиште за ставката {1} за компанијата {2}"
@@ -6175,7 +6187,6 @@
 DocType: Job Offer Term,Value / Description,Вредност / Опис
 apps/erpnext/erpnext/controllers/accounts_controller.py,"Row #{0}: Asset {1} cannot be submitted, it is already {2}","Ред # {0}: {1} средства не може да се поднесе, тоа е веќе {2}"
 DocType: Tax Rule,Billing Country,Платежна Земја
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js,Are you sure you want to make credit note?,Дали сте сигурни дека сакате да направите кредитна нота?
 DocType: Purchase Order Item,Expected Delivery Date,Се очекува испорака датум
 DocType: Restaurant Order Entry,Restaurant Order Entry,Влез во рецепција за ресторани
 apps/erpnext/erpnext/accounts/general_ledger.py,Debit and Credit not equal for {0} #{1}. Difference is {2}.,Дебитни и кредитни не се еднакви за {0} # {1}. Разликата е во тоа {2}.
@@ -6298,6 +6309,7 @@
 DocType: Purchase Invoice,Taxes and Charges Added,Даноци и давачки Додадено
 apps/erpnext/erpnext/assets/doctype/asset/asset.py,Depreciation Row {0}: Next Depreciation Date cannot be before Available-for-use Date,Ред на амортизација {0}: Следниот датум на амортизација не може да биде пред датумот на достапност за употреба
 ,Sales Funnel,Продажбата на инка
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Item Code &gt; Item Group &gt; Brand,Код на точка&gt; Група на производи&gt; Бренд
 apps/erpnext/erpnext/setup/doctype/company/company.py,Abbreviation is mandatory,Кратенка задолжително
 DocType: Project,Task Progress,задача за напредокот
 apps/erpnext/erpnext/templates/includes/navbar/navbar_items.html,Cart,Количка
@@ -6540,6 +6552,7 @@
 DocType: Employee Grade,Employee Grade,Вработен одделение
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py,Piecework,Плаќаат на парче
 DocType: GSTR 3B Report,June,Јуни
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Supplier &gt; Supplier Type,Добавувач&gt; Тип на снабдувач
 DocType: Share Balance,From No,Од бр
 DocType: Shift Type,Early Exit Grace Period,Предвремен период на благодат
 DocType: Task,Actual Time (in Hours),Крај на времето (во часови)
@@ -7012,6 +7025,7 @@
 DocType: Quality Inspection Reading,Quality Inspection Reading,Квалитет инспекција читање
 apps/erpnext/erpnext/stock/doctype/stock_settings/stock_settings.py,`Freeze Stocks Older Than` should be smaller than %d days.,`Замрзнување резерви Постарите Than` треба да биде помала од% d дена.
 DocType: Tax Rule,Purchase Tax Template,Купување Данок Шаблон
+apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py,Earliest Age,Најрана возраст
 apps/erpnext/erpnext/utilities/user_progress.py,Set a sales goal you'd like to achieve for your company.,Поставете продажбата цел што сакате да постигнете за вашата компанија.
 DocType: Quality Goal,Revision,Ревизија
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js,Healthcare Services,Здравствени услуги
@@ -7055,6 +7069,7 @@
 apps/erpnext/erpnext/healthcare/doctype/patient_encounter/patient_encounter.js,Schedule Discharge,Распоред на празнење
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py,Cheques and Deposits incorrectly cleared,Чекови и депозити неправилно исчистена
 DocType: Homepage Section Card,Homepage Section Card,Карта за делот за почетници
+,Amount To Be Billed,Износот што ќе биде фактуриран
 apps/erpnext/erpnext/accounts/doctype/account/account.py,Account {0}: You can not assign itself as parent account,На сметка {0}: Вие не може да се додели како родител сметка
 DocType: Purchase Invoice Item,Price List Rate,Ценовник стапка
 apps/erpnext/erpnext/utilities/activation.py,Create customer quotes,Креирај понуди на клиентите
@@ -7107,6 +7122,7 @@
 DocType: Supplier Scorecard Criteria,Supplier Scorecard Criteria,Критериуми за оценување на добавувачи
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py,Please select Start Date and End Date for Item {0},Ве молиме одберете Start Датум и краен датум за Точка {0}
 DocType: Maintenance Schedule,MAT-MSH-.YYYY.-,MAT-MSH-.YYYY.-
+,Amount to Receive,Износ за примање
 apps/erpnext/erpnext/education/doctype/student_group_creation_tool/student_group_creation_tool.py,Course is mandatory in row {0},Курсот е задолжително во ред {0}
 apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py,From date can not be greater than than To date,Од датумот не може да биде поголема од до денес
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py,To date cannot be before from date,До денес не може да биде пред од денот
@@ -7560,6 +7576,7 @@
 DocType: Delivery Note,Print Without Amount,Печати Без Износ
 apps/erpnext/erpnext/accounts/report/asset_depreciation_ledger/asset_depreciation_ledger.py,Depreciation Date,амортизација Датум
 ,Work Orders in Progress,Работа нарачки во тек
+DocType: Customer Credit Limit,Bypass Credit Limit Check,Проверка на ограничување на кредитната граница за заобиколување
 DocType: Issue,Support Team,Тим за поддршка
 apps/erpnext/erpnext/stock/report/batch_item_expiry_status/batch_item_expiry_status.py,Expiry (In Days),Застареност (во денови)
 DocType: Appraisal,Total Score (Out of 5),Вкупен Резултат (Од 5)
@@ -7744,6 +7761,7 @@
 DocType: Sales Invoice,Customer GSTIN,GSTIN клиентите
 DocType: Crop Cycle,List of diseases detected on the field. When selected it'll automatically add a list of tasks to deal with the disease ,"Листа на болести откриени на терен. Кога е избрано, автоматски ќе додаде листа на задачи за справување со болеста"
 apps/erpnext/erpnext/manufacturing/page/bom_comparison_tool/bom_comparison_tool.js,BOM 1,БОМ 1
+apps/erpnext/erpnext/assets/report/fixed_asset_register/fixed_asset_register.py,Asset Id,Ид на средства
 apps/erpnext/erpnext/healthcare/doctype/healthcare_service_unit/healthcare_service_unit.js,This is a root healthcare service unit and cannot be edited.,Ова е единица за здравствена заштита на root и не може да се уредува.
 DocType: Asset Repair,Repair Status,Поправка статус
 apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.js,"Requested Qty: Quantity requested for purchase, but not ordered.","Побарај Количина: Количина се бара за купување, но не е нарачано."
diff --git a/erpnext/translations/ml.csv b/erpnext/translations/ml.csv
index d72ff8d..39b0d42 100644
--- a/erpnext/translations/ml.csv
+++ b/erpnext/translations/ml.csv
@@ -283,7 +283,6 @@
 DocType: Loan,Repay Over Number of Periods,കാലയളവിന്റെ എണ്ണം ഓവർ പകരം
 apps/erpnext/erpnext/manufacturing/report/bom_stock_report/bom_stock_report.py,Quantity to Produce can not be less than Zero,ഉൽപ്പാദിപ്പിക്കുന്നതിനുള്ള അളവ് പൂജ്യത്തേക്കാൾ കുറവായിരിക്കരുത്
 DocType: Stock Entry,Additional Costs,അധിക ചെലവ്
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Customer &gt; Customer Group &gt; Territory,കസ്റ്റമർ&gt; കസ്റ്റമർ ഗ്രൂപ്പ്&gt; ടെറിട്ടറി
 apps/erpnext/erpnext/accounts/doctype/account/account.py,Account with existing transaction can not be converted to group.,നിലവിലുള്ള ഇടപാട് ഉപയോഗിച്ച് അക്കൗണ്ട് ഗ്രൂപ്പ് പരിവർത്തനം ചെയ്യാൻ കഴിയില്ല.
 DocType: Lead,Product Enquiry,ഉൽപ്പന്ന അറിയുവാനുള്ള
 DocType: Education Settings,Validate Batch for Students in Student Group,സ്റ്റുഡന്റ് ഗ്രൂപ്പ് വിദ്യാർത്ഥികളുടെ ബാച്ച് സാധൂകരിക്കൂ
@@ -581,6 +580,7 @@
 DocType: Healthcare Settings,Create documents for sample collection,സാമ്പിൾ ശേഖരത്തിനായി പ്രമാണങ്ങൾ സൃഷ്ടിക്കുക
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py,Payment against {0} {1} cannot be greater than Outstanding Amount {2},{0} {1} നിലവിലുള്ള തുക {2} വലുതായിരിക്കും കഴിയില്ല നേരെ പേയ്മെന്റ്
 apps/erpnext/erpnext/patches/v11_0/add_healthcare_service_unit_tree_root.py,All Healthcare Service Units,എല്ലാ ഹെൽത്ത്കെയർ സർവീസ് യൂണിറ്റുകളും
+apps/erpnext/erpnext/setup/default_energy_point_rules.py,On Converting Opportunity,അവസരം പരിവർത്തനം ചെയ്യുമ്പോൾ
 DocType: Bank Account,Address HTML,വിലാസം എച്ച്ടിഎംഎൽ
 DocType: Lead,Mobile No.,മൊബൈൽ നമ്പർ
 apps/erpnext/erpnext/selling/doctype/pos_closing_voucher/closing_voucher_details.html,Mode of Payments,പേയ്മെന്റ് മോഡ്
@@ -645,7 +645,6 @@
 DocType: Accounting Dimension,Dimension Name,അളവിന്റെ പേര്
 apps/erpnext/erpnext/healthcare/setup.py,Resistant,ചെറുത്തുനിൽപ്പ്
 apps/erpnext/erpnext/hotels/doctype/hotel_room_reservation/hotel_room_reservation.py,Please set Hotel Room Rate on {},{} ഹോട്ടലിൽ ഹോട്ടൽ റൂട്ട് റേറ്റ് ക്രമീകരിക്കുക
-apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py,Please setup numbering series for Attendance via Setup &gt; Numbering Series,സജ്ജീകരണം&gt; നമ്പറിംഗ് സീരീസ് വഴി അറ്റൻഡൻസിനായി നമ്പറിംഗ് സീരീസ് സജ്ജമാക്കുക
 DocType: Journal Entry,Multi Currency,മൾട്ടി കറൻസി
 DocType: Bank Statement Transaction Invoice Item,Invoice Type,ഇൻവോയിസ് തരം
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py,Valid from date must be less than valid upto date,തീയതി മുതൽ സാധുതയുള്ളത് തീയതി വരെ സാധുവായതിനേക്കാൾ കുറവായിരിക്കണം
@@ -757,6 +756,7 @@
 apps/erpnext/erpnext/accounts/page/pos/pos.js,Create a new Customer,ഒരു പുതിയ കസ്റ്റമർ സൃഷ്ടിക്കുക
 apps/erpnext/erpnext/non_profit/report/expiring_memberships/expiring_memberships.py,Expiring On,കാലഹരണപ്പെടും
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,"If multiple Pricing Rules continue to prevail, users are asked to set Priority manually to resolve conflict.","ഒന്നിലധികം പ്രൈസിങ് നിയമങ്ങൾ വിജയം തുടരുകയാണെങ്കിൽ, ഉപയോക്താക്കൾക്ക് വൈരുദ്ധ്യം പരിഹരിക്കാൻ മാനുവലായി മുൻഗണന സജ്ജീകരിക്കാൻ ആവശ്യപ്പെട്ടു."
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js,Purchase Return,വാങ്ങൽ റിട്ടേൺ
 apps/erpnext/erpnext/utilities/activation.py,Create Purchase Orders,വാങ്ങൽ ഓർഡറുകൾ സൃഷ്ടിക്കുക
 ,Purchase Register,രജിസ്റ്റർ വാങ്ങുക
 apps/erpnext/erpnext/healthcare/doctype/patient/patient.py,Patient not found,രോഗി കണ്ടെത്തിയില്ല
@@ -771,7 +771,6 @@
 DocType: Location,Area UOM,പ്രദേശം UOM
 apps/erpnext/erpnext/manufacturing/doctype/workstation/workstation.py,Workstation is closed on the following dates as per Holiday List: {0},വർക്ക്സ്റ്റേഷൻ ഹോളിഡേ പട്ടിക പ്രകാരം താഴെപ്പറയുന്ന തീയതികളിൽ അടച്ചിടുന്നു: {0}
 apps/erpnext/erpnext/selling/page/sales_funnel/sales_funnel.py,Opportunities,അവസരങ്ങൾ
-apps/erpnext/erpnext/www/all-products/index.html,Clear filters,ഫിൽട്ടറുകൾ മായ്‌ക്കുക
 DocType: Lab Test Template,Single,സിംഗിൾ
 DocType: Compensatory Leave Request,Work From Date,തീയതി മുതൽ ജോലി
 DocType: Salary Slip,Total Loan Repayment,ആകെ വായ്പ തിരിച്ചടവ്
@@ -815,6 +814,7 @@
 apps/erpnext/erpnext/education/doctype/program_enrollment_tool/program_enrollment_tool.py,Mandatory field - Academic Year,നിർബന്ധമായ ഒരു ഫീൽഡ് - അക്കാദമിക് വർഷം
 apps/erpnext/erpnext/education/doctype/program_enrollment_tool/program_enrollment_tool.py,Mandatory field - Academic Year,നിർബന്ധമായ ഒരു ഫീൽഡ് - അക്കാദമിക് വർഷം
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py,{0} {1} is not associated with {2} {3},{0} {1} {2} ഉപയോഗിച്ച് {3} ബന്ധമില്ല
+DocType: Opportunity,Converted By,പരിവർത്തനം ചെയ്തത്
 apps/erpnext/erpnext/public/js/hub/components/ReviewArea.vue,You need to login as a Marketplace User before you can add any reviews.,അവലോകനങ്ങൾ ചേർക്കുന്നതിന് മുമ്പ് നിങ്ങൾ ഒരു മാർക്കറ്റ്പ്ലെയ്സ് ഉപയോക്താവായി ലോഗിൻ ചെയ്യേണ്ടതുണ്ട്.
 apps/erpnext/erpnext/manufacturing/doctype/job_card/job_card.py,Row {0} : Operation is required against the raw material item {1},വരി {0}: അസംസ്കൃത വസ്തുവിനുമേലുള്ള പ്രവർത്തനം {1}
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py,Please set default payable account for the company {0},കമ്പനി {0} സ്ഥിരസ്ഥിതി മാറാവുന്ന അക്കൗണ്ട് സജ്ജീകരിക്കുക
@@ -840,6 +840,8 @@
 DocType: Sales Invoice,Total Qty,ആകെ Qty
 apps/erpnext/erpnext/education/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py,Guardian2 Email ID,ഗുഅര്ദിഅന്൨ ഇമെയിൽ ഐഡി
 apps/erpnext/erpnext/education/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py,Guardian2 Email ID,ഗുഅര്ദിഅന്൨ ഇമെയിൽ ഐഡി
+apps/erpnext/erpnext/hr/doctype/employee_transfer/employee_transfer.py,"Please delete the Employee <a href=""#Form/Employee/{0}"">{0}</a>\
+					to cancel this document","ഈ പ്രമാണം റദ്ദാക്കുന്നതിന് ജീവനക്കാരൻ <a href=""#Form/Employee/{0}"">{0}</a> delete ഇല്ലാതാക്കുക"
 DocType: Item,Show in Website (Variant),വെബ്സൈറ്റിൽ കാണിക്കുക (വേരിയന്റ്)
 DocType: Employee,Health Concerns,ആരോഗ്യ ആശങ്കകൾ
 DocType: Payroll Entry,Select Payroll Period,ശമ്പളപ്പട്ടിക കാലാവധി തിരഞ്ഞെടുക്കുക
@@ -897,7 +899,6 @@
 apps/erpnext/erpnext/education/doctype/student_group/student_group.py,Please select Course,കോഴ്സ് തിരഞ്ഞെടുക്കുക
 DocType: Codification Table,Codification Table,Codification പട്ടിക
 DocType: Timesheet Detail,Hrs,hrs
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js,Please select Company,കമ്പനി തിരഞ്ഞെടുക്കുക
 DocType: Employee Skill,Employee Skill,ജീവനക്കാരുടെ കഴിവ്
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.js,Difference Account,വ്യത്യാസം അക്കൗണ്ട്
 DocType: Pricing Rule,Discount on Other Item,മറ്റ് ഇനങ്ങളിൽ കിഴിവ്
@@ -965,6 +966,7 @@
 DocType: BOM,Operating Cost,ഓപ്പറേറ്റിംഗ് ചെലവ്
 DocType: Crop,Produced Items,ഉല്പന്ന വസ്തുക്കൾ
 DocType: Bank Statement Transaction Entry,Match Transaction to Invoices,ഇൻവോയിസുകളിലേക്ക് മാച്ച് ട്രാൻസാക്ഷൻ
+apps/erpnext/erpnext/erpnext_integrations/exotel_integration.py,Error in Exotel incoming call,Exotel ഇൻകമിംഗ് കോളിലെ പിശക്
 DocType: Sales Order Item,Gross Profit,മൊത്തം ലാഭം
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js,Unblock Invoice,ഇൻവോയ്സ് അൺബ്ലോക്ക് ചെയ്യുക
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py,Increment cannot be 0,വർദ്ധന 0 ആയിരിക്കും കഴിയില്ല
@@ -1172,6 +1174,7 @@
 DocType: Activity Cost,Activity Type,പ്രവർത്തന തരം
 DocType: Request for Quotation,For individual supplier,വ്യക്തിഗത വിതരണക്കമ്പനിയായ വേണ്ടി
 DocType: BOM Operation,Base Hour Rate(Company Currency),ബേസ് അന്ത്യസമയം നിരക്ക് (കമ്പനി കറൻസി)
+,Qty To Be Billed,ബില്ലുചെയ്യേണ്ട ക്യൂട്ടി
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py,Delivered Amount,കൈമാറി തുക
 apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.js,Reserved Qty for Production: Raw materials quantity to make manufacturing items.,ഉൽ‌പാദനത്തിനായി കരുതിവച്ചിരിക്കുന്ന ക്യൂട്ടി: ഉൽ‌പാദന ഇനങ്ങൾ‌ നിർമ്മിക്കുന്നതിനുള്ള അസംസ്കൃത വസ്തുക്കളുടെ അളവ്.
 DocType: Loyalty Point Entry Redemption,Redemption Date,വീണ്ടെടുക്കൽ തീയതി
@@ -1290,7 +1293,7 @@
 apps/erpnext/erpnext/education/doctype/student_group/student_group.py,Please select Program,പ്രോഗ്രാം തിരഞ്ഞെടുക്കുക
 apps/erpnext/erpnext/education/doctype/student_group/student_group.py,Please select Program,പ്രോഗ്രാം തിരഞ്ഞെടുക്കുക
 DocType: Project,Estimated Cost,കണക്കാക്കിയ ചെലവ്
-DocType: Request for Quotation,Link to material requests,ഭൗതിക അഭ്യർത്ഥനകൾ വരെ ലിങ്ക്
+DocType: Supplier Quotation,Link to material requests,ഭൗതിക അഭ്യർത്ഥനകൾ വരെ ലിങ്ക്
 apps/erpnext/erpnext/public/js/hub/pages/Publish.vue,Publish,പ്രസിദ്ധീകരിക്കുക
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py,Aerospace,എയറോസ്പേസ്
 ,Fichier des Ecritures Comptables [FEC],ഫിചിയർ ഡെസ് ഇക്വിറ്ററീസ് കോംപ്ലബിൾസ് [FEC]
@@ -1303,6 +1306,7 @@
 apps/erpnext/erpnext/utilities/transaction_base.py,Invalid Posting Time,പോസ്റ്റ് ചെയ്യുന്ന സമയം അസാധുവാണ്
 DocType: Salary Component,Condition and Formula,അവസ്ഥയും ഫോർമുലയും
 DocType: Lead,Campaign Name,കാമ്പെയ്ൻ പേര്
+apps/erpnext/erpnext/setup/default_energy_point_rules.py,On Task Completion,ടാസ്ക് പൂർത്തീകരണത്തിൽ
 apps/erpnext/erpnext/hr/doctype/compensatory_leave_request/compensatory_leave_request.py,There is no leave period in between {0} and {1},"{0}, {1} എന്നിവയ്ക്കിടയിലുള്ള അവധി കാലാവധി ഇല്ല"
 DocType: Fee Validity,Healthcare Practitioner,ഹെൽത്ത് ഇൻഷുറൻസ് പ്രാക്ടീഷണർ
 DocType: Hotel Room,Capacity,ശേഷി
@@ -1642,7 +1646,6 @@
 DocType: Quality Feedback Template,Quality Feedback Template,ഗുണനിലവാരമുള്ള ഫീഡ്‌ബാക്ക് ടെംപ്ലേറ്റ്
 apps/erpnext/erpnext/config/education.py,LMS Activity,LMS പ്രവർത്തനം
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py,Internet Publishing,ഇന്റർനെറ്റ് പ്രസിദ്ധീകരിക്കൽ
-DocType: Prescription Duration,Number,സംഖ്യ
 apps/erpnext/erpnext/accounts/doctype/opening_invoice_creation_tool/opening_invoice_creation_tool.js,Creating {0} Invoice,ഇൻവോയ്സ് {0} സൃഷ്ടിക്കുന്നു
 DocType: Medical Code,Medical Code Standard,മെഡിക്കൽ കോഡ് സ്റ്റാൻഡേർഡ്
 DocType: Soil Texture,Clay Composition (%),ക്ലേ കോമ്പോസിഷൻ (%)
@@ -1716,6 +1719,7 @@
 DocType: Support Settings,Get Started Sections,വിഭാഗങ്ങൾ ആരംഭിക്കുക
 DocType: Lead,CRM-LEAD-.YYYY.-,CRM-LEAD-.YYYY.-
 DocType: Invoice Discounting,Sanctioned,അനുവദിച്ചു
+,Base Amount,അടിസ്ഥാന തുക
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.js,Total Contribution Amount: {0},ആകെ സംഭാവന തുക: {0}
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py,Row #{0}: Please specify Serial No for Item {1},വരി # {0}: ഇനം {1} വേണ്ടി സീരിയൽ ഇല്ല വ്യക്തമാക്കുക
 DocType: Payroll Entry,Salary Slips Submitted,ശമ്പളം സ്ലിപ്പുകൾ സമർപ്പിച്ചു
@@ -1934,6 +1938,7 @@
 DocType: Accounting Dimension,Dimension Defaults,അളവ് സ്ഥിരസ്ഥിതികൾ
 apps/erpnext/erpnext/crm/report/prospects_engaged_but_not_converted/prospects_engaged_but_not_converted.js,Minimum Lead Age (Days),മിനിമം ലീഡ് പ്രായം (ദിവസം)
 apps/erpnext/erpnext/crm/report/prospects_engaged_but_not_converted/prospects_engaged_but_not_converted.js,Minimum Lead Age (Days),മിനിമം ലീഡ് പ്രായം (ദിവസം)
+apps/erpnext/erpnext/assets/report/fixed_asset_register/fixed_asset_register.py,Available For Use Date,ഉപയോഗ തീയതിക്ക് ലഭ്യമാണ്
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py,All BOMs,എല്ലാ BOMs
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js,Create Inter Company Journal Entry,ഇന്റർ കമ്പനി ജേണൽ എൻട്രി സൃഷ്ടിക്കുക
 DocType: Company,Parent Company,മാതൃ സ്ഥാപനം
@@ -1995,6 +2000,7 @@
 ,IRS 1099,IRS 1099
 DocType: Salary Slip,Leave Without Pay,ശമ്പള ഇല്ലാതെ വിടുക
 DocType: Payment Request,Outward,വെളിയിലേക്കുള്ള
+apps/erpnext/erpnext/setup/default_energy_point_rules.py,On {0} Creation,{0} സൃഷ്ടിയിൽ
 apps/erpnext/erpnext/regional/doctype/gstr_3b_report/gstr_3b_report.html,State/UT Tax,സംസ്ഥാന / യുടി നികുതി
 ,Trial Balance for Party,പാർട്ടി ട്രയൽ ബാലൻസ്
 ,Gross and Net Profit Report,"മൊത്ത, അറ്റ ലാഭ റിപ്പോർട്ട്"
@@ -2108,6 +2114,7 @@
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js,Make Stock Entry,സ്റ്റോക്ക് എൻട്രി ഉണ്ടാക്കുക
 DocType: Hotel Room Reservation,Hotel Reservation User,ഹോട്ടൽ റിസർവേഷൻ ഉപയോക്താവ്
 apps/erpnext/erpnext/projects/doctype/project/project.js,Set Status,നില സജ്ജമാക്കുക
+apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py,Please setup numbering series for Attendance via Setup &gt; Numbering Series,സജ്ജീകരണം&gt; നമ്പറിംഗ് സീരീസ് വഴി അറ്റൻഡൻസിനായി നമ്പറിംഗ് സീരീസ് സജ്ജമാക്കുക
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py,Please select prefix first,ആദ്യം പ്രിഫിക്സ് തിരഞ്ഞെടുക്കുക
 DocType: Contract,Fulfilment Deadline,പൂർത്തിയാക്കൽ കാലാവധി
 apps/erpnext/erpnext/public/js/hub/pages/Home.vue,Near you,നിങ്ങളുടെ സമീപം
@@ -2123,6 +2130,7 @@
 DocType: Announcement,All Students,എല്ലാ വിദ്യാർത്ഥികൾക്കും
 apps/erpnext/erpnext/assets/doctype/asset/asset.py,Item {0} must be a non-stock item,ഇനം {0} ഒരു നോൺ-സ്റ്റോക്ക് ഇനം ആയിരിക്കണം
 apps/erpnext/erpnext/stock/doctype/batch/batch.js,View Ledger,കാണുക ലെഡ്ജർ
+DocType: Cost Center,Lft,Lft
 DocType: Grading Scale,Intervals,ഇടവേളകളിൽ
 DocType: Bank Statement Transaction Entry,Reconciled Transactions,റീകോൺ ചെയ്ത ഇടപാടുകൾ
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py,Earliest,പഴയവ
@@ -2235,6 +2243,7 @@
 apps/erpnext/erpnext/hr/doctype/employee_benefit_application/employee_benefit_application.py,As per your assigned Salary Structure you cannot apply for benefits,നിങ്ങളുടെ ശമ്പള ശമ്പളം അനുസരിച്ച് ആനുകൂല്യങ്ങൾക്ക് അപേക്ഷിക്കാൻ കഴിയില്ല
 apps/erpnext/erpnext/stock/doctype/item/item.py,Website Image should be a public file or website URL,വെബ്സൈറ്റ് ചിത്രം ഒരു പൊതു ഫയൽ അല്ലെങ്കിൽ വെബ്സൈറ്റ് URL ആയിരിക്കണം
 DocType: Purchase Invoice Item,BOM,BOM ൽ
+apps/erpnext/erpnext/stock/doctype/item/item.py,Duplicate entry in Manufacturers table,നിർമ്മാതാക്കളുടെ പട്ടികയിലെ തനിപ്പകർപ്പ് എൻട്രി
 apps/erpnext/erpnext/setup/doctype/item_group/item_group.js,This is a root item group and cannot be edited.,ഇത് ഒരു റൂട്ട് ഐറ്റം ഗ്രൂപ്പ് ആണ് എഡിറ്റ് ചെയ്യാൻ കഴിയില്ല.
 apps/erpnext/erpnext/accounts/doctype/account/account.js,Merge,ലയിപ്പിക്കുക
 DocType: Journal Entry Account,Purchase Order,പർച്ചേസ് ഓർഡർ
@@ -2376,7 +2385,6 @@
 DocType: Asset,Depreciation Schedules,മൂല്യത്തകർച്ച സമയക്രമം
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.js,Create Sales Invoice,സെയിൽസ് ഇൻവോയ്സ് സൃഷ്ടിക്കുക
 apps/erpnext/erpnext/regional/doctype/gstr_3b_report/gstr_3b_report.html,Ineligible ITC,യോഗ്യതയില്ലാത്ത ഐ.ടി.സി.
-apps/erpnext/erpnext/erpnext_integrations/doctype/shopify_settings/shopify_settings.py,"Support for public app is deprecated. Please setup private app, for more details refer user manual","പൊതു അപ്ലിക്കേഷനായുള്ള പിന്തുണ ഒഴിവാക്കി. സ്വകാര്യ ആപ്ലിക്കേഷൻ സജ്ജമാക്കുക, കൂടുതൽ വിവരങ്ങൾ ഉപയോക്താവിന്റെ മാനുവൽ കാണുക"
 DocType: Task,Dependent Tasks,ആശ്രിത ചുമതലകൾ
 apps/erpnext/erpnext/regional/report/gstr_1/gstr_1.py,Following accounts might be selected in GST Settings:,GST ക്രമീകരണങ്ങളിൽ ഇനിപ്പറയുന്ന അക്കൌണ്ടുകൾ തിരഞ്ഞെടുക്കാം:
 apps/erpnext/erpnext/manufacturing/report/bom_stock_report/bom_stock_report.js,Quantity to Produce,ഉത്പാദിപ്പിക്കാനുള്ള അളവ്
@@ -2624,6 +2632,7 @@
 DocType: Water Analysis,Container,കണ്ടെയ്നർ
 apps/erpnext/erpnext/regional/report/gstr_1/gstr_1.py,Please set valid GSTIN No. in Company Address,കമ്പനി വിലാസത്തിൽ സാധുവായ GSTIN നമ്പർ സജ്ജമാക്കുക
 apps/erpnext/erpnext/education/utils.py,Student {0} - {1} appears Multiple times in row {2} & {3},വിദ്യാർത്ഥി {0} - {1} വരി {2} ൽ നിരവധി തവണ ലഭ്യമാകുന്നു &amp; {3}
+apps/erpnext/erpnext/selling/doctype/customer/customer.py,Following fields are mandatory to create address:,വിലാസം സൃഷ്ടിക്കാൻ ഇനിപ്പറയുന്ന ഫീൽഡുകൾ നിർബന്ധമാണ്:
 DocType: Item Alternative,Two-way,രണ്ടു വഴി
 DocType: Item,Manufacturers,നിർമ്മാതാക്കൾ
 ,Employee Billing Summary,ജീവനക്കാരുടെ ബില്ലിംഗ് സംഗ്രഹം
@@ -2697,9 +2706,9 @@
 DocType: Staffing Plan Detail,Estimated Cost Per Position,ഓരോ സ്ഥാനത്തിനും കണക്കാക്കിയ ചെലവ്
 DocType: Employee,HR-EMP-,HR-EMP-
 DocType: Quality Meeting Minutes,Quality Meeting Minutes,ഗുണനിലവാര മീറ്റിംഗ് മിനിറ്റ്
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Supplier &gt; Supplier Type,വിതരണക്കാരൻ&gt; വിതരണ തരം
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py,Employee Referral,തൊഴിലുടമ റഫറൽ
 DocType: Student Group,Set 0 for no limit,പരിധികൾ 0 സജ്ജീകരിക്കുക
+DocType: Cost Center,rgt,rgt
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py,The day(s) on which you are applying for leave are holidays. You need not apply for leave.,നിങ്ങൾ അനുവാദം അപേക്ഷിക്കുന്ന ചെയ്തിട്ടുള്ള ദിവസം (ങ്ങൾ) വിശേഷദിവസങ്ങൾ ആകുന്നു. നിങ്ങൾ അനുവാദം അപേക്ഷ നല്കേണ്ടതില്ല.
 DocType: Customer,Primary Address and Contact Detail,"പ്രാഥമിക വിലാസം, ബന്ധപ്പെടാനുള്ള വിശദാംശം"
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.js,Resend Payment Email,പേയ്മെന്റ് ഇമെയിൽ വീണ്ടും
@@ -2803,7 +2812,6 @@
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py,Against Supplier Invoice {0} dated {1},വിതരണക്കാരൻ ഇൻവോയിസ് {0} എഗെൻസ്റ്റ് {1} dated
 DocType: Customer,Default Price List,സ്ഥിരസ്ഥിതി വില പട്ടിക
 apps/erpnext/erpnext/assets/doctype/asset/asset.py,Asset Movement record {0} created,അസറ്റ് മൂവ്മെന്റ് റെക്കോർഡ് {0} സൃഷ്ടിച്ചു
-apps/erpnext/erpnext/utilities/page/leaderboard/leaderboard.js,No items found.,ഇനങ്ങളൊന്നും കണ്ടെത്തിയില്ല.
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py,You cannot delete Fiscal Year {0}. Fiscal Year {0} is set as default in Global Settings,നിങ്ങൾ സാമ്പത്തിക വർഷത്തെ {0} ഇല്ലാതാക്കാൻ കഴിയില്ല. സാമ്പത്തിക വർഷത്തെ {0} ആഗോള ക്രമീകരണങ്ങൾ സ്വതവേ സജ്ജീകരിച്ച
 DocType: Share Transfer,Equity/Liability Account,ഇക്വിറ്റി / ബാധ്യതാ അക്കൗണ്ട്
 apps/erpnext/erpnext/setup/doctype/customer_group/customer_group.py,A customer with the same name already exists,സമാന പേരിലുള്ള ഒരു ഉപയോക്താവ് ഇതിനകം നിലവിലുണ്ട്
@@ -2819,6 +2827,7 @@
 apps/erpnext/erpnext/selling/doctype/customer/customer.py,Credit limit has been crossed for customer {0} ({1}/{2}),ഉപഭോക്താവിന് ക്രെഡിറ്റ് പരിധി മറികടന്നു {0} ({1} / {2})
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py,Customer required for 'Customerwise Discount',&#39;Customerwise കിഴിവും&#39; ആവശ്യമുള്ളതിൽ കസ്റ്റമർ
 apps/erpnext/erpnext/config/accounting.py,Update bank payment dates with journals.,ഡയറിയിലെ ബാങ്ക് പേയ്മെന്റ് തീയതികൾ അപ്ഡേറ്റ്.
+,Billed Qty,ബിൽഡ് ക്യൂട്ടി
 apps/erpnext/erpnext/stock/doctype/item/item_dashboard.py,Pricing,പ്രൈസിങ്
 DocType: Employee,Attendance Device ID (Biometric/RF tag ID),ഹാജർ ഉപകരണ ഐഡി (ബയോമെട്രിക് / ആർ‌എഫ് ടാഗ് ഐഡി)
 DocType: Quotation,Term Details,ടേം വിശദാംശങ്ങൾ
@@ -2842,6 +2851,7 @@
 DocType: Share Transfer,Asset Account,അസറ്റ് അക്കൗണ്ട്
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js,New release date should be in the future,പുതിയ റിലീസ് തീയതി ഭാവിയിൽ ആയിരിക്കണം
 DocType: Purchase Invoice,End date of current invoice's period,നിലവിലെ ഇൻവോയ്സ് ന്റെ കാലയളവിൽ അന്ത്യം തീയതി
+apps/erpnext/erpnext/hr/doctype/employee/employee.py,Please setup Employee Naming System in Human Resource &gt; HR Settings,ഹ്യൂമൻ റിസോഴ്സ്&gt; എച്ച്ആർ ക്രമീകരണങ്ങളിൽ ജീവനക്കാരുടെ പേരിടൽ സംവിധാനം സജ്ജമാക്കുക
 DocType: Lab Test,Technician Name,സാങ്കേതിക നാമം നാമം
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py,"Cannot ensure delivery by Serial No as \
 					Item {0} is added with and without Ensure Delivery by \
@@ -2849,6 +2859,7 @@
 DocType: Accounts Settings,Unlink Payment on Cancellation of Invoice,ഇൻവോയ്സ് റദ്ദാക്കൽ പേയ്മെന്റ് അൺലിങ്കുചെയ്യുക
 DocType: Bank Reconciliation,From Date,ഈ തീയതി മുതൽ
 apps/erpnext/erpnext/hr/doctype/vehicle_log/vehicle_log.py,Current Odometer reading entered should be greater than initial Vehicle Odometer {0},നിലവിൽ തലത്തില് നൽകിയ പ്രാരംഭ വാഹനം ഓഡോമീറ്റർ {0} കൂടുതലായിരിക്കണം
+,Purchase Order Items To Be Received or Billed,സ്വീകരിക്കേണ്ട അല്ലെങ്കിൽ ബില്ലുചെയ്യേണ്ട ഓർഡർ ഇനങ്ങൾ വാങ്ങുക
 DocType: Restaurant Reservation,No Show,പ്രദര്ശനം ഇല്ല
 apps/erpnext/erpnext/regional/india/utils.py,You must be a registered supplier to generate e-Way Bill,ഇ-വേ ബിൽ സൃഷ്ടിക്കുന്നതിന് നിങ്ങൾ ഒരു രജിസ്റ്റർ ചെയ്ത വിതരണക്കാരനായിരിക്കണം
 DocType: Shipping Rule Country,Shipping Rule Country,ഷിപ്പിംഗ് റൂൾ രാജ്യം
@@ -2891,6 +2902,7 @@
 apps/erpnext/erpnext/templates/generators/item/item_add_to_cart.html,View in Cart,വണ്ടിയിൽ കാണുക
 DocType: Employee Checkin,Shift Actual Start,യഥാർത്ഥ ആരംഭം മാറ്റുക
 DocType: Tally Migration,Is Day Book Data Imported,ഡേ ബുക്ക് ഡാറ്റ ഇമ്പോർട്ടുചെയ്‌തു
+,Purchase Order Items To Be Received or Billed1,സ്വീകരിക്കേണ്ട അല്ലെങ്കിൽ ബിൽ ചെയ്യേണ്ട ഓർഡർ ഇനങ്ങൾ വാങ്ങുക
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py,Marketing Expenses,മാർക്കറ്റിംഗ് ചെലവുകൾ
 ,Item Shortage Report,ഇനം ദൗർലഭ്യം റിപ്പോർട്ട്
 DocType: Bank Transaction Payments,Bank Transaction Payments,ബാങ്ക് ഇടപാട് പേയ്‌മെന്റുകൾ
@@ -3255,6 +3267,7 @@
 ,Campaign Efficiency,കാമ്പെയ്ൻ എഫിഷ്യൻസി
 ,Campaign Efficiency,കാമ്പെയ്ൻ എഫിഷ്യൻസി
 DocType: Discussion,Discussion,സംവാദം
+apps/erpnext/erpnext/setup/default_energy_point_rules.py,On Sales Order Submission,സെയിൽസ് ഓർഡർ സമർപ്പണത്തിൽ
 DocType: Bank Transaction,Transaction ID,ഇടപാട് ഐഡി
 DocType: Payroll Entry,Deduct Tax For Unsubmitted Tax Exemption Proof,അൺസബ്സ്മിഡ് ടാക്സ് എക്സംപ്ഷൻ പ്രൂഫിന് നികുതി ഇളവ് ചെയ്യുക
 DocType: Volunteer,Anytime,ഏതുസമയത്തും
@@ -3262,7 +3275,6 @@
 DocType: Employee Tax Exemption Proof Submission,Employee Tax Exemption Proof Submission,എംപ്ലോയീസ് ടാക്സ് എക്സംപ്ഷൻ പ്രൂഫ് സമർപ്പണം
 DocType: Patient,Surgical History,സർജിക്കൽ ചരിത്രം
 DocType: Bank Statement Settings Item,Mapped Header,മാപ്പിംഗ് ഹെഡ്ഡർ
-apps/erpnext/erpnext/hr/doctype/employee/employee.py,Please setup Employee Naming System in Human Resource &gt; HR Settings,ഹ്യൂമൻ റിസോഴ്സ്&gt; എച്ച്ആർ ക്രമീകരണങ്ങളിൽ ജീവനക്കാരുടെ പേരിടൽ സംവിധാനം സജ്ജമാക്കുക
 DocType: Employee,Resignation Letter Date,രാജിക്കത്ത് തീയതി
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Pricing Rules are further filtered based on quantity.,പ്രൈസിങ് നിയമങ്ങൾ കൂടുതൽ അളവ് അടിസ്ഥാനമാക്കി ഫിൽറ്റർ.
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py,Please set the Date Of Joining for employee {0},ജീവനക്കാരൻ {0} പ്രവേശനത്തിനുള്ള തീയതി സജ്ജീകരിക്കുക
@@ -3277,6 +3289,7 @@
 DocType: Bank Statement Settings,Mapped Items,മാപ്പുചെയ്യൽ ഇനങ്ങൾ
 DocType: Amazon MWS Settings,IT,ഐടി
 DocType: Chapter,Chapter,ചാപ്റ്റർ
+,Fixed Asset Register,സ്ഥിര അസറ്റ് രജിസ്റ്റർ
 apps/erpnext/erpnext/utilities/user_progress.py,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,Select BOM and Qty for Production,ഉത്പാദനം BOM ലേക്ക് ആൻഡ് അളവ് തിരഞ്ഞെടുക്കുക
@@ -3406,7 +3419,6 @@
 apps/erpnext/erpnext/templates/emails/reorder_item.html,Following Material Requests have been raised automatically based on Item's re-order level,തുടർന്ന് മെറ്റീരിയൽ അഭ്യർത്ഥനകൾ ഇനത്തിന്റെ റീ-ഓർഡർ തലത്തിൽ അടിസ്ഥാനമാക്കി സ്വയം ഉൾപ്പെടും
 apps/erpnext/erpnext/controllers/accounts_controller.py,Account {0} is invalid. Account Currency must be {1},അക്കൗണ്ട് {0} അസാധുവാണ്. അക്കൗണ്ട് കറന്സി {1} ആയിരിക്കണം
 apps/erpnext/erpnext/hr/doctype/salary_structure_assignment/salary_structure_assignment.py,From Date {0} cannot be after employee's relieving Date {1},തീയതി മുതൽ {0} ജീവനക്കാരന്റെ ഒഴിവാക്കൽ തീയതിക്ക് ശേഷം ആയിരിക്കരുത് {1}
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py,Debit Note {0} has been created automatically,ഡെബിറ്റ് കുറിപ്പ് {0} യാന്ത്രികമായി സൃഷ്‌ടിച്ചു
 apps/erpnext/erpnext/accounts/doctype/payment_order/payment_order.js,Create Payment Entries,പേയ്‌മെന്റ് എൻട്രികൾ സൃഷ്‌ടിക്കുക
 DocType: Supplier,Is Internal Supplier,ആന്തരിക വിതരണക്കാരൻ
 DocType: Employee,Create User Permission,ഉപയോക്തൃ അനുമതി സൃഷ്ടിക്കുക
@@ -3960,7 +3972,6 @@
 DocType: Project User,Project Status,പ്രോജക്ട് അവസ്ഥ
 DocType: UOM,Check this to disallow fractions. (for Nos),ഘടകാംശങ്ങൾ അനുമതി ഇല്ലാതാക്കുന്നത് ഇത് ചെക്ക്. (ഒഴിവ് വേണ്ടി)
 DocType: Student Admission Program,Naming Series (for Student Applicant),സീരീസ് (സ്റ്റുഡന്റ് അപേക്ഷകൻ) എന്നു
-apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.py,UOM Conversion factor ({0} -&gt; {1}) not found for item: {2},ഇനത്തിനായി UOM പരിവർത്തന ഘടകം ({0} -&gt; {1}) കണ്ടെത്തിയില്ല: {2}
 apps/erpnext/erpnext/hr/doctype/retention_bonus/retention_bonus.py,Bonus Payment Date cannot be a past date,ബോണസ് പേയ്മെന്റ് തീയതി ഒരു കഴിഞ്ഞ തിയതിയായിരിക്കരുത്
 DocType: Travel Request,Copy of Invitation/Announcement,ക്ഷണം / പ്രഖ്യാപനം എന്നിവയുടെ പകർപ്പ്
 DocType: Practitioner Service Unit Schedule,Practitioner Service Unit Schedule,പ്രാക്ടീഷണർ സർവീസ് യൂണിറ്റ് ഷെഡ്യൂൾ
@@ -4182,7 +4193,6 @@
 DocType: Journal Entry,Accounting Entries,അക്കൗണ്ടിംഗ് എൻട്രികൾ
 DocType: Job Card Time Log,Job Card Time Log,ജോബ് കാർഡ് സമയ ലോഗ്
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,"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; ഫീൽഡിൽ ഇത് ലഭ്യമാകും."
-apps/erpnext/erpnext/education/doctype/instructor/instructor.py,Please setup Instructor Naming System in Education &gt; Education Settings,വിദ്യാഭ്യാസം&gt; വിദ്യാഭ്യാസ ക്രമീകരണങ്ങളിൽ ഇൻസ്ട്രക്ടർ നാമകരണ സംവിധാനം സജ്ജമാക്കുക
 DocType: Journal Entry,Paid Loan,പണമടച്ച വായ്പ
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py,Duplicate Entry. Please check Authorization Rule {0},എൻട്രി തനിപ്പകർപ്പ്. അംഗീകാരം റൂൾ {0} പരിശോധിക്കുക
 DocType: Journal Entry Account,Reference Due Date,റഫറൻസ് തീയതി തീയതി
@@ -4199,7 +4209,6 @@
 apps/erpnext/erpnext/templates/pages/projects.html,No time sheets,ഇല്ല സമയം ഷീറ്റുകൾ
 DocType: GoCardless Mandate,GoCardless Customer,GoCardless ഉപഭോക്താവ്
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py,Leave Type {0} cannot be carry-forwarded,{0} കയറ്റികൊണ്ടു-ഫോർവേഡ് ചെയ്യാൻ കഴിയില്ല ടൈപ്പ് വിടുക
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Item Code &gt; Item Group &gt; Brand,ഇന കോഡ്&gt; ഐറ്റം ഗ്രൂപ്പ്&gt; ബ്രാൻഡ്
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py,Maintenance Schedule is not generated for all the items. Please click on 'Generate Schedule',മെയിൻറനൻസ് ഷെഡ്യൂൾ എല്ലാ ഇനങ്ങളും വേണ്ടി നിർമ്മിക്കുന്നില്ല ആണ്. &#39;ജനറേറ്റുചെയ്യൂ ഷെഡ്യൂൾ&#39; ക്ലിക്ക് ചെയ്യുക ദയവായി
 ,To Produce,ഉത്പാദിപ്പിക്കാൻ
 DocType: Leave Encashment,Payroll,ശന്വളപ്പട്ടിക
@@ -4310,7 +4319,6 @@
 DocType: Stock Ledger Entry,Actual Qty After Transaction,ഇടപാട് ശേഷം യഥാർത്ഥ Qty
 ,Pending SO Items For Purchase Request,പർച്ചേസ് അഭ്യർത്ഥന അവശേഷിക്കുന്ന ഷൂട്ട്ഔട്ട് ഇനങ്ങൾ
 apps/erpnext/erpnext/education/doctype/student_admission/student_admission.py,Student Admissions,സ്റ്റുഡന്റ് പ്രവേശന
-apps/erpnext/erpnext/accounts/party.py,{0} {1} is disabled,{0} {1} അപ്രാപ്തമാക്കിയിട്ടുണ്ടെങ്കിൽ
 DocType: Supplier,Billing Currency,ബില്ലിംഗ് കറന്സി
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py,Extra Large,അതിബൃഹത്തായ
 DocType: Loan,Loan Application,വായ്പ അപേക്ഷ
@@ -4387,7 +4395,6 @@
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py,Only Leave Applications with status 'Approved' and 'Rejected' can be submitted,മാത്രം നില അപ്ലിക്കേഷനുകൾ വിടുക &#39;അംഗീകരിച്ചത്&#39; ഉം &#39;നിരസിച്ചു സമർപ്പിക്കാൻ
 apps/erpnext/erpnext/accounts/doctype/accounting_dimension/accounting_dimension.py,Creating Dimensions...,അളവുകൾ സൃഷ്ടിക്കുന്നു ...
 apps/erpnext/erpnext/education/doctype/student_group_creation_tool/student_group_creation_tool.py,Student Group Name is mandatory in row {0},സ്റ്റുഡന്റ് ഗ്രൂപ്പ് പേര് വരി {0} ലെ നിർബന്ധമായും
-DocType: Customer Credit Limit,Bypass credit limit_check,ക്രെഡിറ്റ് പരിധി_ചെക്ക് മറികടക്കുക
 DocType: Homepage,Products to be shown on website homepage,വെബ്സൈറ്റ് ഹോംപേജിൽ കാണിക്കേണ്ട ഉല്പന്നങ്ങൾ
 DocType: HR Settings,Password Policy,പാസ്‌വേഡ് നയം
 apps/erpnext/erpnext/setup/doctype/customer_group/customer_group.js,This is a root customer group and cannot be edited.,ഇത് ഒരു റൂട്ട് ഉപഭോക്തൃ ഗ്രൂപ്പ് ആണ് എഡിറ്റ് ചെയ്യാൻ കഴിയില്ല.
@@ -4969,6 +4976,7 @@
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py,No {0} found for Inter Company Transactions.,ഇൻറർ കമ്പനി ഇടപാടുകൾക്ക് {0} കണ്ടെത്തിയില്ല.
 DocType: Travel Itinerary,Rented Car,വാടകയ്ക്കെടുത്ത കാർ
 apps/erpnext/erpnext/public/js/hub/components/profile_dialog.js,About your Company,നിങ്ങളുടെ കമ്പനിയെക്കുറിച്ച്
+apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.js,Show Stock Ageing Data,സ്റ്റോക്ക് ഏജിംഗ് ഡാറ്റ കാണിക്കുക
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py,Credit To account must be a Balance Sheet account,അക്കൗണ്ടിലേക്ക് ക്രെഡിറ്റ് ഒരു ബാലൻസ് ഷീറ്റ് അക്കൗണ്ട് ആയിരിക്കണം
 DocType: Donor,Donor,ദാതാവിന്
 DocType: Global Defaults,Disable In Words,വാക്കുകളിൽ പ്രവർത്തനരഹിതമാക്കുക
@@ -4983,8 +4991,10 @@
 DocType: Practitioner Schedule,Schedule Name,ഷെഡ്യൂൾ പേര്
 apps/erpnext/erpnext/regional/doctype/gstr_3b_report/gstr_3b_report.py,Please enter GSTIN and state for the Company Address {0},കമ്പനി വിലാസത്തിനായി GSTIN നൽകി സ്റ്റേറ്റ് ചെയ്യുക {0}
 DocType: Currency Exchange,For Buying,വാങ്ങുന്നതിനായി
+apps/erpnext/erpnext/setup/default_energy_point_rules.py,On Purchase Order Submission,വാങ്ങൽ ഓർഡർ സമർപ്പണത്തിൽ
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js,Add All Suppliers,എല്ലാ വിതരണക്കാരെയും ചേർക്കുക
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py,Row #{0}: Allocated Amount cannot be greater than outstanding amount.,വരി # {0}: തുക കുടിശ്ശിക തുക അധികമാകരുത് കഴിയില്ല.
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Customer &gt; Customer Group &gt; Territory,കസ്റ്റമർ&gt; കസ്റ്റമർ ഗ്രൂപ്പ്&gt; ടെറിട്ടറി
 DocType: Tally Migration,Parties,പാർട്ടികൾ
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js,Browse BOM,ബ്രൗസ് BOM ലേക്ക്
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py,Secured Loans,അടച്ച് വായ്പകൾ
@@ -5015,6 +5025,7 @@
 apps/erpnext/erpnext/stock/doctype/item_alternative/item_alternative.py,Not allow to set alternative item for the item {0},ഇനത്തിന് പകരം മറ്റൊന്ന് സജ്ജീകരിക്കാൻ അനുവദിക്കരുത് {0}
 apps/erpnext/erpnext/hr/doctype/leave_block_list/leave_block_list.py,Date is repeated,തീയതി ആവർത്തിക്കുന്നുണ്ട്
 apps/erpnext/erpnext/accounts/print_format/payment_receipt_voucher/payment_receipt_voucher.html,Authorized Signatory,അധികാരങ്ങളും നല്കുകയും
+apps/erpnext/erpnext/education/doctype/instructor/instructor.py,Please setup Instructor Naming System in Education &gt; Education Settings,വിദ്യാഭ്യാസം&gt; വിദ്യാഭ്യാസ ക്രമീകരണങ്ങളിൽ ഇൻസ്ട്രക്ടർ നാമകരണ സംവിധാനം സജ്ജമാക്കുക
 apps/erpnext/erpnext/regional/doctype/gstr_3b_report/gstr_3b_report.html,Net ITC Available(A) - (B),നെറ്റ് ഐടിസി ലഭ്യമാണ് (എ) - (ബി)
 apps/erpnext/erpnext/education/doctype/fee_schedule/fee_schedule.js,Create Fees,ഫീസ് സൃഷ്ടിക്കുക
 DocType: Project,Total Purchase Cost (via Purchase Invoice),(വാങ്ങൽ ഇൻവോയിസ് വഴി) ആകെ വാങ്ങൽ ചെലവ്
@@ -5034,6 +5045,7 @@
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.js,Message Sent,സന്ദേശം അയച്ചു
 apps/erpnext/erpnext/accounts/doctype/account/account.py,Account with child nodes cannot be set as ledger,കുട്ടി നോഡുകൾ കൊണ്ട് അക്കൗണ്ട് ലെഡ്ജർ ആയി സജ്ജമാക്കാൻ കഴിയില്ല
 DocType: C-Form,II,രണ്ടാം
+apps/erpnext/erpnext/assets/report/fixed_asset_register/fixed_asset_register.py,Vendor Name,വില്പനക്കാരന്റെ പേര്
 DocType: Quiz Result,Wrong,തെറ്റാണ്
 DocType: Sales Invoice,Rate at which Price list currency is converted to customer's base currency,വില പട്ടിക കറൻസി ഉപഭോക്താവിന്റെ അടിസ്ഥാന കറൻസി മാറ്റുമ്പോൾ തോത്
 DocType: Purchase Invoice Item,Net Amount (Company Currency),തുക (കമ്പനി കറൻസി)
@@ -5273,6 +5285,7 @@
 DocType: Stock Settings,Auto Material Request,ഓട്ടോ മെറ്റീരിയൽ അഭ്യർത്ഥന
 DocType: Woocommerce Settings,API consumer secret,API ഉപഭോക്തൃ രഹസ്യം
 DocType: Delivery Note Item,Available Batch Qty at From Warehouse,വെയർഹൗസിൽ നിന്ന് ലഭ്യമായ ബാച്ച് Qty
+,Received Qty Amount,ക്യൂട്ടി തുക ലഭിച്ചു
 DocType: Salary Slip,Gross Pay - Total Deduction - Loan Repayment,ഗ്രോസ് പേ - ആകെ കിഴിച്ചുകൊണ്ടു - വായ്പാ തിരിച്ചടവ്
 DocType: Bank Account,Last Integration Date,അവസാന സംയോജന തീയതി
 DocType: Expense Claim,Expense Taxes and Charges,ചെലവ് നികുതികളും നിരക്കുകളും
@@ -5729,6 +5742,8 @@
 DocType: Work Order,MFG-WO-.YYYY.-,MFG-WO-.YYYY.-
 DocType: Drug Prescription,Hour,അന്ത്യസമയം
 DocType: Restaurant Order Entry,Last Sales Invoice,അവസാന സെയിൽസ് ഇൻവോയ്സ്
+apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py,Latest Age,ഏറ്റവും പുതിയ പ്രായം
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js,Transfer Material to Supplier,വിതരണക്കാരൻ വരെ മെറ്റീരിയൽ ട്രാന്സ്ഫര്
 apps/erpnext/erpnext/hr/report/loan_repayment/loan_repayment.py,EMI,EMI
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py,New Serial No cannot have Warehouse. Warehouse must be set by Stock Entry or Purchase Receipt,പുതിയ സീരിയൽ പാണ്ടികശാലയും പാടില്ല. വെയർഹൗസ് ഓഹരി എൻട്രി വാങ്ങാനും റെസീപ്റ്റ് സജ്ജമാക്കി വേണം
 DocType: Lead,Lead Type,ലീഡ് തരം
@@ -5750,7 +5765,6 @@
 apps/erpnext/erpnext/hr/doctype/employee_benefit_application/employee_benefit_application.py,"An amount of {0} already claimed for the component {1},\
 						 set the amount equal or greater than {2}","{0} എന്ന ഘടകത്തിന് ഇതിനകം ക്ലെയിം ചെയ്ത {0} തുക, {2}"
 DocType: Shipping Rule,Shipping Rule Conditions,ഷിപ്പിംഗ് റൂൾ അവസ്ഥകൾ
-DocType: Purchase Invoice,Export Type,എക്സ്പോർട്ട് തരം
 DocType: Salary Slip Loan,Salary Slip Loan,ശമ്പളം സ്ലിപ്പ് വായ്പ
 DocType: BOM Update Tool,The new BOM after replacement,പകരക്കാരനെ ശേഷം പുതിയ BOM
 ,Point of Sale,വിൽപ്പന പോയിന്റ്
@@ -5868,7 +5882,6 @@
 DocType: Purchase Order Item,Blanket Order Rate,ബ്ലാങ്കറ്റ് ഓർഡർ റേറ്റ്
 ,Customer Ledger Summary,ഉപഭോക്തൃ ലെഡ്ജർ സംഗ്രഹം
 apps/erpnext/erpnext/hooks.py,Certification,സർട്ടിഫിക്കേഷൻ
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js,Are you sure you want to make debit note?,ഡെബിറ്റ് നോട്ട് ഉണ്ടാക്കാൻ നിങ്ങൾ ആഗ്രഹിക്കുന്നുണ്ടോ?
 DocType: Bank Guarantee,Clauses and Conditions,നിബന്ധനകളും വ്യവസ്ഥകളും
 DocType: Serial No,Creation Document Type,ക്രിയേഷൻ ഡോക്യുമെന്റ് തരം
 DocType: Amazon MWS Settings,ES,ES
@@ -5906,8 +5919,6 @@
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py,Financial Services,സാമ്പത്തിക സേവനങ്ങൾ
 DocType: Student Sibling,Student ID,സ്റ്റുഡന്റ് ഐഡി
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.js,For Quantity must be greater than zero,ക്വാളിറ്റി പൂജ്യത്തേക്കാൾ വലുതായിരിക്കണം
-apps/erpnext/erpnext/hr/doctype/employee_transfer/employee_transfer.py,"Please delete the Employee <a href=""#Form/Employee/{0}"">{0}</a>\
-					to cancel this document","ഈ പ്രമാണം റദ്ദാക്കുന്നതിന് ജീവനക്കാരൻ <a href=""#Form/Employee/{0}"">{0}</a> delete ഇല്ലാതാക്കുക"
 apps/erpnext/erpnext/config/projects.py,Types of activities for Time Logs,സമയം ലോഗുകൾക്കായി പ്രവർത്തനങ്ങൾ തരങ്ങൾ
 DocType: Opening Invoice Creation Tool,Sales,സെയിൽസ്
 DocType: Stock Entry Detail,Basic Amount,അടിസ്ഥാന തുക
@@ -5985,6 +5996,7 @@
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py,Print and Stationery,അച്ചടിച്ച് സ്റ്റേഷനറി
 DocType: Stock Settings,Show Barcode Field,കാണിക്കുക ബാർകോഡ് ഫീൽഡ്
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js,Send Supplier Emails,വിതരണക്കാരൻ ഇമെയിലുകൾ അയയ്ക്കുക
+DocType: Asset Movement,ACC-ASM-.YYYY.-,ACC-ASM-.YYYY.-
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py,"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,യാന്ത്രികമായി സൃഷ്ടിച്ചു
 apps/erpnext/erpnext/hr/doctype/employee_onboarding/employee_onboarding.py,Submit this to create the Employee record,എംപ്ലോയർ റെക്കോർഡ് സൃഷ്ടിക്കാൻ ഇത് സമർപ്പിക്കുക
@@ -6063,7 +6075,6 @@
 DocType: Sales Team,Contact No.,കോൺടാക്റ്റ് നമ്പർ
 apps/erpnext/erpnext/templates/includes/cart/cart_address.html,Billing Address is same as Shipping Address,ബില്ലിംഗ് വിലാസം ഷിപ്പിംഗ് വിലാസത്തിന് തുല്യമാണ്
 DocType: Bank Reconciliation,Payment Entries,പേയ്മെന്റ് എൻട്രികൾ
-apps/erpnext/erpnext/erpnext_integrations/doctype/shopify_settings/shopify_settings.py,Access token or Shopify URL missing,ആക്സസ്സ് ടോക്കൺ അല്ലെങ്കിൽ Shopify URL കാണുന്നില്ല
 DocType: Location,Latitude,അക്ഷാംശം
 DocType: Work Order,Scrap Warehouse,സ്ക്രാപ്പ് വെയർഹൗസ്
 DocType: Work Order,Check if material transfer entry is not required,മെറ്റീരിയൽ ട്രാൻസ്ഫർ എൻട്രി ആവശ്യമില്ല പരിശോധിക്കുക
@@ -6106,7 +6117,6 @@
 DocType: Job Offer Term,Value / Description,മൂല്യം / വിവരണം
 apps/erpnext/erpnext/controllers/accounts_controller.py,"Row #{0}: Asset {1} cannot be submitted, it is already {2}","വരി # {0}: അസറ്റ് {1} സമർപ്പിക്കാൻ കഴിയില്ല, അത് ഇതിനകം {2} ആണ്"
 DocType: Tax Rule,Billing Country,ബില്ലിംഗ് രാജ്യം
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js,Are you sure you want to make credit note?,നിങ്ങൾക്ക് ക്രെഡിറ്റ് നോട്ട് ഉണ്ടാക്കണമെന്ന് ഉറപ്പാണോ?
 DocType: Purchase Order Item,Expected Delivery Date,പ്രതീക്ഷിച്ച ഡെലിവറി തീയതി
 DocType: Restaurant Order Entry,Restaurant Order Entry,റെസ്റ്റോറന്റ് ഓർഡർ എൻട്രി
 apps/erpnext/erpnext/accounts/general_ledger.py,Debit and Credit not equal for {0} #{1}. Difference is {2}.,"{0} # {1} തുല്യ അല്ല ഡെബിറ്റ്, ക്രെഡിറ്റ്. വ്യത്യാസം {2} ആണ്."
@@ -6229,6 +6239,7 @@
 DocType: Purchase Invoice,Taxes and Charges Added,നികുതി ചാർജുകളും ചേർത്തു
 apps/erpnext/erpnext/assets/doctype/asset/asset.py,Depreciation Row {0}: Next Depreciation Date cannot be before Available-for-use Date,മൂല്യശുദ്ധീകരണ വരി {0}: ലഭ്യമായ മൂല്യവിനിമയ തീയതിയ്ക്ക് തൊട്ടടുത്തുള്ള വില വ്യത്യാസം തീയതി ഉണ്ടായിരിക്കരുത്
 ,Sales Funnel,സെയിൽസ് നാലുവിക്കറ്റ്
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Item Code &gt; Item Group &gt; Brand,ഇന കോഡ്&gt; ഐറ്റം ഗ്രൂപ്പ്&gt; ബ്രാൻഡ്
 apps/erpnext/erpnext/setup/doctype/company/company.py,Abbreviation is mandatory,ചുരുക്കെഴുത്ത് നിർബന്ധമാണ്
 DocType: Project,Task Progress,ടാസ്ക് പുരോഗതി
 apps/erpnext/erpnext/templates/includes/navbar/navbar_items.html,Cart,കാർട്ട്
@@ -6471,6 +6482,7 @@
 DocType: Employee Grade,Employee Grade,തൊഴിലുടമ ഗ്രേഡ്
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py,Piecework,Piecework
 DocType: GSTR 3B Report,June,ജൂൺ
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Supplier &gt; Supplier Type,വിതരണക്കാരൻ&gt; വിതരണ തരം
 DocType: Share Balance,From No,ഇല്ല
 DocType: Shift Type,Early Exit Grace Period,ആദ്യകാല എക്സിറ്റ് ഗ്രേസ് പിരീഡ്
 DocType: Task,Actual Time (in Hours),(അവേഴ്സ്) യഥാർത്ഥ സമയം
@@ -6753,6 +6765,7 @@
 DocType: Warehouse,Warehouse Name,വെയർഹൗസ് പേര്
 DocType: Naming Series,Select Transaction,ഇടപാട് തിരഞ്ഞെടുക്കുക
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py,Please enter Approving Role or Approving User,റോൾ അംഗീകരിക്കുന്നു അല്ലെങ്കിൽ ഉപയോക്താവ് അംഗീകരിക്കുന്നു നൽകുക
+apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.py,UOM Conversion factor ({0} -&gt; {1}) not found for item: {2},ഇനത്തിനായി UOM പരിവർത്തന ഘടകം ({0} -&gt; {1}) കണ്ടെത്തിയില്ല: {2}
 DocType: Journal Entry,Write Off Entry,എൻട്രി എഴുതുക
 DocType: BOM,Rate Of Materials Based On,മെറ്റീരിയൽസ് അടിസ്ഥാനത്തിൽ ഓൺ നിരക്ക്
 DocType: Education Settings,"If enabled, field Academic Term will be Mandatory in Program Enrollment Tool.","പ്രാപ്തമാക്കിയാൽ, ഫീൽഡ് അക്കാദമിക് ടേം പ്രോഗ്രാം എൻറോൾമെന്റ് ടൂളിൽ നിർബന്ധമാണ്."
@@ -6939,6 +6952,7 @@
 DocType: Quality Inspection Reading,Quality Inspection Reading,ക്വാളിറ്റി ഇൻസ്പെക്ഷൻ വായന
 apps/erpnext/erpnext/stock/doctype/stock_settings/stock_settings.py,`Freeze Stocks Older Than` should be smaller than %d days.,`ഫ്രീസുചെയ്യുക സ്റ്റോക്കുകൾ പഴയ Than`% d ദിവസം കുറവായിരിക്കണം.
 DocType: Tax Rule,Purchase Tax Template,വാങ്ങൽ നികുതി ഫലകം
+apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py,Earliest Age,ആദ്യകാല പ്രായം
 apps/erpnext/erpnext/utilities/user_progress.py,Set a sales goal you'd like to achieve for your company.,നിങ്ങളുടെ കമ്പനിയ്ക്കായി നിങ്ങൾ നേടാൻ ആഗ്രഹിക്കുന്ന ഒരു സെയിൽ ഗോൾ സജ്ജമാക്കുക.
 DocType: Quality Goal,Revision,പുനരവലോകനം
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js,Healthcare Services,ഹെൽത്ത് സർവീസസ്
@@ -6981,6 +6995,7 @@
 apps/erpnext/erpnext/healthcare/doctype/patient_encounter/patient_encounter.js,Schedule Discharge,ഷെഡ്യൂൾ ഷെഡ്യൂൾ ചെയ്യുക
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py,Cheques and Deposits incorrectly cleared,തെറ്റായി മായ്ച്ചു ചെക്കുകൾ ആൻഡ് നിക്ഷേപങ്ങൾ
 DocType: Homepage Section Card,Homepage Section Card,ഹോം‌പേജ് വിഭാഗം കാർഡ്
+,Amount To Be Billed,ബിൽ ചെയ്യേണ്ട തുക
 apps/erpnext/erpnext/accounts/doctype/account/account.py,Account {0}: You can not assign itself as parent account,അക്കൗണ്ട് {0}: നിങ്ങൾ പാരന്റ് അക്കൌണ്ട് സ്വയം നിശ്ചയിക്കാന് കഴിയില്ല
 DocType: Purchase Invoice Item,Price List Rate,വില പട്ടിക റേറ്റ്
 apps/erpnext/erpnext/utilities/activation.py,Create customer quotes,ഉപഭോക്തൃ ഉദ്ധരണികൾ സൃഷ്ടിക്കുക
@@ -7033,6 +7048,7 @@
 DocType: Supplier Scorecard Criteria,Supplier Scorecard Criteria,വിതരണക്കാരൻ സ്കോർകാർഡ് മാനദണ്ഡം
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py,Please select Start Date and End Date for Item {0},ഇനം {0} ആരംഭ തീയതിയും അവസാന തീയതി തിരഞ്ഞെടുക്കുക
 DocType: Maintenance Schedule,MAT-MSH-.YYYY.-,MAT-MSH- .YYYY.-
+,Amount to Receive,സ്വീകരിക്കേണ്ട തുക
 apps/erpnext/erpnext/education/doctype/student_group_creation_tool/student_group_creation_tool.py,Course is mandatory in row {0},കോഴ്സ് വരി {0} ലെ നിർബന്ധമായും
 apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py,From date can not be greater than than To date,തീയതി മുതൽ ഇന്നത്തേതിനേക്കാൾ വലുതായിരിക്കരുത്
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py,To date cannot be before from date,ഇന്നുവരെ തീയതി മുതൽ മുമ്പ് ആകാൻ പാടില്ല
@@ -7482,6 +7498,7 @@
 DocType: Delivery Note,Print Without Amount,തുക ഇല്ലാതെ അച്ചടിക്കുക
 apps/erpnext/erpnext/accounts/report/asset_depreciation_ledger/asset_depreciation_ledger.py,Depreciation Date,മൂല്യത്തകർച്ച തീയതി
 ,Work Orders in Progress,വർക്ക് ഓർഡറുകൾ പുരോഗമിക്കുന്നു
+DocType: Customer Credit Limit,Bypass Credit Limit Check,ക്രെഡിറ്റ് പരിധി പരിശോധന ബൈപാസ് ചെയ്യുക
 DocType: Issue,Support Team,പിന്തുണ ടീം
 apps/erpnext/erpnext/stock/report/batch_item_expiry_status/batch_item_expiry_status.py,Expiry (In Days),കാലഹരണ (ദിവസങ്ങളിൽ)
 DocType: Appraisal,Total Score (Out of 5),(5) ആകെ സ്കോർ
@@ -7667,6 +7684,7 @@
 DocType: Sales Invoice,Customer GSTIN,കസ്റ്റമർ ഗ്സ്തിന്
 DocType: Crop Cycle,List of diseases detected on the field. When selected it'll automatically add a list of tasks to deal with the disease ,വയലിൽ കണ്ടെത്തിയ രോഗങ്ങളുടെ ലിസ്റ്റ്. തിരഞ്ഞെടുക്കുമ്പോൾ അത് രോഗത്തെ നേരിടാൻ ചുമതലകളുടെ ഒരു ലിസ്റ്റ് ചേർക്കും
 apps/erpnext/erpnext/manufacturing/page/bom_comparison_tool/bom_comparison_tool.js,BOM 1,ബോം 1
+apps/erpnext/erpnext/assets/report/fixed_asset_register/fixed_asset_register.py,Asset Id,അസറ്റ് ഐഡി
 apps/erpnext/erpnext/healthcare/doctype/healthcare_service_unit/healthcare_service_unit.js,This is a root healthcare service unit and cannot be edited.,"ഇത് ഒരു റൂട്ട് ഹെൽത്ത്കെയർ സർവീസ് യൂണിറ്റ് ആണ്, അത് എഡിറ്റ് ചെയ്യാൻ കഴിയില്ല."
 DocType: Asset Repair,Repair Status,അറ്റകുറ്റപ്പണി നില
 apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.js,"Requested Qty: Quantity requested for purchase, but not ordered.","അഭ്യർത്ഥിച്ച ക്യൂട്ടി: വാങ്ങുന്നതിനായി അളവ് അഭ്യർത്ഥിച്ചു, പക്ഷേ ഓർഡർ ചെയ്തിട്ടില്ല."
diff --git a/erpnext/translations/mr.csv b/erpnext/translations/mr.csv
index 468b5f6..765054f 100644
--- a/erpnext/translations/mr.csv
+++ b/erpnext/translations/mr.csv
@@ -286,7 +286,6 @@
 DocType: Loan,Repay Over Number of Periods,"कालावधी, म्हणजे क्रमांक परत फेड करा"
 apps/erpnext/erpnext/manufacturing/report/bom_stock_report/bom_stock_report.py,Quantity to Produce can not be less than Zero,उत्पादनाची मात्रा झिरोपेक्षा कमी असू शकत नाही
 DocType: Stock Entry,Additional Costs,अतिरिक्त खर्च
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Customer &gt; Customer Group &gt; Territory,ग्राहक&gt; ग्राहक गट&gt; प्रदेश
 apps/erpnext/erpnext/accounts/doctype/account/account.py,Account with existing transaction can not be converted to group.,विद्यमान व्यवहार खाते गट मधे रूपांतरीत केले जाऊ शकत नाही.
 DocType: Lead,Product Enquiry,उत्पादन चौकशी
 DocType: Education Settings,Validate Batch for Students in Student Group,विद्यार्थी गट मध्ये विद्यार्थ्यांसाठी बॅच प्रमाणित
@@ -584,6 +583,7 @@
 DocType: Healthcare Settings,Create documents for sample collection,नमुना संकलनासाठी दस्तऐवज तयार करा
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py,Payment against {0} {1} cannot be greater than Outstanding Amount {2},रक्कम {0} {1} च्या  विरुद्ध भरणा  थकबाकी रक्कम{2} पेक्षा जास्त  असू शकत नाही
 apps/erpnext/erpnext/patches/v11_0/add_healthcare_service_unit_tree_root.py,All Healthcare Service Units,सर्व आरोग्य सेवा एकक
+apps/erpnext/erpnext/setup/default_energy_point_rules.py,On Converting Opportunity,संधी बदलण्यावर
 DocType: Bank Account,Address HTML,पत्ता HTML
 DocType: Lead,Mobile No.,मोबाइल क्रमांक.
 apps/erpnext/erpnext/selling/doctype/pos_closing_voucher/closing_voucher_details.html,Mode of Payments,देण्याची पध्दत
@@ -648,7 +648,6 @@
 DocType: Accounting Dimension,Dimension Name,परिमाण नाव
 apps/erpnext/erpnext/healthcare/setup.py,Resistant,प्रतिरोधक
 apps/erpnext/erpnext/hotels/doctype/hotel_room_reservation/hotel_room_reservation.py,Please set Hotel Room Rate on {},कृपया {0 वर हॉटेल रूम रेट सेट करा
-apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py,Please setup numbering series for Attendance via Setup &gt; Numbering Series,कृपया सेटअप&gt; क्रमांकिंग सीरिजद्वारे उपस्थितीसाठी क्रमांकन मालिका सेट करा
 DocType: Journal Entry,Multi Currency,मल्टी चलन
 DocType: Bank Statement Transaction Invoice Item,Invoice Type,चलन प्रकार
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py,Valid from date must be less than valid upto date,तारखेपासून वैध तारीख पर्यंत वैधपेक्षा कमी असणे आवश्यक आहे
@@ -762,6 +761,7 @@
 apps/erpnext/erpnext/accounts/page/pos/pos.js,Create a new Customer,एक नवीन ग्राहक तयार करा
 apps/erpnext/erpnext/non_profit/report/expiring_memberships/expiring_memberships.py,Expiring On,कालबाह्य होत आहे
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,"If multiple Pricing Rules continue to prevail, users are asked to set Priority manually to resolve conflict.","अनेक किंमत नियम विजय सुरू केल्यास, वापरकर्त्यांना संघर्षाचे निराकरण करण्यासाठी स्वतः प्राधान्य सेट करण्यास सांगितले जाते."
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js,Purchase Return,खरेदी परत
 apps/erpnext/erpnext/utilities/activation.py,Create Purchase Orders,खरेदी ऑर्डर तयार करा
 ,Purchase Register,खरेदी नोंदणी
 apps/erpnext/erpnext/healthcare/doctype/patient/patient.py,Patient not found,रुग्ण आढळले नाही
@@ -776,7 +776,6 @@
 DocType: Location,Area UOM,क्षेत्र UOM
 apps/erpnext/erpnext/manufacturing/doctype/workstation/workstation.py,Workstation is closed on the following dates as per Holiday List: {0},वर्कस्टेशन सुट्टी यादी नुसार खालील तारखांना बंद आहे: {0}
 apps/erpnext/erpnext/selling/page/sales_funnel/sales_funnel.py,Opportunities,संधी
-apps/erpnext/erpnext/www/all-products/index.html,Clear filters,फिल्टर साफ करा
 DocType: Lab Test Template,Single,सिंगल
 DocType: Compensatory Leave Request,Work From Date,कामाची तारीख
 DocType: Salary Slip,Total Loan Repayment,एकूण कर्ज परतफेड
@@ -820,6 +819,7 @@
 apps/erpnext/erpnext/education/doctype/program_enrollment_tool/program_enrollment_tool.py,Mandatory field - Academic Year,अनिवार्य फील्ड - शैक्षणिक वर्ष
 apps/erpnext/erpnext/education/doctype/program_enrollment_tool/program_enrollment_tool.py,Mandatory field - Academic Year,अनिवार्य फील्ड - शैक्षणिक वर्ष
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py,{0} {1} is not associated with {2} {3},{0} {1} {2} {3} सह संबंधित नाही
+DocType: Opportunity,Converted By,द्वारा रूपांतरित
 apps/erpnext/erpnext/public/js/hub/components/ReviewArea.vue,You need to login as a Marketplace User before you can add any reviews.,आपण कोणतीही पुनरावलोकने जोडण्यापूर्वी आपल्याला बाजारपेठ वापरकर्ता म्हणून लॉग इन करणे आवश्यक आहे.
 apps/erpnext/erpnext/manufacturing/doctype/job_card/job_card.py,Row {0} : Operation is required against the raw material item {1},रो {0}: कच्चा माल आयटम {1} विरूद्ध ऑपरेशन आवश्यक आहे
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py,Please set default payable account for the company {0},कंपनी मुलभूत देय खाते सेट करा {0}
@@ -846,6 +846,8 @@
 DocType: Sales Invoice,Total Qty,एकूण Qty
 apps/erpnext/erpnext/education/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py,Guardian2 Email ID,Guardian2 ईमेल आयडी
 apps/erpnext/erpnext/education/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py,Guardian2 Email ID,Guardian2 ईमेल आयडी
+apps/erpnext/erpnext/hr/doctype/employee_transfer/employee_transfer.py,"Please delete the Employee <a href=""#Form/Employee/{0}"">{0}</a>\
+					to cancel this document","कृपया हा कागदजत्र रद्द करण्यासाठी कर्मचारी <a href=""#Form/Employee/{0}"">{0}.</a> हटवा"
 DocType: Item,Show in Website (Variant),वेबसाइट दर्शवा (चल)
 DocType: Employee,Health Concerns,आरोग्य समस्यांसाठी
 DocType: Payroll Entry,Select Payroll Period,वेतनपट कालावधी निवडा
@@ -904,7 +906,6 @@
 DocType: Codification Table,Codification Table,कोडिंग टेबल
 DocType: Timesheet Detail,Hrs,तास
 apps/erpnext/erpnext/manufacturing/page/bom_comparison_tool/bom_comparison_tool.js,Changes in {0},{0} मध्ये बदल
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js,Please select Company,कृपया कंपनी निवडा
 DocType: Employee Skill,Employee Skill,कर्मचारी कौशल्य
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.js,Difference Account,फरक खाते
 DocType: Pricing Rule,Discount on Other Item,इतर वस्तूंवर सूट
@@ -972,6 +973,7 @@
 DocType: BOM,Operating Cost,ऑपरेटिंग खर्च
 DocType: Crop,Produced Items,उत्पादित वस्तू
 DocType: Bank Statement Transaction Entry,Match Transaction to Invoices,बीजकांवरील व्यवहार जुळवा
+apps/erpnext/erpnext/erpnext_integrations/exotel_integration.py,Error in Exotel incoming call,एक्सटेल इनकमिंग कॉलमध्ये त्रुटी
 DocType: Sales Order Item,Gross Profit,निव्वळ नफा
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js,Unblock Invoice,बीजक अनावरोधित करा
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py,Increment cannot be 0,बढती 0 असू शकत नाही
@@ -1182,6 +1184,7 @@
 DocType: Activity Cost,Activity Type,क्रियाकलाप प्रकार
 DocType: Request for Quotation,For individual supplier,वैयक्तिक पुरवठादार साठी
 DocType: BOM Operation,Base Hour Rate(Company Currency),बेस तास दर (कंपनी चलन)
+,Qty To Be Billed,बिल टाकायचे बिल
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py,Delivered Amount,वितरित केले रक्कम
 apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.js,Reserved Qty for Production: Raw materials quantity to make manufacturing items.,उत्पादनासाठी राखीव ठेवलेली मात्रा: वस्तू बनवण्यासाठी कच्च्या मालाचे प्रमाण.
 DocType: Loyalty Point Entry Redemption,Redemption Date,रिडेम्प्शन तारीख
@@ -1301,7 +1304,7 @@
 apps/erpnext/erpnext/education/doctype/student_group/student_group.py,Please select Program,कृपया निवडा कार्यक्रम
 apps/erpnext/erpnext/education/doctype/student_group/student_group.py,Please select Program,कृपया निवडा कार्यक्रम
 DocType: Project,Estimated Cost,अंदाजे खर्च
-DocType: Request for Quotation,Link to material requests,साहित्य विनंत्या दुवा
+DocType: Supplier Quotation,Link to material requests,साहित्य विनंत्या दुवा
 apps/erpnext/erpnext/public/js/hub/pages/Publish.vue,Publish,प्रकाशित करा
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py,Aerospace,एरोस्पेस
 ,Fichier des Ecritures Comptables [FEC],फिचर्स डेस इक्वेटरीज कॉप्पीटेबल [एफईसी]
@@ -1314,6 +1317,7 @@
 apps/erpnext/erpnext/utilities/transaction_base.py,Invalid Posting Time,अवैध पोस्टिंग वेळ
 DocType: Salary Component,Condition and Formula,अट आणि फॉर्म्युला
 DocType: Lead,Campaign Name,मोहीम नाव
+apps/erpnext/erpnext/setup/default_energy_point_rules.py,On Task Completion,कार्य पूर्ण केल्यावर
 apps/erpnext/erpnext/hr/doctype/compensatory_leave_request/compensatory_leave_request.py,There is no leave period in between {0} and {1},{0} आणि {1} दरम्यान कोणतीही सुट्टीची मुदत नाही
 DocType: Fee Validity,Healthcare Practitioner,हेल्थकेअर प्रॅक्टीशनर
 DocType: Hotel Room,Capacity,क्षमता
@@ -1657,7 +1661,6 @@
 DocType: Quality Feedback Template,Quality Feedback Template,गुणवत्ता अभिप्राय टेम्पलेट
 apps/erpnext/erpnext/config/education.py,LMS Activity,एलएमएस क्रियाकलाप
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py,Internet Publishing,इंटरनेट प्रकाशन
-DocType: Prescription Duration,Number,नंबर
 apps/erpnext/erpnext/accounts/doctype/opening_invoice_creation_tool/opening_invoice_creation_tool.js,Creating {0} Invoice,{0} चलन तयार करणे
 DocType: Medical Code,Medical Code Standard,वैद्यकीय कोड मानक
 DocType: Soil Texture,Clay Composition (%),चिकणमाती रचना (%)
@@ -1732,6 +1735,7 @@
 DocType: Support Settings,Get Started Sections,प्रारंभ विभाग
 DocType: Lead,CRM-LEAD-.YYYY.-,सीआरएम-LEAD -YYYY.-
 DocType: Invoice Discounting,Sanctioned,मंजूर
+,Base Amount,बेस रक्कम
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.js,Total Contribution Amount: {0},एकूण योगदान रक्कम: {0}
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py,Row #{0}: Please specify Serial No for Item {1},रो # {0}: आयटम {1} साठी   सिरियल क्रमांक निर्दिष्ट करा
 DocType: Payroll Entry,Salary Slips Submitted,वेतन स्लिप सादर
@@ -1954,6 +1958,7 @@
 DocType: Accounting Dimension,Dimension Defaults,परिमाण डीफॉल्ट
 apps/erpnext/erpnext/crm/report/prospects_engaged_but_not_converted/prospects_engaged_but_not_converted.js,Minimum Lead Age (Days),किमान लीड वय (दिवस)
 apps/erpnext/erpnext/crm/report/prospects_engaged_but_not_converted/prospects_engaged_but_not_converted.js,Minimum Lead Age (Days),किमान लीड वय (दिवस)
+apps/erpnext/erpnext/assets/report/fixed_asset_register/fixed_asset_register.py,Available For Use Date,वापराच्या तारखेसाठी उपलब्ध
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py,All BOMs,सर्व BOMs
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js,Create Inter Company Journal Entry,इंटर कंपनी जर्नल एंट्री तयार करा
 DocType: Company,Parent Company,पालक कंपनी
@@ -2017,6 +2022,7 @@
 ,IRS 1099,आयआरएस 1099
 DocType: Salary Slip,Leave Without Pay,पे न करता रजा
 DocType: Payment Request,Outward,बाहेरची
+apps/erpnext/erpnext/setup/default_energy_point_rules.py,On {0} Creation,{0} क्रिएशनवर
 apps/erpnext/erpnext/regional/doctype/gstr_3b_report/gstr_3b_report.html,State/UT Tax,राज्य / केंद्रशासित प्रदेश कर
 ,Trial Balance for Party,पार्टी चाचणी शिल्लक
 ,Gross and Net Profit Report,एकूण आणि निव्वळ नफा अहवाल
@@ -2132,6 +2138,7 @@
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js,Make Stock Entry,स्टॉक एन्ट्री करा
 DocType: Hotel Room Reservation,Hotel Reservation User,हॉटेल आरक्षण वापरकर्ता
 apps/erpnext/erpnext/projects/doctype/project/project.js,Set Status,स्थिती सेट करा
+apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py,Please setup numbering series for Attendance via Setup &gt; Numbering Series,कृपया सेटअप&gt; क्रमांकिंग सीरिजद्वारे उपस्थितीसाठी क्रमांकन मालिका सेट करा
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py,Please select prefix first,कृपया पहले उपसर्ग निवडा
 DocType: Contract,Fulfilment Deadline,पूर्तता करण्याची अंतिम मुदत
 apps/erpnext/erpnext/public/js/hub/pages/Home.vue,Near you,तुमच्या जवळ
@@ -2147,6 +2154,7 @@
 DocType: Announcement,All Students,सर्व विद्यार्थी
 apps/erpnext/erpnext/assets/doctype/asset/asset.py,Item {0} must be a non-stock item,{0} आयटम एक नॉन-स्टॉक आयटम असणे आवश्यक आहे
 apps/erpnext/erpnext/stock/doctype/batch/batch.js,View Ledger,लेजर पहा
+DocType: Cost Center,Lft,Lft
 DocType: Grading Scale,Intervals,कालांतराने
 DocType: Bank Statement Transaction Entry,Reconciled Transactions,पुनर्रचना व्यवहार
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py,Earliest,लवकरात लवकर
@@ -2261,6 +2269,7 @@
 apps/erpnext/erpnext/hr/doctype/employee_benefit_application/employee_benefit_application.py,As per your assigned Salary Structure you cannot apply for benefits,आपल्या नियुक्त सॅलरी संरचना नुसार आपण लाभांसाठी अर्ज करू शकत नाही
 apps/erpnext/erpnext/stock/doctype/item/item.py,Website Image should be a public file or website URL,वेबसाइट प्रतिमा सार्वजनिक फाइल किंवा वेबसाइट URL असावी
 DocType: Purchase Invoice Item,BOM,BOM
+apps/erpnext/erpnext/stock/doctype/item/item.py,Duplicate entry in Manufacturers table,उत्पादकांच्या टेबलमध्ये डुप्लिकेट प्रविष्टी
 apps/erpnext/erpnext/setup/doctype/item_group/item_group.js,This is a root item group and cannot be edited.,हा रूट आयटम गट आहे आणि संपादित केला जाऊ शकत नाही.
 apps/erpnext/erpnext/accounts/doctype/account/account.js,Merge,विलीन
 DocType: Journal Entry Account,Purchase Order,खरेदी ऑर्डर
@@ -2404,7 +2413,6 @@
 DocType: Asset,Depreciation Schedules,घसारा वेळापत्रक
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.js,Create Sales Invoice,विक्री बीजक तयार करा
 apps/erpnext/erpnext/regional/doctype/gstr_3b_report/gstr_3b_report.html,Ineligible ITC,अपात्र आयटीसी
-apps/erpnext/erpnext/erpnext_integrations/doctype/shopify_settings/shopify_settings.py,"Support for public app is deprecated. Please setup private app, for more details refer user manual","सार्वजनिक अॅपसाठी समर्थन असमर्थित आहे कृपया खाजगी अॅप्लिकेशन सेट करा, अधिक माहितीसाठी युजर मॅन्युअल पहा"
 DocType: Task,Dependent Tasks,अवलंबित कार्ये
 apps/erpnext/erpnext/regional/report/gstr_1/gstr_1.py,Following accounts might be selected in GST Settings:,खालील खाती जीएसटी सेटिंग्जमध्ये निवडली जाऊ शकतात:
 apps/erpnext/erpnext/manufacturing/report/bom_stock_report/bom_stock_report.js,Quantity to Produce,उत्पादन करण्यासाठी प्रमाण
@@ -2652,6 +2660,7 @@
 DocType: Water Analysis,Container,कंटेनर
 apps/erpnext/erpnext/regional/report/gstr_1/gstr_1.py,Please set valid GSTIN No. in Company Address,कृपया कंपनीच्या पत्त्यावर वैध जीएसटीआयएन क्रमांक सेट करा
 apps/erpnext/erpnext/education/utils.py,Student {0} - {1} appears Multiple times in row {2} & {3},विद्यार्थी {0} - {1} सलग अनेक वेळा आढळते {2} &amp; {3}
+apps/erpnext/erpnext/selling/doctype/customer/customer.py,Following fields are mandatory to create address:,पत्ता तयार करण्यासाठी खालील फील्ड अनिवार्य आहेत:
 DocType: Item Alternative,Two-way,दोन-मार्ग
 DocType: Item,Manufacturers,उत्पादक
 ,Employee Billing Summary,कर्मचारी बिलिंग सारांश
@@ -2726,9 +2735,9 @@
 DocType: Employee,HR-EMP-,एचआर-ईएमपी-
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py,User {0} doesn't have any default POS Profile. Check Default at Row {1} for this User.,वापरकर्ता {0} कडे कोणताही डीफॉल्ट POS प्रोफाइल नाही. या वापरकर्त्यासाठी पंक्ती {1} येथे डीफॉल्ट तपासा.
 DocType: Quality Meeting Minutes,Quality Meeting Minutes,गुणवत्ता बैठक मिनिटे
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Supplier &gt; Supplier Type,पुरवठादार&gt; पुरवठादार प्रकार
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py,Employee Referral,कर्मचा-रेफरल
 DocType: Student Group,Set 0 for no limit,कोणतीही मर्यादा नाही सेट करा 0
+DocType: Cost Center,rgt,rgt
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py,The day(s) on which you are applying for leave are holidays. You need not apply for leave.,आपण ज्या दिवशी रजेचे  अर्ज करत आहात  ते दिवस  सुटीचे  आहेत. आपण रजा अर्ज करण्याची गरज नाही.
 DocType: Customer,Primary Address and Contact Detail,प्राथमिक पत्ता आणि संपर्क तपशील
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.js,Resend Payment Email,भरणा ईमेल पुन्हा पाठवा
@@ -2836,7 +2845,6 @@
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py,Against Supplier Invoice {0} dated {1},पुरवठादार विरुद्ध चलन {0} दिनांक {1}
 DocType: Customer,Default Price List,मुलभूत दर सूची
 apps/erpnext/erpnext/assets/doctype/asset/asset.py,Asset Movement record {0} created,मालमत्ता चळवळ रेकॉर्ड {0} तयार
-apps/erpnext/erpnext/utilities/page/leaderboard/leaderboard.js,No items found.,कोणतेही आयटम आढळले नाहीत.
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py,You cannot delete Fiscal Year {0}. Fiscal Year {0} is set as default in Global Settings,आपण हटवू शकत नाही आर्थिक वर्ष {0}. आर्थिक वर्ष {0} वैश्विक सेटिंग्ज मध्ये डीफॉल्ट म्हणून सेट केले आहे
 DocType: Share Transfer,Equity/Liability Account,इक्विटी / दायित्व खाते
 apps/erpnext/erpnext/setup/doctype/customer_group/customer_group.py,A customer with the same name already exists,त्याच नावासह असलेले ग्राहक आधीपासून अस्तित्वात आहे
@@ -2852,6 +2860,7 @@
 apps/erpnext/erpnext/selling/doctype/customer/customer.py,Credit limit has been crossed for customer {0} ({1}/{2}),ग्राहकांकरिता क्रेडिट मर्यादा पार केली आहे. {0} ({1} / {2})
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py,Customer required for 'Customerwise Discount','Customerwise सवलत' साठी आवश्यक ग्राहक
 apps/erpnext/erpnext/config/accounting.py,Update bank payment dates with journals.,नियतकालिकेसह  बँकेच्या भरणा तारखा अद्यतनित करा.
+,Billed Qty,बिल दिले क्ती
 apps/erpnext/erpnext/stock/doctype/item/item_dashboard.py,Pricing,किंमत
 DocType: Employee,Attendance Device ID (Biometric/RF tag ID),उपस्थिती डिव्हाइस आयडी (बायोमेट्रिक / आरएफ टॅग आयडी)
 DocType: Quotation,Term Details,मुदत तपशील
@@ -2875,6 +2884,7 @@
 DocType: Share Transfer,Asset Account,मालमत्ता खाते
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js,New release date should be in the future,नवीन रीलिझ तारीख भविष्यात असावी
 DocType: Purchase Invoice,End date of current invoice's period,चालू चलन च्या कालावधी समाप्ती तारीख
+apps/erpnext/erpnext/hr/doctype/employee/employee.py,Please setup Employee Naming System in Human Resource &gt; HR Settings,मानव संसाधन&gt; एचआर सेटिंग्जमध्ये कर्मचारी नेमिंग सिस्टम सेट करा
 DocType: Lab Test,Technician Name,तंत्रज्ञानाचे नाव
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py,"Cannot ensure delivery by Serial No as \
 					Item {0} is added with and without Ensure Delivery by \
@@ -2882,6 +2892,7 @@
 DocType: Accounts Settings,Unlink Payment on Cancellation of Invoice,चलन रद्द देयक दुवा रद्द करा
 DocType: Bank Reconciliation,From Date,तारखेपासून
 apps/erpnext/erpnext/hr/doctype/vehicle_log/vehicle_log.py,Current Odometer reading entered should be greater than initial Vehicle Odometer {0},प्रवेश चालू ओडोमीटर वाचन प्रारंभिक वाहन ओडोमीटर अधिक असावे {0}
+,Purchase Order Items To Be Received or Billed,खरेदी ऑर्डर आयटम प्राप्त किंवा बिल करण्यासाठी
 DocType: Restaurant Reservation,No Show,शो नाही
 apps/erpnext/erpnext/regional/india/utils.py,You must be a registered supplier to generate e-Way Bill,ई-वे बिल तयार करण्यासाठी आपण नोंदणीकृत पुरवठादार असणे आवश्यक आहे
 DocType: Shipping Rule Country,Shipping Rule Country,शिपिंग नियम देश
@@ -2923,6 +2934,7 @@
 apps/erpnext/erpnext/templates/generators/item/item_add_to_cart.html,View in Cart,टाका पहा
 DocType: Employee Checkin,Shift Actual Start,शिफ्ट वास्तविक प्रारंभ
 DocType: Tally Migration,Is Day Book Data Imported,इज डे बुक डेटा आयात केला
+,Purchase Order Items To Be Received or Billed1,खरेदी ऑर्डर आयटम प्राप्त करणे किंवा बिल करणे 1
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py,Marketing Expenses,विपणन खर्च
 apps/erpnext/erpnext/stock/doctype/pick_list/pick_list.py,{0} units of {1} is not available.,{1} चे {0} एकके उपलब्ध नाहीत.
 ,Item Shortage Report,आयटम कमतरता अहवाल
@@ -3288,6 +3300,7 @@
 ,Campaign Efficiency,मोहीम कार्यक्षमता
 ,Campaign Efficiency,मोहीम कार्यक्षमता
 DocType: Discussion,Discussion,चर्चा
+apps/erpnext/erpnext/setup/default_energy_point_rules.py,On Sales Order Submission,विक्री ऑर्डर सबमिशनवर
 DocType: Bank Transaction,Transaction ID,Transaction ID
 DocType: Payroll Entry,Deduct Tax For Unsubmitted Tax Exemption Proof,सबमिट न केलेल्या कर सूट सबस्क्रिप्शनसाठी कराची वसुली करा
 DocType: Volunteer,Anytime,कधीही
@@ -3295,7 +3308,6 @@
 DocType: Employee Tax Exemption Proof Submission,Employee Tax Exemption Proof Submission,कर्मचारी कर सूट सबॉफ सबमिशन
 DocType: Patient,Surgical History,सर्जिकल इतिहास
 DocType: Bank Statement Settings Item,Mapped Header,मॅप केलेली शीर्षलेख
-apps/erpnext/erpnext/hr/doctype/employee/employee.py,Please setup Employee Naming System in Human Resource &gt; HR Settings,मानव संसाधन&gt; एचआर सेटिंग्जमध्ये कर्मचारी नेमिंग सिस्टम सेट करा
 DocType: Employee,Resignation Letter Date,राजीनामा तारीख
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Pricing Rules are further filtered based on quantity.,किंमत नियमांना   पुढील प्रमाणावर आधारित फिल्टर आहेत.
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py,Please set the Date Of Joining for employee {0},कर्मचारी सामील तारीख सेट करा {0}
@@ -3310,6 +3322,7 @@
 DocType: Bank Statement Settings,Mapped Items,मॅप केलेली आयटम
 DocType: Amazon MWS Settings,IT,आयटी
 DocType: Chapter,Chapter,अध्याय
+,Fixed Asset Register,निश्चित मालमत्ता नोंदणी
 apps/erpnext/erpnext/utilities/user_progress.py,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,Select BOM and Qty for Production,उत्पादन BOM आणि प्रमाण निवडा
@@ -4001,7 +4014,6 @@
 DocType: Project User,Project Status,प्रकल्प स्थिती
 DocType: UOM,Check this to disallow fractions. (for Nos),अपूर्णांक अनुमती रद्द करण्यासाठी हे तपासा. (क्रमांकासाठी)
 DocType: Student Admission Program,Naming Series (for Student Applicant),मालिका नाव (विद्यार्थी अर्जदाराचे)
-apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.py,UOM Conversion factor ({0} -&gt; {1}) not found for item: {2},आयटमसाठी यूओएम रूपांतरण घटक ({0} -&gt; {1}) आढळला नाही: {2}
 apps/erpnext/erpnext/hr/doctype/retention_bonus/retention_bonus.py,Bonus Payment Date cannot be a past date,बोनस देय तारीख एक मागील तारीख असू शकत नाही
 DocType: Travel Request,Copy of Invitation/Announcement,आमंत्रण / घोषणाची प्रत
 DocType: Practitioner Service Unit Schedule,Practitioner Service Unit Schedule,चिकित्सक सेवा युनिट वेळापत्रक
@@ -4226,7 +4238,6 @@
 DocType: Journal Entry,Accounting Entries,लेखा नोंदी
 DocType: Job Card Time Log,Job Card Time Log,जॉब कार्ड वेळ लॉग
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,"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; क्षेत्रात आणले जाईल."
-apps/erpnext/erpnext/education/doctype/instructor/instructor.py,Please setup Instructor Naming System in Education &gt; Education Settings,कृपया शिक्षण&gt; शिक्षण सेटिंग्ज मधील इन्स्ट्रक्टर नामांकन प्रणाली सेट करा
 DocType: Journal Entry,Paid Loan,पेड लोन
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py,Duplicate Entry. Please check Authorization Rule {0},प्रवेश डुप्लिकेट. कृपया प्राधिकृत नियम {0} तपासा
 DocType: Journal Entry Account,Reference Due Date,संदर्भ देय दिनांक
@@ -4243,7 +4254,6 @@
 apps/erpnext/erpnext/templates/pages/projects.html,No time sheets,नाही वेळ पत्रके
 DocType: GoCardless Mandate,GoCardless Customer,GoCardless ग्राहक
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py,Leave Type {0} cannot be carry-forwarded,रजा प्रकार {0} carry-forward केला  जाऊ शकत नाही
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Item Code &gt; Item Group &gt; Brand,आयटम कोड&gt; आयटम गट&gt; ब्रँड
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py,Maintenance Schedule is not generated for all the items. Please click on 'Generate Schedule',देखभाल वेळापत्रक सर्व आयटम व्युत्पन्न नाही. &#39;व्युत्पन्न वेळापत्रक&#39; वर क्लिक करा
 ,To Produce,उत्पन्न करण्यासाठी
 DocType: Leave Encashment,Payroll,उपयोग पे रोल
@@ -4359,7 +4369,6 @@
 DocType: Stock Ledger Entry,Actual Qty After Transaction,व्यवहार केल्यानंतर प्रत्यक्ष प्रमाण
 ,Pending SO Items For Purchase Request,खरेदी विनंती म्हणून प्रलंबित आयटम
 apps/erpnext/erpnext/education/doctype/student_admission/student_admission.py,Student Admissions,विद्यार्थी प्रवेश
-apps/erpnext/erpnext/accounts/party.py,{0} {1} is disabled,{0} {1} अक्षम आहे
 DocType: Supplier,Billing Currency,बिलिंग चलन
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py,Extra Large,अधिक मोठे
 DocType: Loan,Loan Application,कर्ज अर्ज
@@ -4436,7 +4445,6 @@
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py,Only Leave Applications with status 'Approved' and 'Rejected' can be submitted,फक्त स्थिती सह अनुप्रयोग सोडा &#39;मंजूर&#39; आणि &#39;रिजेक्टेड&#39; सादर केला जाऊ शकतो
 apps/erpnext/erpnext/accounts/doctype/accounting_dimension/accounting_dimension.py,Creating Dimensions...,परिमाण तयार करीत आहे ...
 apps/erpnext/erpnext/education/doctype/student_group_creation_tool/student_group_creation_tool.py,Student Group Name is mandatory in row {0},विद्यार्थी गट नाव सलग आवश्यक आहे {0}
-DocType: Customer Credit Limit,Bypass credit limit_check,बायपास क्रेडिट मर्यादा_ तपासणी
 DocType: Homepage,Products to be shown on website homepage,उत्पादने वेबसाइटवर मुख्यपृष्ठावर दर्शविले करणे
 DocType: HR Settings,Password Policy,संकेतशब्द धोरण
 apps/erpnext/erpnext/setup/doctype/customer_group/customer_group.js,This is a root customer group and cannot be edited.,हा  मूळ ग्राहक गट आहे आणि संपादित केला जाऊ शकत नाही.
@@ -5026,6 +5034,7 @@
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py,No {0} found for Inter Company Transactions.,आंतर कंपनी व्यवहारांसाठी कोणतेही {0} आढळले नाही.
 DocType: Travel Itinerary,Rented Car,भाड्याने कार
 apps/erpnext/erpnext/public/js/hub/components/profile_dialog.js,About your Company,आपल्या कंपनी बद्दल
+apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.js,Show Stock Ageing Data,स्टॉक एजिंग डेटा दर्शवा
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py,Credit To account must be a Balance Sheet account,क्रेडिट खाते ताळेबंद खाते असणे आवश्यक आहे
 DocType: Donor,Donor,दाता
 DocType: Global Defaults,Disable In Words,शब्द मध्ये अक्षम
@@ -5039,8 +5048,10 @@
 DocType: Patient,Patient ID,रुग्ण आयडी
 DocType: Practitioner Schedule,Schedule Name,शेड्यूल नाव
 DocType: Currency Exchange,For Buying,खरेदीसाठी
+apps/erpnext/erpnext/setup/default_energy_point_rules.py,On Purchase Order Submission,खरेदी आदेश सबमिशनवर
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js,Add All Suppliers,सर्व पुरवठादार जोडा
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py,Row #{0}: Allocated Amount cannot be greater than outstanding amount.,पंक्ती # {0}: रक्कम थकबाकी रक्कम पेक्षा जास्त असू शकत नाही.
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Customer &gt; Customer Group &gt; Territory,ग्राहक&gt; ग्राहक गट&gt; प्रदेश
 DocType: Tally Migration,Parties,पक्ष
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js,Browse BOM,ब्राउझ करा BOM
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py,Secured Loans,सुरक्षित कर्ज
@@ -5072,6 +5083,7 @@
 apps/erpnext/erpnext/stock/doctype/item_alternative/item_alternative.py,Not allow to set alternative item for the item {0},आयटम {0} साठी पर्यायी आयटम सेट करण्याची अनुमती नाही
 apps/erpnext/erpnext/hr/doctype/leave_block_list/leave_block_list.py,Date is repeated,तारीख पुनरावृत्ती आहे
 apps/erpnext/erpnext/accounts/print_format/payment_receipt_voucher/payment_receipt_voucher.html,Authorized Signatory,अधिकृत स्वाक्षरीकर्ता
+apps/erpnext/erpnext/education/doctype/instructor/instructor.py,Please setup Instructor Naming System in Education &gt; Education Settings,कृपया शिक्षण&gt; शिक्षण सेटिंग्ज मधील इन्स्ट्रक्टर नामांकन प्रणाली सेट करा
 apps/erpnext/erpnext/regional/doctype/gstr_3b_report/gstr_3b_report.html,Net ITC Available(A) - (B),नेट आयटीसी उपलब्ध (ए) - (बी)
 apps/erpnext/erpnext/education/doctype/fee_schedule/fee_schedule.js,Create Fees,फी तयार करा
 DocType: Project,Total Purchase Cost (via Purchase Invoice),एकूण खरेदी किंमत (खरेदी  चलन द्वारे)
@@ -5091,6 +5103,7 @@
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.js,Message Sent,संदेश पाठवला
 apps/erpnext/erpnext/accounts/doctype/account/account.py,Account with child nodes cannot be set as ledger,बालक नोडस् सह खाते लेजर म्हणून सेट केली जाऊ शकत  नाही
 DocType: C-Form,II,दुसरा
+apps/erpnext/erpnext/assets/report/fixed_asset_register/fixed_asset_register.py,Vendor Name,विक्रेता नाव
 DocType: Quiz Result,Wrong,चुकीचे
 DocType: Sales Invoice,Rate at which Price list currency is converted to customer's base currency,दर ज्यामध्ये किंमत यादी चलन ग्राहक बेस चलनमधे  रूपांतरित आहे
 DocType: Purchase Invoice Item,Net Amount (Company Currency),निव्वळ रक्कम (कंपनी चलन)
@@ -5331,6 +5344,7 @@
 DocType: Stock Settings,Auto Material Request,ऑटो साहित्य विनंती
 DocType: Woocommerce Settings,API consumer secret,API ग्राहक गोपनीय
 DocType: Delivery Note Item,Available Batch Qty at From Warehouse,वखार पासून उपलब्ध बॅच प्रमाण
+,Received Qty Amount,किती रक्कम मिळाली
 DocType: Salary Slip,Gross Pay - Total Deduction - Loan Repayment,एकूण पे - एकूण कापून - कर्जाची परतफेड
 DocType: Bank Account,Last Integration Date,अखंड एकत्रीकरणाची तारीख
 DocType: Expense Claim,Expense Taxes and Charges,खर्च कर आणि शुल्क
@@ -5788,6 +5802,8 @@
 DocType: Drug Prescription,Hour,तास
 DocType: Restaurant Order Entry,Last Sales Invoice,अंतिम विक्री चलन
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py,Please select Qty against item {0},कृपया आयटम {0} विरुद्ध घाटी निवडा
+apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py,Latest Age,ताजे वय
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js,Transfer Material to Supplier,पुरवठादार करण्यासाठी ह तांत रत
 apps/erpnext/erpnext/hr/report/loan_repayment/loan_repayment.py,EMI,ईएमआय
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py,New Serial No cannot have Warehouse. Warehouse must be set by Stock Entry or Purchase Receipt,नवीन सिरिअल क्रमांक कोठार असू  शकत नाही. कोठार शेअर नोंद किंवा खरेदी पावती सेट करणे आवश्यक आहे
 DocType: Lead,Lead Type,लीड प्रकार
@@ -5809,7 +5825,6 @@
 apps/erpnext/erpnext/hr/doctype/employee_benefit_application/employee_benefit_application.py,"An amount of {0} already claimed for the component {1},\
 						 set the amount equal or greater than {2}","{0} ची रक्कम आधीच {1} घटकांकरिता दावा केला आहे, \ {2} पेक्षा अधिक किंवा त्यापेक्षा जास्त रक्कम सेट करा"
 DocType: Shipping Rule,Shipping Rule Conditions,शिपिंग नियम अटी
-DocType: Purchase Invoice,Export Type,निर्यात प्रकार
 DocType: Salary Slip Loan,Salary Slip Loan,वेतन स्लिप कर्ज
 DocType: BOM Update Tool,The new BOM after replacement,बदली नवीन BOM
 ,Point of Sale,विक्री पॉइंट
@@ -5928,7 +5943,6 @@
 DocType: Purchase Order Item,Blanket Order Rate,कमाना आदेश दर
 ,Customer Ledger Summary,ग्राहक लेजर सारांश
 apps/erpnext/erpnext/hooks.py,Certification,प्रमाणन
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js,Are you sure you want to make debit note?,आपणास खात्री आहे की आपण डेबिट नोट बनवू इच्छिता?
 DocType: Bank Guarantee,Clauses and Conditions,कलमे आणि अटी
 DocType: Serial No,Creation Document Type,निर्मिती दस्तऐवज क्रमांक
 DocType: Amazon MWS Settings,ES,ES
@@ -5966,8 +5980,6 @@
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py,Financial Services,वित्तीय सेवा
 DocType: Student Sibling,Student ID,विद्यार्थी ओळखपत्र
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.js,For Quantity must be greater than zero,प्रमाण शून्यापेक्षा जास्त असणे आवश्यक आहे
-apps/erpnext/erpnext/hr/doctype/employee_transfer/employee_transfer.py,"Please delete the Employee <a href=""#Form/Employee/{0}"">{0}</a>\
-					to cancel this document","कृपया हा कागदजत्र रद्द करण्यासाठी कर्मचारी <a href=""#Form/Employee/{0}"">{0}.</a> हटवा"
 apps/erpnext/erpnext/config/projects.py,Types of activities for Time Logs,वेळ नोंदी उपक्रम प्रकार
 DocType: Opening Invoice Creation Tool,Sales,विक्री
 DocType: Stock Entry Detail,Basic Amount,मूलभूत रक्कम
@@ -6046,6 +6058,7 @@
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py,Print and Stationery,प्रिंट आणि स्टेशनरी
 DocType: Stock Settings,Show Barcode Field,बारकोड फिल्ड दर्शवा
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js,Send Supplier Emails,पुरवठादार ई-मेल पाठवा
+DocType: Asset Movement,ACC-ASM-.YYYY.-,एसीसी-एएसएम-.YYYY.-
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py,"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,स्वयं निर्मित
 apps/erpnext/erpnext/hr/doctype/employee_onboarding/employee_onboarding.py,Submit this to create the Employee record,कर्मचारी रेकॉर्ड तयार करण्यासाठी हे सबमिट करा
@@ -6125,7 +6138,6 @@
 DocType: Sales Team,Contact No.,संपर्क क्रमांक
 apps/erpnext/erpnext/templates/includes/cart/cart_address.html,Billing Address is same as Shipping Address,बिलिंग पत्ता शिपिंग पत्त्यासारखेच आहे
 DocType: Bank Reconciliation,Payment Entries,भरणा नोंदी
-apps/erpnext/erpnext/erpnext_integrations/doctype/shopify_settings/shopify_settings.py,Access token or Shopify URL missing,प्रवेश टोकन किंवा Shopify URL गहाळ आहे
 DocType: Location,Latitude,अक्षांश
 DocType: Work Order,Scrap Warehouse,स्क्रॅप वखार
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py,"Warehouse required at Row No {0}, please set default warehouse for the item {1} for the company {2}","रो No No at the Warehouse आवश्यक, कृपया {2} कंपनीसाठी आयटम {2} साठी डीफॉल्ट वेअरहाऊस सेट करा {2}"
@@ -6169,7 +6181,6 @@
 DocType: Job Offer Term,Value / Description,मूल्य / वर्णन
 apps/erpnext/erpnext/controllers/accounts_controller.py,"Row #{0}: Asset {1} cannot be submitted, it is already {2}","सलग # {0}: मालमत्ता {1} सादर केला जाऊ शकत नाही, तो आधीपासूनच आहे {2}"
 DocType: Tax Rule,Billing Country,बिलिंग देश
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js,Are you sure you want to make credit note?,आपली खात्री आहे की आपण क्रेडिट नोट बनवू इच्छिता?
 DocType: Purchase Order Item,Expected Delivery Date,अपेक्षित वितरण तारीख
 DocType: Restaurant Order Entry,Restaurant Order Entry,रेस्टॉरंट ऑर्डर प्रविष्टी
 apps/erpnext/erpnext/accounts/general_ledger.py,Debit and Credit not equal for {0} #{1}. Difference is {2}.,डेबिट आणि क्रेडिट {0} # समान नाही {1}. फरक आहे {2}.
@@ -6292,6 +6303,7 @@
 DocType: Purchase Invoice,Taxes and Charges Added,कर आणि शुल्क जोडले
 apps/erpnext/erpnext/assets/doctype/asset/asset.py,Depreciation Row {0}: Next Depreciation Date cannot be before Available-for-use Date,घसारा रो {0}: पुढील अवमूल्यन तारीख उपलब्ध-वापरण्याच्या तारखेपूर्वी असू शकत नाही
 ,Sales Funnel,विक्री धुराचा
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Item Code &gt; Item Group &gt; Brand,आयटम कोड&gt; आयटम गट&gt; ब्रँड
 apps/erpnext/erpnext/setup/doctype/company/company.py,Abbreviation is mandatory,संक्षेप करणे आवश्यक आहे
 DocType: Project,Task Progress,कार्य प्रगती
 apps/erpnext/erpnext/templates/includes/navbar/navbar_items.html,Cart,कार्ट
@@ -6533,6 +6545,7 @@
 DocType: Employee Grade,Employee Grade,कर्मचारी ग्रेड
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py,Piecework,Piecework
 DocType: GSTR 3B Report,June,जून
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Supplier &gt; Supplier Type,पुरवठादार&gt; पुरवठादार प्रकार
 DocType: Share Balance,From No,नाही पासून
 DocType: Shift Type,Early Exit Grace Period,लवकर बाहेर पडा ग्रेस कालावधी
 DocType: Task,Actual Time (in Hours),(तास) वास्तविक वेळ
@@ -6815,6 +6828,7 @@
 DocType: Warehouse,Warehouse Name,वखार नाव
 DocType: Naming Series,Select Transaction,निवडक व्यवहार
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py,Please enter Approving Role or Approving User,भूमिका मंजूर किंवा सदस्य मंजूर प्रविष्ट करा
+apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.py,UOM Conversion factor ({0} -&gt; {1}) not found for item: {2},आयटमसाठी यूओएम रूपांतरण घटक ({0} -&gt; {1}) आढळला नाही: {2}
 DocType: Journal Entry,Write Off Entry,प्रवेश बंद लिहा
 DocType: BOM,Rate Of Materials Based On,दर साहित्य आधारित रोजी
 DocType: Education Settings,"If enabled, field Academic Term will be Mandatory in Program Enrollment Tool.","सक्षम असल्यास, प्रोग्राम एनरोलमेंट टूलमध्ये फील्ड शैक्षणिक कालावधी अनिवार्य असेल."
@@ -7004,6 +7018,7 @@
 DocType: Quality Inspection Reading,Quality Inspection Reading,गुणवत्ता तपासणी वाचन
 apps/erpnext/erpnext/stock/doctype/stock_settings/stock_settings.py,`Freeze Stocks Older Than` should be smaller than %d days.,`फ्रीज स्टॉक जुने Than`% d दिवस कमी असणे आवश्यक आहे.
 DocType: Tax Rule,Purchase Tax Template,कर साचा खरेदी
+apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py,Earliest Age,लवकर वय
 apps/erpnext/erpnext/utilities/user_progress.py,Set a sales goal you'd like to achieve for your company.,आपण आपल्या कंपनीसाठी साध्य करू इच्छित विक्री लक्ष्य सेट करा.
 DocType: Quality Goal,Revision,उजळणी
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js,Healthcare Services,आरोग्य सेवा
@@ -7047,6 +7062,7 @@
 apps/erpnext/erpnext/healthcare/doctype/patient_encounter/patient_encounter.js,Schedule Discharge,वेळापत्रक कालबाह्य
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py,Cheques and Deposits incorrectly cleared,चेक आणि ठेवी चुकीचे  साफ
 DocType: Homepage Section Card,Homepage Section Card,मुख्यपृष्ठ विभाग कार्ड
+,Amount To Be Billed,बिल देय रक्कम
 apps/erpnext/erpnext/accounts/doctype/account/account.py,Account {0}: You can not assign itself as parent account,खाते {0}: आपण पालक खाते म्हणून स्वत: नियुक्त करू शकत नाही
 DocType: Purchase Invoice Item,Price List Rate,किंमत सूची दर
 apps/erpnext/erpnext/utilities/activation.py,Create customer quotes,ग्राहक कोट तयार करा
@@ -7099,6 +7115,7 @@
 DocType: Supplier Scorecard Criteria,Supplier Scorecard Criteria,सप्लायर स्कोअरकार्ड मापदंड
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py,Please select Start Date and End Date for Item {0},कृपया आयटम   {0} साठी   प्रारंभ तारीख आणि अंतिम तारीख निवडा
 DocType: Maintenance Schedule,MAT-MSH-.YYYY.-,MAT-MSH- .YYYY.-
+,Amount to Receive,प्राप्त करण्याची रक्कम
 apps/erpnext/erpnext/education/doctype/student_group_creation_tool/student_group_creation_tool.py,Course is mandatory in row {0},अर्थात सलग आवश्यक आहे {0}
 apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py,From date can not be greater than than To date,तारखेपासून तारखेपेक्षा मोठी असू शकत नाही
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py,To date cannot be before from date,तारीखे पर्यंत  तारखेपासूनच्या  आधी असू शकत नाही
@@ -7554,6 +7571,7 @@
 DocType: Delivery Note,Print Without Amount,रक्कम न करता छापा
 apps/erpnext/erpnext/accounts/report/asset_depreciation_ledger/asset_depreciation_ledger.py,Depreciation Date,घसारा दिनांक
 ,Work Orders in Progress,प्रगती मधील कार्य ऑर्डर
+DocType: Customer Credit Limit,Bypass Credit Limit Check,बायपास क्रेडिट मर्यादा तपासणी
 DocType: Issue,Support Team,समर्थन कार्यसंघ
 apps/erpnext/erpnext/stock/report/batch_item_expiry_status/batch_item_expiry_status.py,Expiry (In Days),कालावधी समाप्ती (दिवसात)
 DocType: Appraisal,Total Score (Out of 5),(5 पैकी) एकूण धावसंख्या
@@ -7738,6 +7756,7 @@
 DocType: Sales Invoice,Customer GSTIN,ग्राहक GSTIN
 DocType: Crop Cycle,List of diseases detected on the field. When selected it'll automatically add a list of tasks to deal with the disease ,शेतात आढळणा-या रोगांची यादी. निवडल्यावर तो या रोगाशी निगडीत कार्यांविषयी एक सूची स्वयंचलितपणे जोडेल
 apps/erpnext/erpnext/manufacturing/page/bom_comparison_tool/bom_comparison_tool.js,BOM 1,बीओएम 1
+apps/erpnext/erpnext/assets/report/fixed_asset_register/fixed_asset_register.py,Asset Id,मालमत्ता आयडी
 apps/erpnext/erpnext/healthcare/doctype/healthcare_service_unit/healthcare_service_unit.js,This is a root healthcare service unit and cannot be edited.,हे एक रूट हेल्थकेअर सर्व्हिस युनिट असून ते संपादित केले जाऊ शकत नाही.
 DocType: Asset Repair,Repair Status,स्थिती दुरुस्ती
 apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.js,"Requested Qty: Quantity requested for purchase, but not ordered.","विनंती केलेली संख्या: खरेदीसाठी प्रमाण विनंती केली, परंतु ऑर्डर केली गेली नाही."
diff --git a/erpnext/translations/ms.csv b/erpnext/translations/ms.csv
index a1893bd..e711093 100644
--- a/erpnext/translations/ms.csv
+++ b/erpnext/translations/ms.csv
@@ -289,7 +289,6 @@
 DocType: Loan,Repay Over Number of Periods,Membayar balik Over Bilangan Tempoh
 apps/erpnext/erpnext/manufacturing/report/bom_stock_report/bom_stock_report.py,Quantity to Produce can not be less than Zero,Kuantiti untuk Menghasilkan tidak boleh kurang daripada Sifar
 DocType: Stock Entry,Additional Costs,Kos Tambahan
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Customer &gt; Customer Group &gt; Territory,Pelanggan&gt; Kumpulan Pelanggan&gt; Wilayah
 apps/erpnext/erpnext/accounts/doctype/account/account.py,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
@@ -587,6 +586,7 @@
 DocType: Healthcare Settings,Create documents for sample collection,Buat dokumen untuk koleksi sampel
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py,Payment against {0} {1} cannot be greater than Outstanding Amount {2},Bayaran terhadap {0} {1} tidak boleh lebih besar daripada Outstanding Jumlah {2}
 apps/erpnext/erpnext/patches/v11_0/add_healthcare_service_unit_tree_root.py,All Healthcare Service Units,Semua Unit Perkhidmatan Penjagaan Kesihatan
+apps/erpnext/erpnext/setup/default_energy_point_rules.py,On Converting Opportunity,On Converting Opportunity
 DocType: Bank Account,Address HTML,Alamat HTML
 DocType: Lead,Mobile No.,No. Telefon
 apps/erpnext/erpnext/selling/doctype/pos_closing_voucher/closing_voucher_details.html,Mode of Payments,Cara Pembayaran
@@ -651,7 +651,6 @@
 DocType: Accounting Dimension,Dimension Name,Nama Dimensi
 apps/erpnext/erpnext/healthcare/setup.py,Resistant,Tahan
 apps/erpnext/erpnext/hotels/doctype/hotel_room_reservation/hotel_room_reservation.py,Please set Hotel Room Rate on {},Sila tetapkan Kadar Bilik Hotel pada {}
-apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py,Please setup numbering series for Attendance via Setup &gt; Numbering Series,Sila persediaan siri penomboran untuk Kehadiran melalui Persediaan&gt; Penomboran Siri
 DocType: Journal Entry,Multi Currency,Mata Multi
 DocType: Bank Statement Transaction Invoice Item,Invoice Type,Jenis invois
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py,Valid from date must be less than valid upto date,Sah dari tarikh mestilah kurang dari tarikh upto yang sah
@@ -769,6 +768,7 @@
 apps/erpnext/erpnext/accounts/page/pos/pos.js,Create a new Customer,Buat Pelanggan baru
 apps/erpnext/erpnext/non_profit/report/expiring_memberships/expiring_memberships.py,Expiring On,Tamat Tempoh
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,"If multiple Pricing Rules continue to prevail, users are asked to set Priority manually to resolve conflict.","Jika beberapa Peraturan Harga terus diguna pakai, pengguna diminta untuk menetapkan Keutamaan secara manual untuk menyelesaikan konflik."
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js,Purchase Return,Pembelian Pulangan
 apps/erpnext/erpnext/utilities/activation.py,Create Purchase Orders,Buat Pesanan Pembelian
 ,Purchase Register,Pembelian Daftar
 apps/erpnext/erpnext/healthcare/doctype/patient/patient.py,Patient not found,Pesakit tidak dijumpai
@@ -784,7 +784,6 @@
 DocType: Location,Area UOM,Kawasan UOM
 apps/erpnext/erpnext/manufacturing/doctype/workstation/workstation.py,Workstation is closed on the following dates as per Holiday List: {0},Workstation ditutup pada tarikh-tarikh berikut seperti Senarai Holiday: {0}
 apps/erpnext/erpnext/selling/page/sales_funnel/sales_funnel.py,Opportunities,Peluang
-apps/erpnext/erpnext/www/all-products/index.html,Clear filters,Penapis jernih
 DocType: Lab Test Template,Single,Single
 DocType: Compensatory Leave Request,Work From Date,Kerja dari tarikh
 DocType: Salary Slip,Total Loan Repayment,Jumlah Bayaran Balik Pinjaman
@@ -828,6 +827,7 @@
 apps/erpnext/erpnext/education/doctype/program_enrollment_tool/program_enrollment_tool.py,Mandatory field - Academic Year,medan mandatori - Academic Year
 apps/erpnext/erpnext/education/doctype/program_enrollment_tool/program_enrollment_tool.py,Mandatory field - Academic Year,medan mandatori - Academic Year
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py,{0} {1} is not associated with {2} {3},{0} {1} tidak dikaitkan dengan {2} {3}
+DocType: Opportunity,Converted By,Diubah oleh
 apps/erpnext/erpnext/public/js/hub/components/ReviewArea.vue,You need to login as a Marketplace User before you can add any reviews.,Anda perlu log masuk sebagai Pengguna Pasaran sebelum anda boleh menambah sebarang ulasan.
 apps/erpnext/erpnext/manufacturing/doctype/job_card/job_card.py,Row {0} : Operation is required against the raw material item {1},Baris {0}: Pengendalian diperlukan terhadap item bahan mentah {1}
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py,Please set default payable account for the company {0},Sila menetapkan akaun dibayar lalai bagi syarikat itu {0}
@@ -854,6 +854,8 @@
 DocType: Sales Invoice,Total Qty,Jumlah Kuantiti
 apps/erpnext/erpnext/education/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py,Guardian2 Email ID,Guardian2 ID E-mel
 apps/erpnext/erpnext/education/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py,Guardian2 Email ID,Guardian2 ID E-mel
+apps/erpnext/erpnext/hr/doctype/employee_transfer/employee_transfer.py,"Please delete the Employee <a href=""#Form/Employee/{0}"">{0}</a>\
+					to cancel this document","Sila padamkan Pekerja <a href=""#Form/Employee/{0}"">{0}</a> \ untuk membatalkan dokumen ini"
 DocType: Item,Show in Website (Variant),Show di Laman web (Variant)
 DocType: Employee,Health Concerns,Kebimbangan Kesihatan
 DocType: Payroll Entry,Select Payroll Period,Pilih Tempoh Payroll
@@ -914,7 +916,6 @@
 DocType: Codification Table,Codification Table,Jadual Pengkodan
 DocType: Timesheet Detail,Hrs,Hrs
 apps/erpnext/erpnext/manufacturing/page/bom_comparison_tool/bom_comparison_tool.js,Changes in {0},Perubahan dalam {0}
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js,Please select Company,Sila pilih Syarikat
 DocType: Employee Skill,Employee Skill,Kemahiran Pekerja
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.js,Difference Account,Akaun perbezaan
 DocType: Pricing Rule,Discount on Other Item,Diskaun pada Item Lain
@@ -983,6 +984,7 @@
 DocType: BOM,Operating Cost,Kos operasi
 DocType: Crop,Produced Items,Item yang dihasilkan
 DocType: Bank Statement Transaction Entry,Match Transaction to Invoices,Urus Transaksi ke Invois
+apps/erpnext/erpnext/erpnext_integrations/exotel_integration.py,Error in Exotel incoming call,Ralat dalam panggilan masuk Exotel
 DocType: Sales Order Item,Gross Profit,Keuntungan kasar
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js,Unblock Invoice,Buka Invois
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py,Increment cannot be 0,Kenaikan tidak boleh 0
@@ -1198,6 +1200,7 @@
 DocType: Activity Cost,Activity Type,Jenis Kegiatan
 DocType: Request for Quotation,For individual supplier,Bagi pembekal individu
 DocType: BOM Operation,Base Hour Rate(Company Currency),Kadar Jam Base (Syarikat Mata Wang)
+,Qty To Be Billed,Qty To Be Dibilled
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py,Delivered Amount,Jumlah dihantar
 apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.js,Reserved Qty for Production: Raw materials quantity to make manufacturing items.,Dicadangkan Qty untuk Pengeluaran: Kuantiti bahan mentah untuk membuat barangan perkilangan.
 DocType: Loyalty Point Entry Redemption,Redemption Date,Tarikh Penebusan
@@ -1319,7 +1322,7 @@
 apps/erpnext/erpnext/education/doctype/student_group/student_group.py,Please select Program,Sila pilih Program
 apps/erpnext/erpnext/education/doctype/student_group/student_group.py,Please select Program,Sila pilih Program
 DocType: Project,Estimated Cost,Anggaran kos
-DocType: Request for Quotation,Link to material requests,Link kepada permintaan bahan
+DocType: Supplier Quotation,Link to material requests,Link kepada permintaan bahan
 apps/erpnext/erpnext/public/js/hub/pages/Publish.vue,Publish,Menerbitkan
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py,Aerospace,Aeroangkasa
 ,Fichier des Ecritures Comptables [FEC],Fichier des Ecritures Comptables [FEC]
@@ -1332,6 +1335,7 @@
 apps/erpnext/erpnext/utilities/transaction_base.py,Invalid Posting Time,Masa Penghantaran tidak sah
 DocType: Salary Component,Condition and Formula,Keadaan dan Formula
 DocType: Lead,Campaign Name,Nama Kempen
+apps/erpnext/erpnext/setup/default_energy_point_rules.py,On Task Completion,Pada Tugasan Tugas
 apps/erpnext/erpnext/hr/doctype/compensatory_leave_request/compensatory_leave_request.py,There is no leave period in between {0} and {1},Tiada tempoh cuti di antara {0} dan {1}
 DocType: Fee Validity,Healthcare Practitioner,Pengamal Penjagaan Kesihatan
 DocType: Hotel Room,Capacity,Kapasiti
@@ -1677,7 +1681,6 @@
 DocType: Quality Feedback Template,Quality Feedback Template,Template Maklum Balas Kualiti
 apps/erpnext/erpnext/config/education.py,LMS Activity,Aktiviti LMS
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py,Internet Publishing,Penerbitan Internet
-DocType: Prescription Duration,Number,Nombor
 apps/erpnext/erpnext/accounts/doctype/opening_invoice_creation_tool/opening_invoice_creation_tool.js,Creating {0} Invoice,Mewujudkan {0} Invois
 DocType: Medical Code,Medical Code Standard,Standard Kod Perubatan
 DocType: Soil Texture,Clay Composition (%),Komposisi tanah liat (%)
@@ -1752,6 +1755,7 @@
 DocType: Support Settings,Get Started Sections,Memulakan Bahagian
 DocType: Lead,CRM-LEAD-.YYYY.-,CRM-LEAD-.YYYY.-
 DocType: Invoice Discounting,Sanctioned,Diiktiraf
+,Base Amount,Jumlah Base
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.js,Total Contribution Amount: {0},Jumlah Jumlah Sumbangan: {0}
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py,Row #{0}: Please specify Serial No for Item {1},Row # {0}: Sila nyatakan Serial No untuk Perkara {1}
 DocType: Payroll Entry,Salary Slips Submitted,Slip Gaji Dihantar
@@ -1974,6 +1978,7 @@
 DocType: Accounting Dimension,Dimension Defaults,Lalai Dimensi
 apps/erpnext/erpnext/crm/report/prospects_engaged_but_not_converted/prospects_engaged_but_not_converted.js,Minimum Lead Age (Days),Lead Minimum Umur (Hari)
 apps/erpnext/erpnext/crm/report/prospects_engaged_but_not_converted/prospects_engaged_but_not_converted.js,Minimum Lead Age (Days),Lead Minimum Umur (Hari)
+apps/erpnext/erpnext/assets/report/fixed_asset_register/fixed_asset_register.py,Available For Use Date,Tarikh Tersedia Untuk Penggunaan
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py,All BOMs,semua boms
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js,Create Inter Company Journal Entry,Buat Kemasukan Jurnal Syarikat Antara
 DocType: Company,Parent Company,Syarikat induk
@@ -2038,6 +2043,7 @@
 ,IRS 1099,IRS 1099
 DocType: Salary Slip,Leave Without Pay,Tinggalkan Tanpa Gaji
 DocType: Payment Request,Outward,Keluar
+apps/erpnext/erpnext/setup/default_energy_point_rules.py,On {0} Creation,Pada {0} Penciptaan
 apps/erpnext/erpnext/regional/doctype/gstr_3b_report/gstr_3b_report.html,State/UT Tax,Cukai Negeri / UT
 ,Trial Balance for Party,Baki percubaan untuk Parti
 ,Gross and Net Profit Report,Laporan Keuntungan Kasar dan Bersih
@@ -2155,6 +2161,7 @@
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js,Make Stock Entry,Buat Entri Saham
 DocType: Hotel Room Reservation,Hotel Reservation User,Pengguna Tempahan Hotel
 apps/erpnext/erpnext/projects/doctype/project/project.js,Set Status,Tetapkan Status
+apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py,Please setup numbering series for Attendance via Setup &gt; Numbering Series,Sila persediaan siri penomboran untuk Kehadiran melalui Persediaan&gt; Penomboran Siri
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py,Please select prefix first,Sila pilih awalan pertama
 DocType: Contract,Fulfilment Deadline,Tarikh akhir penyempurnaan
 apps/erpnext/erpnext/public/js/hub/pages/Home.vue,Near you,Berhampiran anda
@@ -2170,6 +2177,7 @@
 DocType: Announcement,All Students,semua Pelajar
 apps/erpnext/erpnext/assets/doctype/asset/asset.py,Item {0} must be a non-stock item,Perkara {0} perlu menjadi item tanpa saham yang
 apps/erpnext/erpnext/stock/doctype/batch/batch.js,View Ledger,Lihat Lejar
+DocType: Cost Center,Lft,LFT
 DocType: Grading Scale,Intervals,selang
 DocType: Bank Statement Transaction Entry,Reconciled Transactions,Urus Niaga yang dirunding
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py,Earliest,Terawal
@@ -2285,6 +2293,7 @@
 apps/erpnext/erpnext/hr/doctype/employee_benefit_application/employee_benefit_application.py,As per your assigned Salary Structure you cannot apply for benefits,"Sebagaimana Struktur Gaji yang anda berikan, anda tidak boleh memohon manfaat"
 apps/erpnext/erpnext/stock/doctype/item/item.py,Website Image should be a public file or website URL,Laman web Image perlu fail awam atau URL laman web
 DocType: Purchase Invoice Item,BOM,BOM
+apps/erpnext/erpnext/stock/doctype/item/item.py,Duplicate entry in Manufacturers table,Kemasukan pendua dalam jadual Pengilang
 apps/erpnext/erpnext/setup/doctype/item_group/item_group.js,This is a root item group and cannot be edited.,Ini adalah kumpulan item akar dan tidak boleh diedit.
 apps/erpnext/erpnext/accounts/doctype/account/account.js,Merge,Gabung
 DocType: Journal Entry Account,Purchase Order,Pesanan Pembelian
@@ -2431,7 +2440,6 @@
 DocType: Asset,Depreciation Schedules,Jadual susutnilai
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.js,Create Sales Invoice,Buat Invois Jualan
 apps/erpnext/erpnext/regional/doctype/gstr_3b_report/gstr_3b_report.html,Ineligible ITC,ITC tidak layak
-apps/erpnext/erpnext/erpnext_integrations/doctype/shopify_settings/shopify_settings.py,"Support for public app is deprecated. Please setup private app, for more details refer user manual","Sokongan untuk aplikasi awam tidak digunakan lagi. Sila persediaan aplikasi persendirian, untuk maklumat lanjut, rujuk manual pengguna"
 DocType: Task,Dependent Tasks,Tugasan yang bergantung
 apps/erpnext/erpnext/regional/report/gstr_1/gstr_1.py,Following accounts might be selected in GST Settings:,Berikut akaun mungkin dipilih dalam Tetapan CBP:
 apps/erpnext/erpnext/manufacturing/report/bom_stock_report/bom_stock_report.js,Quantity to Produce,Kuantiti untuk Menghasilkan
@@ -2683,6 +2691,7 @@
 DocType: Water Analysis,Container,Container
 apps/erpnext/erpnext/regional/report/gstr_1/gstr_1.py,Please set valid GSTIN No. in Company Address,Sila nyatakan GSTIN tidak sah di alamat syarikat
 apps/erpnext/erpnext/education/utils.py,Student {0} - {1} appears Multiple times in row {2} & {3},Pelajar {0} - {1} muncul kali Pelbagai berturut-turut {2} &amp; {3}
+apps/erpnext/erpnext/selling/doctype/customer/customer.py,Following fields are mandatory to create address:,Bidang berikut adalah wajib untuk membuat alamat:
 DocType: Item Alternative,Two-way,Dua hala
 DocType: Item,Manufacturers,Pengilang
 apps/erpnext/erpnext/accounts/deferred_revenue.py,Error while processing deferred accounting for {0},Ralat semasa memproses perolehan yang ditangguhkan untuk {0}
@@ -2758,9 +2767,9 @@
 DocType: Employee,HR-EMP-,HR-EMP-
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py,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: Quality Meeting Minutes,Quality Meeting Minutes,Minit Mesyuarat Kualiti
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Supplier &gt; Supplier Type,Pembekal&gt; Jenis Pembekal
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py,Employee Referral,Rujukan pekerja
 DocType: Student Group,Set 0 for no limit,Hanya 0 untuk tiada had
+DocType: Cost Center,rgt,Rgt
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py,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.
 DocType: Customer,Primary Address and Contact Detail,Alamat Utama dan Butiran Kenalan
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.js,Resend Payment Email,Hantar semula Pembayaran E-mel
@@ -2870,7 +2879,6 @@
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py,Against Supplier Invoice {0} dated {1},Terhadap Pembekal Invois {0} bertarikh {1}
 DocType: Customer,Default Price List,Senarai Harga Default
 apps/erpnext/erpnext/assets/doctype/asset/asset.py,Asset Movement record {0} created,rekod Pergerakan Aset {0} dicipta
-apps/erpnext/erpnext/utilities/page/leaderboard/leaderboard.js,No items found.,Tiada item dijumpai.
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py,You cannot delete Fiscal Year {0}. Fiscal Year {0} is set as default in Global Settings,Anda tidak boleh memadam Tahun Anggaran {0}. Tahun Anggaran {0} ditetapkan sebagai piawai dalam Tetapan Global
 DocType: Share Transfer,Equity/Liability Account,Akaun Ekuiti / Liabiliti
 apps/erpnext/erpnext/setup/doctype/customer_group/customer_group.py,A customer with the same name already exists,Seorang pelanggan dengan nama yang sama sudah ada
@@ -2886,6 +2894,7 @@
 apps/erpnext/erpnext/selling/doctype/customer/customer.py,Credit limit has been crossed for customer {0} ({1}/{2}),Had kredit telah dilangkau untuk pelanggan {0} ({1} / {2})
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py,Customer required for 'Customerwise Discount',Pelanggan dikehendaki untuk &#39;Customerwise Diskaun&#39;
 apps/erpnext/erpnext/config/accounting.py,Update bank payment dates with journals.,Update tarikh pembayaran bank dengan jurnal.
+,Billed Qty,Dibilkan Qty
 apps/erpnext/erpnext/stock/doctype/item/item_dashboard.py,Pricing,Harga
 DocType: Employee,Attendance Device ID (Biometric/RF tag ID),ID Peranti Kehadiran (ID tag biometrik / RF)
 DocType: Quotation,Term Details,Butiran jangka
@@ -2909,6 +2918,7 @@
 DocType: Share Transfer,Asset Account,Akaun Aset
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js,New release date should be in the future,Tarikh pelepasan baru sepatutnya pada masa hadapan
 DocType: Purchase Invoice,End date of current invoice's period,Tarikh akhir tempoh invois semasa
+apps/erpnext/erpnext/hr/doctype/employee/employee.py,Please setup Employee Naming System in Human Resource &gt; HR Settings,Sila persediaan Sistem Penamaan Pekerja dalam Sumber Manusia&gt; Tetapan HR
 DocType: Lab Test,Technician Name,Nama juruteknik
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py,"Cannot ensure delivery by Serial No as \
 					Item {0} is added with and without Ensure Delivery by \
@@ -2916,6 +2926,7 @@
 DocType: Accounts Settings,Unlink Payment on Cancellation of Invoice,Nyahpaut Pembayaran Pembatalan Invois
 DocType: Bank Reconciliation,From Date,Dari Tarikh
 apps/erpnext/erpnext/hr/doctype/vehicle_log/vehicle_log.py,Current Odometer reading entered should be greater than initial Vehicle Odometer {0},bacaan Odometer Semasa memasuki harus lebih besar daripada awal Kenderaan Odometer {0}
+,Purchase Order Items To Be Received or Billed,Item Pesanan Pembelian Untuk Diterima atau Dibilkan
 DocType: Restaurant Reservation,No Show,Tidak Tunjukkan
 apps/erpnext/erpnext/regional/india/utils.py,You must be a registered supplier to generate e-Way Bill,Anda mesti menjadi pembekal berdaftar untuk menjana e-Way Bill
 DocType: Shipping Rule Country,Shipping Rule Country,Kaedah Penghantaran Negara
@@ -2958,6 +2969,7 @@
 apps/erpnext/erpnext/templates/generators/item/item_add_to_cart.html,View in Cart,Lihat dalam Troli
 DocType: Employee Checkin,Shift Actual Start,Shift Actual Start
 DocType: Tally Migration,Is Day Book Data Imported,Adakah Data Buku Hari Diimport
+,Purchase Order Items To Be Received or Billed1,Item Pesanan Pembelian yang Diterima atau Dibilled1
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py,Marketing Expenses,Perbelanjaan pemasaran
 apps/erpnext/erpnext/stock/doctype/pick_list/pick_list.py,{0} units of {1} is not available.,{0} unit {1} tidak tersedia.
 ,Item Shortage Report,Perkara Kekurangan Laporan
@@ -3186,7 +3198,6 @@
 apps/erpnext/erpnext/public/js/call_popup/call_popup.js,View all issues from {0},Lihat semua isu dari {0}
 DocType: Quality Inspection,MAT-QA-.YYYY.-,MAT-QA-.YYYY.-
 DocType: Quality Meeting Table,Quality Meeting Table,Jadual Mesyuarat Kualiti
-apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py,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
 apps/erpnext/erpnext/templates/pages/help.html,Visit the forums,Lawati forum
 DocType: Student,Student Mobile Number,Pelajar Nombor Telefon
 DocType: Item,Has Variants,Mempunyai Kelainan
@@ -3330,6 +3341,7 @@
 ,Campaign Efficiency,Kecekapan kempen
 ,Campaign Efficiency,Kecekapan kempen
 DocType: Discussion,Discussion,perbincangan
+apps/erpnext/erpnext/setup/default_energy_point_rules.py,On Sales Order Submission,Mengenai Penghantaran Pesanan Jualan
 DocType: Bank Transaction,Transaction ID,ID transaksi
 DocType: Payroll Entry,Deduct Tax For Unsubmitted Tax Exemption Proof,Cukai Potongan Bagi Bukti Pengecualian Cukai Tidak Dimasukkan
 DocType: Volunteer,Anytime,Bila masa
@@ -3337,7 +3349,6 @@
 DocType: Employee Tax Exemption Proof Submission,Employee Tax Exemption Proof Submission,Pengeluaran Bukti Pengecualian Cukai Pekerja
 DocType: Patient,Surgical History,Sejarah Pembedahan
 DocType: Bank Statement Settings Item,Mapped Header,Mapped Header
-apps/erpnext/erpnext/hr/doctype/employee/employee.py,Please setup Employee Naming System in Human Resource &gt; HR Settings,Sila persediaan Sistem Penamaan Pekerja dalam Sumber Manusia&gt; Tetapan HR
 DocType: Employee,Resignation Letter Date,Peletakan jawatan Surat Tarikh
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Pricing Rules are further filtered based on quantity.,Peraturan harga yang lagi ditapis berdasarkan kuantiti.
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py,Please set the Date Of Joining for employee {0},Sila menetapkan Tarikh Of Menyertai untuk pekerja {0}
@@ -3352,6 +3363,7 @@
 DocType: Bank Statement Settings,Mapped Items,Item yang dipadatkan
 DocType: Amazon MWS Settings,IT,IT
 DocType: Chapter,Chapter,Bab
+,Fixed Asset Register,Daftar Aset Tetap
 apps/erpnext/erpnext/utilities/user_progress.py,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,Select BOM and Qty for Production,Pilih BOM dan Kuantiti untuk Pengeluaran
@@ -3487,7 +3499,6 @@
 apps/erpnext/erpnext/templates/emails/reorder_item.html,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
 apps/erpnext/erpnext/controllers/accounts_controller.py,Account {0} is invalid. Account Currency must be {1},Akaun {0} tidak sah. Mata Wang Akaun mesti {1}
 apps/erpnext/erpnext/hr/doctype/salary_structure_assignment/salary_structure_assignment.py,From Date {0} cannot be after employee's relieving Date {1},Dari Tarikh {0} tidak boleh selepas Tarikh melegakan pekerja {1}
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py,Debit Note {0} has been created automatically,Nota Debit {0} telah dibuat secara automatik
 apps/erpnext/erpnext/accounts/doctype/payment_order/payment_order.js,Create Payment Entries,Buat Entri Pembayaran
 DocType: Supplier,Is Internal Supplier,Pembekal Dalaman
 DocType: Employee,Create User Permission,Buat Kebenaran Pengguna
@@ -4051,7 +4062,6 @@
 DocType: Project User,Project Status,Status projek
 DocType: UOM,Check this to disallow fractions. (for Nos),Semak ini untuk tidak membenarkan pecahan. (Untuk Nos)
 DocType: Student Admission Program,Naming Series (for Student Applicant),Penamaan Series (untuk Pelajar Pemohon)
-apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.py,UOM Conversion factor ({0} -&gt; {1}) not found for item: {2},Faktor penukaran UOM ({0} -&gt; {1}) tidak ditemui untuk item: {2}
 apps/erpnext/erpnext/hr/doctype/retention_bonus/retention_bonus.py,Bonus Payment Date cannot be a past date,Tarikh Bayaran Bonus tidak boleh menjadi tarikh yang lalu
 DocType: Travel Request,Copy of Invitation/Announcement,Salinan Jemputan / Pengumuman
 DocType: Practitioner Service Unit Schedule,Practitioner Service Unit Schedule,Jadual Unit Perkhidmatan Praktisi
@@ -4200,6 +4210,7 @@
 apps/erpnext/erpnext/utilities/user_progress.py,Setup Company,Persediaan Syarikat
 ,Lab Test Report,Laporan Ujian Makmal
 DocType: Employee Benefit Application,Employee Benefit Application,Permohonan Manfaat Pekerja
+apps/erpnext/erpnext/accounts/doctype/invoice_discounting/invoice_discounting.py,Row({0}): {1} is already discounted in {2},Baris ({0}): {1} telah didiskaunkan dalam {2}
 apps/erpnext/erpnext/hr/doctype/additional_salary/additional_salary.py,Additional Salary Component Exists.,Komponen Gaji Tambahan Ada.
 DocType: Purchase Invoice,Unregistered,Tidak berdaftar
 DocType: Student Applicant,Application Date,Tarikh permohonan
@@ -4279,7 +4290,6 @@
 DocType: Journal Entry,Accounting Entries,Catatan Perakaunan
 DocType: Job Card Time Log,Job Card Time Log,Log Masa Kad Kerja
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,"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;."
-apps/erpnext/erpnext/education/doctype/instructor/instructor.py,Please setup Instructor Naming System in Education &gt; Education Settings,Sila persediaan Sistem Penamaan Pengajar dalam Pendidikan&gt; Tetapan Pendidikan
 DocType: Journal Entry,Paid Loan,Pinjaman Berbayar
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py,Duplicate Entry. Please check Authorization Rule {0},Salinan Entry. Sila semak Kebenaran Peraturan {0}
 DocType: Journal Entry Account,Reference Due Date,Tarikh Disebabkan Rujukan
@@ -4296,7 +4306,6 @@
 apps/erpnext/erpnext/templates/pages/projects.html,No time sheets,Tiada lembaran masa
 DocType: GoCardless Mandate,GoCardless Customer,Pelanggan GoCardless
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py,Leave Type {0} cannot be carry-forwarded,Tinggalkan Jenis {0} tidak boleh bawa dikemukakan
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Item Code &gt; Item Group &gt; Brand,Kod Item&gt; Kumpulan Item&gt; Jenama
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py,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
 DocType: Leave Encashment,Payroll,Payroll
@@ -4412,7 +4421,6 @@
 DocType: Stock Ledger Entry,Actual Qty After Transaction,Kuantiti Sebenar Selepas Transaksi
 ,Pending SO Items For Purchase Request,Sementara menunggu SO Item Untuk Pembelian Permintaan
 apps/erpnext/erpnext/education/doctype/student_admission/student_admission.py,Student Admissions,Kemasukan pelajar
-apps/erpnext/erpnext/accounts/party.py,{0} {1} is disabled,{0} {1} dilumpuhkan
 DocType: Supplier,Billing Currency,Bil Mata Wang
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py,Extra Large,Lebih Besar
 DocType: Loan,Loan Application,Permohonan Pinjaman
@@ -4489,7 +4497,6 @@
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py,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/accounts/doctype/accounting_dimension/accounting_dimension.py,Creating Dimensions...,Membuat Dimensi ...
 apps/erpnext/erpnext/education/doctype/student_group_creation_tool/student_group_creation_tool.py,Student Group Name is mandatory in row {0},Pelajar Kumpulan Nama adalah wajib berturut-turut {0}
-DocType: Customer Credit Limit,Bypass credit limit_check,Bypass limit_check kredit
 DocType: Homepage,Products to be shown on website homepage,Produk yang akan dipaparkan pada laman web utama
 DocType: HR Settings,Password Policy,Dasar Kata Laluan
 apps/erpnext/erpnext/setup/doctype/customer_group/customer_group.js,This is a root customer group and cannot be edited.,Ini adalah kumpulan pelanggan akar dan tidak boleh diedit.
@@ -4783,6 +4790,7 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py,Row {0}: Advance against Customer must be credit,Row {0}: Advance terhadap Pelanggan mesti kredit
 DocType: Quality Meeting,Quality Meeting,Mesyuarat Berkualiti
 apps/erpnext/erpnext/accounts/doctype/account/account.js,Non-Group to Group,Non-Group untuk Kumpulan
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py,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: Employee,ERPNext User,Pengguna ERPNext
 apps/erpnext/erpnext/education/doctype/student_group_creation_tool/student_group_creation_tool.py,Batch is mandatory in row {0},Batch adalah wajib berturut-turut {0}
 apps/erpnext/erpnext/education/doctype/student_group_creation_tool/student_group_creation_tool.py,Batch is mandatory in row {0},Batch adalah wajib berturut-turut {0}
@@ -5082,6 +5090,7 @@
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py,No {0} found for Inter Company Transactions.,Tiada {0} dijumpai untuk Transaksi Syarikat Antara.
 DocType: Travel Itinerary,Rented Car,Kereta yang disewa
 apps/erpnext/erpnext/public/js/hub/components/profile_dialog.js,About your Company,Mengenai Syarikat anda
+apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.js,Show Stock Ageing Data,Tunjukkan Data Penuaan Saham
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py,Credit To account must be a Balance Sheet account,Kredit Untuk akaun perlu menjadi akaun Kunci Kira-kira
 DocType: Donor,Donor,Donor
 DocType: Global Defaults,Disable In Words,Matikan Dalam Perkataan
@@ -5096,8 +5105,10 @@
 DocType: Practitioner Schedule,Schedule Name,Nama Jadual
 apps/erpnext/erpnext/regional/doctype/gstr_3b_report/gstr_3b_report.py,Please enter GSTIN and state for the Company Address {0},Sila masukkan GSTIN dan nyatakan alamat Syarikat {0}
 DocType: Currency Exchange,For Buying,Untuk Membeli
+apps/erpnext/erpnext/setup/default_energy_point_rules.py,On Purchase Order Submission,Pada Pesanan Pesanan Pembelian
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js,Add All Suppliers,Tambah Semua Pembekal
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py,Row #{0}: Allocated Amount cannot be greater than outstanding amount.,Row # {0}: Jumlah Diperuntukkan tidak boleh lebih besar daripada jumlah tertunggak.
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Customer &gt; Customer Group &gt; Territory,Pelanggan&gt; Kumpulan Pelanggan&gt; Wilayah
 DocType: Tally Migration,Parties,Pihak-pihak
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js,Browse BOM,Browse BOM
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py,Secured Loans,Pinjaman Bercagar
@@ -5129,6 +5140,7 @@
 apps/erpnext/erpnext/stock/doctype/item_alternative/item_alternative.py,Not allow to set alternative item for the item {0},Tidak membenarkan menetapkan item alternatif untuk item {0}
 apps/erpnext/erpnext/hr/doctype/leave_block_list/leave_block_list.py,Date is repeated,Tarikh diulang
 apps/erpnext/erpnext/accounts/print_format/payment_receipt_voucher/payment_receipt_voucher.html,Authorized Signatory,Penandatangan yang diberi kuasa
+apps/erpnext/erpnext/education/doctype/instructor/instructor.py,Please setup Instructor Naming System in Education &gt; Education Settings,Sila persediaan Sistem Penamaan Pengajar dalam Pendidikan&gt; Tetapan Pendidikan
 apps/erpnext/erpnext/regional/doctype/gstr_3b_report/gstr_3b_report.html,Net ITC Available(A) - (B),ITC Bersih Tersedia (A) - (B)
 apps/erpnext/erpnext/education/doctype/fee_schedule/fee_schedule.js,Create Fees,Buat Yuran
 DocType: Project,Total Purchase Cost (via Purchase Invoice),Jumlah Kos Pembelian (melalui Invois Belian)
@@ -5149,6 +5161,7 @@
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.js,Message Sent,Mesej dihantar
 apps/erpnext/erpnext/accounts/doctype/account/account.py,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/assets/report/fixed_asset_register/fixed_asset_register.py,Vendor Name,Nama Penjual
 DocType: Quiz Result,Wrong,Salah
 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)
@@ -5394,6 +5407,7 @@
 DocType: Stock Settings,Auto Material Request,Bahan Auto Permintaan
 DocType: Woocommerce Settings,API consumer secret,Rahsia pengguna API
 DocType: Delivery Note Item,Available Batch Qty at From Warehouse,Disediakan Kuantiti Batch di Dari Gudang
+,Received Qty Amount,Menerima Jumlah Qty
 DocType: Salary Slip,Gross Pay - Total Deduction - Loan Repayment,Pay kasar - Jumlah Potongan - Bayaran Balik Pinjaman
 DocType: Bank Account,Last Integration Date,Tarikh Integrasi Terakhir
 DocType: Expense Claim,Expense Taxes and Charges,Cukai dan Caj Perbelanjaan
@@ -5858,6 +5872,8 @@
 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,Please select Qty against item {0},Sila pilih Qty terhadap item {0}
+apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py,Latest Age,Umur terkini
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js,Transfer Material to Supplier,Pemindahan Bahan kepada Pembekal
 apps/erpnext/erpnext/hr/report/loan_repayment/loan_repayment.py,EMI,EMI
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py,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
@@ -5881,7 +5897,6 @@
 apps/erpnext/erpnext/hr/doctype/employee_benefit_application/employee_benefit_application.py,"An amount of {0} already claimed for the component {1},\
 						 set the amount equal or greater than {2}","Jumlah {0} yang telah dituntut untuk komponen {1}, \ menetapkan jumlah yang sama atau melebihi {2}"
 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
 DocType: BOM Update Tool,The new BOM after replacement,The BOM baru selepas penggantian
 ,Point of Sale,Tempat Jualan
@@ -6003,7 +6018,6 @@
 DocType: Purchase Order Item,Blanket Order Rate,Kadar Perintah Selimut
 ,Customer Ledger Summary,Ringkasan Ledger Pelanggan
 apps/erpnext/erpnext/hooks.py,Certification,Pensijilan
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js,Are you sure you want to make debit note?,Adakah anda pasti mahu membuat nota debit?
 DocType: Bank Guarantee,Clauses and Conditions,Fasal dan Syarat
 DocType: Serial No,Creation Document Type,Penciptaan Dokumen Jenis
 DocType: Amazon MWS Settings,ES,ES
@@ -6041,8 +6055,6 @@
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py,Financial Services,Perkhidmatan Kewangan
 DocType: Student Sibling,Student ID,ID pelajar
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.js,For Quantity must be greater than zero,Untuk Kuantiti mestilah lebih besar dari sifar
-apps/erpnext/erpnext/hr/doctype/employee_transfer/employee_transfer.py,"Please delete the Employee <a href=""#Form/Employee/{0}"">{0}</a>\
-					to cancel this document","Sila padamkan Pekerja <a href=""#Form/Employee/{0}"">{0}</a> \ untuk membatalkan dokumen ini"
 apps/erpnext/erpnext/config/projects.py,Types of activities for Time Logs,Jenis aktiviti untuk Masa Balak
 DocType: Opening Invoice Creation Tool,Sales,Jualan
 DocType: Stock Entry Detail,Basic Amount,Jumlah Asas
@@ -6121,6 +6133,7 @@
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py,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,Send Supplier Emails,Hantar Email Pembekal
+DocType: Asset Movement,ACC-ASM-.YYYY.-,ACC-ASM-.YYYY.-
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py,"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
 apps/erpnext/erpnext/hr/doctype/employee_onboarding/employee_onboarding.py,Submit this to create the Employee record,Hantar ini untuk mencipta rekod Kakitangan
@@ -6201,7 +6214,6 @@
 DocType: Sales Team,Contact No.,Hubungi No.
 apps/erpnext/erpnext/templates/includes/cart/cart_address.html,Billing Address is same as Shipping Address,Alamat Penagihan sama dengan Alamat Perkapalan
 DocType: Bank Reconciliation,Payment Entries,Penyertaan pembayaran
-apps/erpnext/erpnext/erpnext_integrations/doctype/shopify_settings/shopify_settings.py,Access token or Shopify URL missing,Akses token atau Shopify URL hilang
 DocType: Location,Latitude,Latitud
 DocType: Work Order,Scrap Warehouse,Scrap Warehouse
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py,"Warehouse required at Row No {0}, please set default warehouse for the item {1} for the company {2}","Gudang diperlukan di Row No {0}, sila tetapkan gudang lalai untuk item {1} untuk syarikat {2}"
@@ -6246,7 +6258,6 @@
 DocType: Job Offer Term,Value / Description,Nilai / Penerangan
 apps/erpnext/erpnext/controllers/accounts_controller.py,"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
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js,Are you sure you want to make credit note?,Adakah anda pasti mahu membuat nota kredit?
 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,Debit and Credit not equal for {0} #{1}. Difference is {2}.,Debit dan Kredit tidak sama untuk {0} # {1}. Perbezaan adalah {2}.
@@ -6371,6 +6382,7 @@
 DocType: Purchase Invoice,Taxes and Charges Added,Cukai dan Caj Tambahan
 apps/erpnext/erpnext/assets/doctype/asset/asset.py,Depreciation Row {0}: Next Depreciation Date cannot be before Available-for-use Date,Susut Susut {0}: Tarikh Susutnilai Seterusnya tidak boleh sebelum Tarikh Tersedia untuk Penggunaan
 ,Sales Funnel,Saluran Jualan
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Item Code &gt; Item Group &gt; Brand,Kod Item&gt; Kumpulan Item&gt; Jenama
 apps/erpnext/erpnext/setup/doctype/company/company.py,Abbreviation is mandatory,Singkatan adalah wajib
 DocType: Project,Task Progress,Task Progress
 apps/erpnext/erpnext/templates/includes/navbar/navbar_items.html,Cart,Dalam Troli
@@ -6616,6 +6628,7 @@
 DocType: Employee Grade,Employee Grade,Gred pekerja
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py,Piecework,Piecework
 DocType: GSTR 3B Report,June,Jun
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Supplier &gt; Supplier Type,Pembekal&gt; Jenis Pembekal
 DocType: Share Balance,From No,Daripada No
 DocType: Shift Type,Early Exit Grace Period,Jangka Masa Keluar Awal
 DocType: Task,Actual Time (in Hours),Masa sebenar (dalam jam)
@@ -6902,6 +6915,7 @@
 DocType: Warehouse,Warehouse Name,Nama Gudang
 DocType: Naming Series,Select Transaction,Pilih Transaksi
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py,Please enter Approving Role or Approving User,Sila masukkan Meluluskan Peranan atau Meluluskan pengguna
+apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.py,UOM Conversion factor ({0} -&gt; {1}) not found for item: {2},Faktor penukaran UOM ({0} -&gt; {1}) tidak ditemui untuk item: {2}
 apps/erpnext/erpnext/support/doctype/service_level_agreement/service_level_agreement.py,Service Level Agreement with Entity Type {0} and Entity {1} already exists.,Perjanjian Tahap Perkhidmatan dengan Entiti Jenis {0} dan Entiti {1} sudah wujud.
 DocType: Journal Entry,Write Off Entry,Tulis Off Entry
 DocType: BOM,Rate Of Materials Based On,Kadar Bahan Based On
@@ -7093,6 +7107,7 @@
 DocType: Quality Inspection Reading,Quality Inspection Reading,Kualiti Pemeriksaan Reading
 apps/erpnext/erpnext/stock/doctype/stock_settings/stock_settings.py,`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/stock/report/stock_balance/stock_balance.py,Earliest Age,Umur terawal
 apps/erpnext/erpnext/utilities/user_progress.py,Set a sales goal you'd like to achieve for your company.,Tetapkan matlamat jualan yang anda ingin capai untuk syarikat anda.
 DocType: Quality Goal,Revision,Ulang kaji
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js,Healthcare Services,Perkhidmatan Penjagaan Kesihatan
@@ -7136,6 +7151,7 @@
 apps/erpnext/erpnext/healthcare/doctype/patient_encounter/patient_encounter.js,Schedule Discharge,Jadual Pelepasan
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py,Cheques and Deposits incorrectly cleared,Cek dan Deposit tidak betul dibersihkan
 DocType: Homepage Section Card,Homepage Section Card,Kad Seksyen Laman Utama
+,Amount To Be Billed,Amaun Diberi
 apps/erpnext/erpnext/accounts/doctype/account/account.py,Account {0}: You can not assign itself as parent account,Akaun {0}: Anda tidak boleh menetapkan ia sendiri sebagai akaun induk
 DocType: Purchase Invoice Item,Price List Rate,Senarai Harga Kadar
 apps/erpnext/erpnext/utilities/activation.py,Create customer quotes,Membuat sebut harga pelanggan
@@ -7188,6 +7204,7 @@
 DocType: Supplier Scorecard Criteria,Supplier Scorecard Criteria,Kriteria Kad Skor Pembekal
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py,Please select Start Date and End Date for Item {0},Sila pilih Mula Tarikh dan Tarikh Akhir untuk Perkara {0}
 DocType: Maintenance Schedule,MAT-MSH-.YYYY.-,MAT-MSH-.YYYY.-
+,Amount to Receive,Jumlah untuk Menerima
 apps/erpnext/erpnext/education/doctype/student_group_creation_tool/student_group_creation_tool.py,Course is mandatory in row {0},Kursus adalah wajib berturut-turut {0}
 apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py,From date can not be greater than than To date,Dari tarikh tidak boleh lebih besar daripada Sehingga kini
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py,To date cannot be before from date,Setakat ini tidak boleh sebelum dari tarikh
@@ -7438,7 +7455,6 @@
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js,BOM and Manufacturing Quantity are required,BOM dan Pembuatan Kuantiti dikehendaki
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js,Ageing Range 2,Range Penuaan 2
 DocType: SG Creation Tool Course,Max Strength,Max Kekuatan
-apps/erpnext/erpnext/accounts/doctype/account/account.py,"Account {0} already exists in child company {1}. The following fields have different values, they should be same:<ul><li>{2}</li></ul>","Akaun {0} sudah wujud dalam syarikat anak {1}. Bidang berikut mempunyai nilai yang berbeza, ia harus sama: <ul><li> {2} </li></ul>"
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py,Installing presets,Memasang pratetap
 DocType: Fee Schedule,EDU-FSH-.YYYY.-,EDU-FSH-.YYYY.-
 apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js,No Delivery Note selected for Customer {},Tiada Nota Penghantaran yang dipilih untuk Pelanggan {}
@@ -7650,6 +7666,7 @@
 DocType: Delivery Note,Print Without Amount,Cetak Tanpa Jumlah
 apps/erpnext/erpnext/accounts/report/asset_depreciation_ledger/asset_depreciation_ledger.py,Depreciation Date,Tarikh susutnilai
 ,Work Orders in Progress,Perintah Kerja dalam Kemajuan
+DocType: Customer Credit Limit,Bypass Credit Limit Check,Semak Semak Had Kredit
 DocType: Issue,Support Team,Pasukan Sokongan
 apps/erpnext/erpnext/stock/report/batch_item_expiry_status/batch_item_expiry_status.py,Expiry (In Days),Tamat (Dalam Hari)
 DocType: Appraisal,Total Score (Out of 5),Jumlah Skor (Daripada 5)
@@ -7836,6 +7853,7 @@
 DocType: Sales Invoice,Customer GSTIN,GSTIN pelanggan
 DocType: Crop Cycle,List of diseases detected on the field. When selected it'll automatically add a list of tasks to deal with the disease ,"Senarai penyakit yang dikesan di lapangan. Apabila dipilih, ia akan menambah senarai tugasan secara automatik untuk menangani penyakit ini"
 apps/erpnext/erpnext/manufacturing/page/bom_comparison_tool/bom_comparison_tool.js,BOM 1,BOM 1
+apps/erpnext/erpnext/assets/report/fixed_asset_register/fixed_asset_register.py,Asset Id,Id Asset
 apps/erpnext/erpnext/healthcare/doctype/healthcare_service_unit/healthcare_service_unit.js,This is a root healthcare service unit and cannot be edited.,Ini adalah unit perkhidmatan penjagaan kesihatan akar dan tidak dapat diedit.
 DocType: Asset Repair,Repair Status,Status Pembaikan
 apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.js,"Requested Qty: Quantity requested for purchase, but not ordered.","Diminta Qty: Kuantiti yang diminta untuk pembelian, tetapi tidak diperintahkan."
diff --git a/erpnext/translations/my.csv b/erpnext/translations/my.csv
index 79787dd..eefd3b1 100644
--- a/erpnext/translations/my.csv
+++ b/erpnext/translations/my.csv
@@ -289,7 +289,6 @@
 DocType: Loan,Repay Over Number of Periods,ကာလနံပါတ်ကျော်ပြန်ဆပ်
 apps/erpnext/erpnext/manufacturing/report/bom_stock_report/bom_stock_report.py,Quantity to Produce can not be less than Zero,ထုတ်လုပ်အရေအတွက်သုညထက်လျော့နည်းမဖွစျနိုငျ
 DocType: Stock Entry,Additional Costs,အပိုဆောင်းကုန်ကျစရိတ်
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Customer &gt; Customer Group &gt; Territory,ဖောက်သည်&gt; ဖောက်သည် Group မှ&gt; နယ်မြေတွေကို
 apps/erpnext/erpnext/accounts/doctype/account/account.py,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,ကျောင်းသားအုပ်စုအတွက်ကျောင်းသားများအဘို့အသုတ်လိုက်မှန်ကန်ကြောင်းသက်သေပြ
@@ -587,6 +586,7 @@
 DocType: Healthcare Settings,Create documents for sample collection,နမူနာစုဆောင်းခြင်းများအတွက်မှတ်တမ်းမှတ်ရာများ Create
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py,Payment against {0} {1} cannot be greater than Outstanding Amount {2},{0} {1} ထူးချွန်ပမာဏ {2} ထက် သာ. ကြီးမြတ်မဖွစျနိုငျဆန့်ကျင်ငွေပေးချေမှုရမည့်
 apps/erpnext/erpnext/patches/v11_0/add_healthcare_service_unit_tree_root.py,All Healthcare Service Units,အားလုံးကျန်းမာရေးစောင့်ရှောက်မှုဝန်ဆောင်မှုယူနစ်
+apps/erpnext/erpnext/setup/default_energy_point_rules.py,On Converting Opportunity,အခွင့်အလမ်းအဖြစ်ပြောင်းလဲတွင်
 DocType: Bank Account,Address HTML,လိပ်စာက HTML
 DocType: Lead,Mobile No.,မိုဘိုင်းလ်အမှတ်
 apps/erpnext/erpnext/selling/doctype/pos_closing_voucher/closing_voucher_details.html,Mode of Payments,ငွေပေးချေ၏ Mode ကို
@@ -651,7 +651,6 @@
 DocType: Accounting Dimension,Dimension Name,Dimension အမည်
 apps/erpnext/erpnext/healthcare/setup.py,Resistant,ခံနိုင်ရည်
 apps/erpnext/erpnext/hotels/doctype/hotel_room_reservation/hotel_room_reservation.py,Please set Hotel Room Rate on {},{} အပေါ်ဟိုတယ်အခန်းနှုန်းသတ်မှတ်ပေးပါ
-apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py,Please setup numbering series for Attendance via Setup &gt; Numbering Series,ကျေးဇူးပြု. Setup ကို&gt; နံပါတ်စီးရီးကနေတစ်ဆင့်တက်ရောက်ဘို့ setup ကိုစာရငျးစီးရီး
 DocType: Journal Entry,Multi Currency,multi ငွေကြေးစနစ်
 DocType: Bank Statement Transaction Invoice Item,Invoice Type,ကုန်ပို့လွှာ Type
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py,Valid from date must be less than valid upto date,နေ့စွဲကနေသက်တမ်းရှိသည့်ရက်စွဲနူန်းကျော်ကျော်တရားဝင်ထက်လျော့နည်းဖြစ်ရမည်
@@ -769,6 +768,7 @@
 apps/erpnext/erpnext/accounts/page/pos/pos.js,Create a new Customer,အသစ်တစ်ခုကိုဖောက်သည် Create
 apps/erpnext/erpnext/non_profit/report/expiring_memberships/expiring_memberships.py,Expiring On,တွင်ကုန်ဆုံးမည့်
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,"If multiple Pricing Rules continue to prevail, users are asked to set Priority manually to resolve conflict.","မျိုးစုံစျေးနှုန်းများနည်းဥပဒေများနိုင်မှတည်လျှင်, အသုံးပြုသူများပဋိပက္ခဖြေရှင်းရန်ကို manually ဦးစားပေးသတ်မှတ်ဖို့တောင်းနေကြသည်။"
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js,Purchase Return,အရစ်ကျသို့ပြန်သွားသည်
 apps/erpnext/erpnext/utilities/activation.py,Create Purchase Orders,အရစ်ကျမိန့် Create
 ,Purchase Register,မှတ်ပုံတင်မည်ဝယ်ယူ
 apps/erpnext/erpnext/healthcare/doctype/patient/patient.py,Patient not found,လူနာမတွေ့ရှိ
@@ -784,7 +784,6 @@
 DocType: Location,Area UOM,ဧရိယာ UOM
 apps/erpnext/erpnext/manufacturing/doctype/workstation/workstation.py,Workstation is closed on the following dates as per Holiday List: {0},Workstation နှင့်အားလပ်ရက်များစာရင်းနှုန်းအဖြစ်အောက်ပါရက်စွဲများအပေါ်ပိတ်ထားသည်: {0}
 apps/erpnext/erpnext/selling/page/sales_funnel/sales_funnel.py,Opportunities,အခွင့်အလမ်းများ
-apps/erpnext/erpnext/www/all-products/index.html,Clear filters,Clear ကို filter များ
 DocType: Lab Test Template,Single,တခုတည်းသော
 DocType: Compensatory Leave Request,Work From Date,နေ့စွဲကနေအလုပ်
 DocType: Salary Slip,Total Loan Repayment,စုစုပေါင်းချေးငွေပြန်ဆပ်
@@ -828,6 +827,7 @@
 apps/erpnext/erpnext/education/doctype/program_enrollment_tool/program_enrollment_tool.py,Mandatory field - Academic Year,မသင်မနေရကိုလယ် - ပညာရေးဆိုင်ရာတစ်နှစ်တာ
 apps/erpnext/erpnext/education/doctype/program_enrollment_tool/program_enrollment_tool.py,Mandatory field - Academic Year,မသင်မနေရကိုလယ် - ပညာရေးဆိုင်ရာတစ်နှစ်တာ
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py,{0} {1} is not associated with {2} {3},{0} {1} {2} {3} နှင့်အတူဆက်စပ်ခြင်းမရှိပါ
+DocType: Opportunity,Converted By,အားဖြင့်ကူးပြောင်း
 apps/erpnext/erpnext/public/js/hub/components/ReviewArea.vue,You need to login as a Marketplace User before you can add any reviews.,သင်မည်သည့်သုံးသပ်ချက်များကို add နိုင်ပါတယ်ရှေ့တော်၌ Marketplace အသုံးပြုသူအဖြစ် login ဖို့လိုအပ်ပါတယ်။
 apps/erpnext/erpnext/manufacturing/doctype/job_card/job_card.py,Row {0} : Operation is required against the raw material item {1},အတန်း {0}: စစ်ဆင်ရေးအတွက်ကုန်ကြမ်းကို item {1} ဆန့်ကျင်လိုအပ်ပါသည်
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py,Please set default payable account for the company {0},ကုမ္ပဏီ {0} များအတွက် default အနေနဲ့ပေးဆောင်အကောင့်ကိုသတ်မှတ်ပေးပါ
@@ -854,6 +854,8 @@
 DocType: Sales Invoice,Total Qty,စုစုပေါင်း Qty
 apps/erpnext/erpnext/education/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py,Guardian2 Email ID,Guardian2 အီးမေးလ် ID ကို
 apps/erpnext/erpnext/education/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py,Guardian2 Email ID,Guardian2 အီးမေးလ် ID ကို
+apps/erpnext/erpnext/hr/doctype/employee_transfer/employee_transfer.py,"Please delete the Employee <a href=""#Form/Employee/{0}"">{0}</a>\
+					to cancel this document","အဆိုပါထမ်း delete ကျေးဇူးပြု. <a href=""#Form/Employee/{0}"">{0}</a> ဤစာရွက်စာတမ်းဖျက်သိမ်းရန် \"
 DocType: Item,Show in Website (Variant),ဝက်ဘ်ဆိုက်ထဲမှာပြရန် (မူကွဲ)
 DocType: Employee,Health Concerns,ကနျြးမာရေးကိုဒေသခံများကစိုးရိမ်ပူပန်နေကြ
 DocType: Payroll Entry,Select Payroll Period,လစာကာလကို Select လုပ်ပါ
@@ -914,7 +916,6 @@
 DocType: Codification Table,Codification Table,Codification ဇယား
 DocType: Timesheet Detail,Hrs,နာရီ
 apps/erpnext/erpnext/manufacturing/page/bom_comparison_tool/bom_comparison_tool.js,Changes in {0},{0} အတွက်အပြောင်းအလဲများ
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js,Please select Company,ကုမ္ပဏီကို select ကျေးဇူးပြု.
 DocType: Employee Skill,Employee Skill,ဝန်ထမ်းကျွမ်းကျင်မှု
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.js,Difference Account,ခြားနားချက်အကောင့်
 DocType: Pricing Rule,Discount on Other Item,အခြားပစ္စည်းပေါ်မှာလျှော့စျေး
@@ -983,6 +984,7 @@
 DocType: BOM,Operating Cost,operating ကုန်ကျစရိတ်
 DocType: Crop,Produced Items,ထုတ်လုပ်ပစ္စည်းများ
 DocType: Bank Statement Transaction Entry,Match Transaction to Invoices,ငွေတောင်းခံလွှာမှပွဲစဉ်ငွေသွင်းငွေထုတ်
+apps/erpnext/erpnext/erpnext_integrations/exotel_integration.py,Error in Exotel incoming call,Exotel အဝင်ခေါ်ဆိုမှုအတွက်မှားယွင်းနေသည်
 DocType: Sales Order Item,Gross Profit,စုစုပေါင်းအမြတ်
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js,Unblock Invoice,ငွေတောင်းခံလွှာကိုပြန်လက်ခံရန်
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py,Increment cannot be 0,increment 0 င်မဖွစျနိုငျ
@@ -1198,6 +1200,7 @@
 DocType: Activity Cost,Activity Type,လုပ်ဆောင်ချက်ကအမျိုးအစား
 DocType: Request for Quotation,For individual supplier,တစ်ဦးချင်းစီပေးသွင်းများအတွက်
 DocType: BOM Operation,Base Hour Rate(Company Currency),base နာရီနှုန်း (ကုမ္ပဏီငွေကြေးစနစ်)
+,Qty To Be Billed,ငွေတောင်းခံထားမှုခံရစေရန်အရည်အတွက်
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py,Delivered Amount,ကယ်နှုတ်တော်မူ၏ငွေပမာဏ
 apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.js,Reserved Qty for Production: Raw materials quantity to make manufacturing items.,ထုတ်လုပ်မှုများအတွက် Reserved အရည်အတွက်: ကုန်ထုတ်ပစ္စည်းများလုပ်ကုန်ကြမ်းအရေအတွက်။
 DocType: Loyalty Point Entry Redemption,Redemption Date,ရွေးနှုတ်သောနေ့စွဲ
@@ -1319,7 +1322,7 @@
 apps/erpnext/erpnext/education/doctype/student_group/student_group.py,Please select Program,အစီအစဉ်ကို select ပေးပါ
 apps/erpnext/erpnext/education/doctype/student_group/student_group.py,Please select Program,အစီအစဉ်ကို select ပေးပါ
 DocType: Project,Estimated Cost,ခန့်မှန်းခြေကုန်ကျစရိတ်
-DocType: Request for Quotation,Link to material requests,ပစ္စည်းတောင်းဆိုမှုများမှ Link ကို
+DocType: Supplier Quotation,Link to material requests,ပစ္စည်းတောင်းဆိုမှုများမှ Link ကို
 apps/erpnext/erpnext/public/js/hub/pages/Publish.vue,Publish,ပုံနှိပ်ထုတ်ဝေ
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py,Aerospace,Aerospace
 ,Fichier des Ecritures Comptables [FEC],Fichier des Ecritures Comptables [FEC]
@@ -1332,6 +1335,7 @@
 apps/erpnext/erpnext/utilities/transaction_base.py,Invalid Posting Time,မှားနေသော post အချိန်
 DocType: Salary Component,Condition and Formula,အခြေအနေနှင့်ဖော်မြူလာ
 DocType: Lead,Campaign Name,ကင်ပိန်းအမည်
+apps/erpnext/erpnext/setup/default_energy_point_rules.py,On Task Completion,Task ကိုပြီးစီးတွင်
 apps/erpnext/erpnext/hr/doctype/compensatory_leave_request/compensatory_leave_request.py,There is no leave period in between {0} and {1},အဘယ်သူမျှမချန်ကာလ {0} နှင့် {1} ကြား၌ရှိပါသည်
 DocType: Fee Validity,Healthcare Practitioner,ကျန်းမာရေးစောင့်ရှောက်မှု Practitioner
 DocType: Hotel Room,Capacity,စွမ်းဆောင်ရည်
@@ -1677,7 +1681,6 @@
 DocType: Quality Feedback Template,Quality Feedback Template,အရည်အသွေးတုံ့ပြန်ချက် Template ကို
 apps/erpnext/erpnext/config/education.py,LMS Activity,LMS လှုပ်ရှားမှု
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py,Internet Publishing,အင်တာနက်ထုတ်ဝေရေး
-DocType: Prescription Duration,Number,ဂဏန်း
 apps/erpnext/erpnext/accounts/doctype/opening_invoice_creation_tool/opening_invoice_creation_tool.js,Creating {0} Invoice,{0} ငွေတောင်းခံလွှာ Creating
 DocType: Medical Code,Medical Code Standard,ဆေးဘက်ဆိုင်ရာကျင့်ထုံးစံ
 DocType: Soil Texture,Clay Composition (%),ရွှံ့ရေးစပ်သီကုံး (%)
@@ -1752,6 +1755,7 @@
 DocType: Support Settings,Get Started Sections,ကဏ္ဍများ Started Get
 DocType: Lead,CRM-LEAD-.YYYY.-,CRM-ခဲ-.YYYY.-
 DocType: Invoice Discounting,Sanctioned,ဒဏ်ခတ်အရေးယူ
+,Base Amount,base ငွေပမာဏ
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.js,Total Contribution Amount: {0},စုစုပေါင်းအလှူငှပေးငွေပမာဏ: {0}
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py,Row #{0}: Please specify Serial No for Item {1},row # {0}: Item {1} သည် Serial No ကိုသတ်မှတ်ပေးပါ
 DocType: Payroll Entry,Salary Slips Submitted,Submitted လစာစလစ်
@@ -1974,6 +1978,7 @@
 DocType: Accounting Dimension,Dimension Defaults,Dimension Defaults ကို
 apps/erpnext/erpnext/crm/report/prospects_engaged_but_not_converted/prospects_engaged_but_not_converted.js,Minimum Lead Age (Days),နိမ့်ဆုံးခဲခေတ် (နေ့ရက်များ)
 apps/erpnext/erpnext/crm/report/prospects_engaged_but_not_converted/prospects_engaged_but_not_converted.js,Minimum Lead Age (Days),နိမ့်ဆုံးခဲခေတ် (နေ့ရက်များ)
+apps/erpnext/erpnext/assets/report/fixed_asset_register/fixed_asset_register.py,Available For Use Date,အသုံးပြုမှုနေ့စွဲသည်ရရှိနိုင်
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py,All BOMs,အားလုံး BOMs
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js,Create Inter Company Journal Entry,အင်တာမီလန်ကုမ္ပဏီဂျာနယ် Entry &#39;Create
 DocType: Company,Parent Company,မိခင်ကုမ္ပဏီ
@@ -2038,6 +2043,7 @@
 ,IRS 1099,IRS ကို 1099
 DocType: Salary Slip,Leave Without Pay,Pay ကိုမရှိရင် Leave
 DocType: Payment Request,Outward,အပြင်ကျသော
+apps/erpnext/erpnext/setup/default_energy_point_rules.py,On {0} Creation,{0} ဖန်ဆင်းခြင်းတွင်
 apps/erpnext/erpnext/regional/doctype/gstr_3b_report/gstr_3b_report.html,State/UT Tax,ပြည်နယ် / UT အခွန်
 ,Trial Balance for Party,ပါတီများအတွက် trial Balance ကို
 ,Gross and Net Profit Report,စုစုပေါင်းနှင့် Net ကအမြတ်အစီရင်ခံစာ
@@ -2155,6 +2161,7 @@
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js,Make Stock Entry,စတော့အိတ် Entry &#39;Make
 DocType: Hotel Room Reservation,Hotel Reservation User,ဟိုတယ် Reservation များအသုံးပြုသူ
 apps/erpnext/erpnext/projects/doctype/project/project.js,Set Status,Set အခြေအနေ
+apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py,Please setup numbering series for Attendance via Setup &gt; Numbering Series,ကျေးဇူးပြု. Setup ကို&gt; နံပါတ်စီးရီးကနေတစ်ဆင့်တက်ရောက်ဘို့ setup ကိုစာရငျးစီးရီး
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py,Please select prefix first,ပထမဦးဆုံးရှေ့ဆက်ကိုရွေးပါ ကျေးဇူးပြု.
 DocType: Contract,Fulfilment Deadline,ပွညျ့စုံနောက်ဆုံး
 apps/erpnext/erpnext/public/js/hub/pages/Home.vue,Near you,သငျသညျအနီး
@@ -2170,6 +2177,7 @@
 DocType: Announcement,All Students,အားလုံးကျောင်းသားများ
 apps/erpnext/erpnext/assets/doctype/asset/asset.py,Item {0} must be a non-stock item,item {0} non-စတော့ရှယ်ယာကို item ဖြစ်ရပါမည်
 apps/erpnext/erpnext/stock/doctype/batch/batch.js,View Ledger,view လယ်ဂျာ
+DocType: Cost Center,Lft,Lft
 DocType: Grading Scale,Intervals,အကြား
 DocType: Bank Statement Transaction Entry,Reconciled Transactions,ပြန်. အရောင်းအဝယ်
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py,Earliest,အစောဆုံး
@@ -2285,6 +2293,7 @@
 apps/erpnext/erpnext/hr/doctype/employee_benefit_application/employee_benefit_application.py,As per your assigned Salary Structure you cannot apply for benefits,သင့်ရဲ့တာဝန်ပေးလစာဖွဲ့စည်းပုံနှုန်းသကဲ့သို့သင်တို့အကျိုးခံစားခွင့်များအတွက်လျှောက်ထားလို့မရပါဘူး
 apps/erpnext/erpnext/stock/doctype/item/item.py,Website Image should be a public file or website URL,website က Image ကိုအများသုံးတဲ့ဖိုင်သို့မဟုတ် website ကို URL ကိုဖြစ်သင့်
 DocType: Purchase Invoice Item,BOM,BOM
+apps/erpnext/erpnext/stock/doctype/item/item.py,Duplicate entry in Manufacturers table,ထုတ်လုပ်သူ table ထဲမှာ entry ကို Duplicate
 apps/erpnext/erpnext/setup/doctype/item_group/item_group.js,This is a root item group and cannot be edited.,ဒါကအမြစ်ကို item အဖွဲ့နှင့်တည်းဖြတ်မရနိုင်ပါ။
 apps/erpnext/erpnext/accounts/doctype/account/account.js,Merge,အဖှဲ့ပေါငျး
 DocType: Journal Entry Account,Purchase Order,ကုန်ပစ္စည်းအမှာစာ
@@ -2431,7 +2440,6 @@
 DocType: Asset,Depreciation Schedules,တန်ဖိုးအချိန်ဇယား
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.js,Create Sales Invoice,အရောင်းပြေစာ Create
 apps/erpnext/erpnext/regional/doctype/gstr_3b_report/gstr_3b_report.html,Ineligible ITC,အရည်အချင်းမပြည့်မှီ ITC
-apps/erpnext/erpnext/erpnext_integrations/doctype/shopify_settings/shopify_settings.py,"Support for public app is deprecated. Please setup private app, for more details refer user manual","အများပြည်သူ app ကိုများအတွက်ပံ့ပိုးမှုကန့်ကွက်ခံထားသည်။ အသေးစိတ်ကိုအသုံးပြုသူကို manual ကိုရည်ညွှန်းသည်, setup ကိုပုဂ္ဂလိက app ကိုနှစ်သက်သော"
 DocType: Task,Dependent Tasks,မှီခိုလုပ်ငန်းများ
 apps/erpnext/erpnext/regional/report/gstr_1/gstr_1.py,Following accounts might be selected in GST Settings:,အောက်ပါအကောင့် GST က Settings ထဲမှာရှေးခယျြထားစေခြင်းငှါ:
 apps/erpnext/erpnext/manufacturing/report/bom_stock_report/bom_stock_report.js,Quantity to Produce,ထုတ်လုပ်အရေအတွက်
@@ -2683,6 +2691,7 @@
 DocType: Water Analysis,Container,ထည့်သောအရာ
 apps/erpnext/erpnext/regional/report/gstr_1/gstr_1.py,Please set valid GSTIN No. in Company Address,ကုမ္ပဏီလိပ်စာအတွက်ခိုင်လုံသော GSTIN အမှတ်ကိုသတ်မှတ်ပေးပါ
 apps/erpnext/erpnext/education/utils.py,Student {0} - {1} appears Multiple times in row {2} & {3},ကျောင်းသားသမဂ္ဂ {0} - {1} အတန်း {2} အတွက်အကွိမျမြားစှာအဆပုံပေါ် &amp; {3}
+apps/erpnext/erpnext/selling/doctype/customer/customer.py,Following fields are mandatory to create address:,အောက်ပါကွက်လပ်များကိုလိပ်စာကိုဖန်တီးရန်မဖြစ်မနေနေသောခေါင်းစဉ်:
 DocType: Item Alternative,Two-way,Two-လမ်း
 DocType: Item,Manufacturers,ထုတ်လုပ်သူ
 apps/erpnext/erpnext/accounts/deferred_revenue.py,Error while processing deferred accounting for {0},မှားယွင်းနေသည် {0} များအတွက်ရက်ရွှေ့ဆိုင်းစာရင်းကိုင်ဆောင်ရွက်နေစဉ်
@@ -2758,9 +2767,9 @@
 DocType: Employee,HR-EMP-,HR-EMP-
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py,User {0} doesn't have any default POS Profile. Check Default at Row {1} for this User.,အသုံးပြုသူ {0} ကိုမဆို default အနေနဲ့ POS ကိုယ်ရေးဖိုင်မရှိပါ။ ဤအသုံးပြုသူများအတွက် Row {1} မှာပုံမှန်စစ်ဆေးပါ။
 DocType: Quality Meeting Minutes,Quality Meeting Minutes,အရည်အသွေးအစည်းအဝေးမှတ်တမ်းများ
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Supplier &gt; Supplier Type,ပေးသွင်း&gt; ပေးသွင်းအမျိုးအစား
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py,Employee Referral,ဝန်ထမ်းလွှဲပြောင်း
 DocType: Student Group,Set 0 for no limit,အဘယ်သူမျှမကန့်သတ်များအတွက် 0 င် Set
+DocType: Cost Center,rgt,rgt
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py,The day(s) on which you are applying for leave are holidays. You need not apply for leave.,သငျသညျခွင့်များအတွက်လျှောက်ထားထားတဲ့နေ့ (သို့) အားလပ်ရက်ဖြစ်ကြ၏။ သငျသညျခွင့်လျှောက်ထားစရာမလိုပေ။
 DocType: Customer,Primary Address and Contact Detail,မူလတန်းလိပ်စာနှင့်ဆက်သွယ်ရန်အသေးစိတ်
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.js,Resend Payment Email,ငွေပေးချေမှုရမည့်အီးမေးလ် Resend
@@ -2870,7 +2879,6 @@
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py,Against Supplier Invoice {0} dated {1},ပေးသွင်းပြေစာ {0} ဆန့်ကျင် {1} ရက်စွဲပါ
 DocType: Customer,Default Price List,default စျေးနှုန်းများစာရင်း
 apps/erpnext/erpnext/assets/doctype/asset/asset.py,Asset Movement record {0} created,ပိုင်ဆိုင်မှုလပ်ြရြားမြစံချိန် {0} ကဖန်တီး
-apps/erpnext/erpnext/utilities/page/leaderboard/leaderboard.js,No items found.,ပစ္စည်းများကိုမျှမတွေ့ပါ။
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py,You cannot delete Fiscal Year {0}. Fiscal Year {0} is set as default in Global Settings,သငျသညျဘဏ္ဍာရေးနှစ်တစ်နှစ်တာ {0} မဖျက်နိုင်ပါ။ ဘဏ္ဍာရေးနှစ်တစ်နှစ်တာ {0} ကမ္တာ့ချိန်ညှိအတွက် default အနေနဲ့အဖြစ်သတ်မှတ်
 DocType: Share Transfer,Equity/Liability Account,equity / တာဝန်ဝတ္တရားအကောင့်
 apps/erpnext/erpnext/setup/doctype/customer_group/customer_group.py,A customer with the same name already exists,အမည်တူနှင့်အတူတစ်ဦးကဖောက်သည်ပြီးသားတည်ရှိ
@@ -2886,6 +2894,7 @@
 apps/erpnext/erpnext/selling/doctype/customer/customer.py,Credit limit has been crossed for customer {0} ({1}/{2}),အကြွေးကန့်သတ်ဖောက်သည် {0} ({1} / {2}) များအတွက်ဖြတ်ကျော်ခဲ့ပြီး
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py,Customer required for 'Customerwise Discount',&#39;&#39; Customerwise လျှော့ &#39;&#39; လိုအပ် customer
 apps/erpnext/erpnext/config/accounting.py,Update bank payment dates with journals.,ဂျာနယ်များနှင့်အတူဘဏ်ငွေပေးချေမှုရက်စွဲများ Update ။
+,Billed Qty,ကောက်ခံခဲ့အရည်အတွက်
 apps/erpnext/erpnext/stock/doctype/item/item_dashboard.py,Pricing,စျေးနှုန်း
 DocType: Employee,Attendance Device ID (Biometric/RF tag ID),တက်ရောက်သူကိရိယာ ID (biometric / RF tag ကို ID ကို)
 DocType: Quotation,Term Details,သက်တမ်းအသေးစိတ်ကို
@@ -2909,6 +2918,7 @@
 DocType: Share Transfer,Asset Account,ပိုင်ဆိုင်မှုအကောင့်
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js,New release date should be in the future,နယူးလွှတ်ပေးရန်နေ့စွဲအနာဂတ်၌ဖြစ်သင့်
 DocType: Purchase Invoice,End date of current invoice's period,လက်ရှိကုန်ပို့လွှာရဲ့ကာလ၏အဆုံးနေ့စွဲ
+apps/erpnext/erpnext/hr/doctype/employee/employee.py,Please setup Employee Naming System in Human Resource &gt; HR Settings,လူ့စွမ်းအားအရင်းအမြစ်အတွက် System ကိုအမည်ဖြင့်သမုတ် ကျေးဇူးပြု. setup ကိုထမ်း&gt; HR က Settings
 DocType: Lab Test,Technician Name,Technician အအမည်
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py,"Cannot ensure delivery by Serial No as \
 					Item {0} is added with and without Ensure Delivery by \
@@ -2916,6 +2926,7 @@
 DocType: Accounts Settings,Unlink Payment on Cancellation of Invoice,ငွေတောင်းခံလွှာ၏ Cancellation အပေါ်ငွေပေးချေမှုရမည့်လင့်ဖြုတ်ရန်
 DocType: Bank Reconciliation,From Date,နေ့စွဲကနေ
 apps/erpnext/erpnext/hr/doctype/vehicle_log/vehicle_log.py,Current Odometer reading entered should be greater than initial Vehicle Odometer {0},စာဖတ်ခြင်းသို့ဝင်လက်ရှိ Odometer ကနဦးယာဉ် Odometer {0} ထက် သာ. ကြီးမြတ်ဖြစ်သင့်
+,Purchase Order Items To Be Received or Billed,အရစ်ကျမိန့်ပစ္စည်းများရရှိထားသည့်သို့မဟုတ်ငွေတောင်းခံထားမှုခံရရန်
 DocType: Restaurant Reservation,No Show,အဘယ်သူမျှမပြသပါ
 apps/erpnext/erpnext/regional/india/utils.py,You must be a registered supplier to generate e-Way Bill,သငျသညျက e-Way ကိုဘီလ် generate ရန်မှတ်ပုံတင်ထားသောကုန်ပစ္စည်းပေးသွင်းသူဖြစ်ရမည်
 DocType: Shipping Rule Country,Shipping Rule Country,သဘောင်္တင်ခနည်းဥပဒေနိုင်ငံ
@@ -2958,6 +2969,7 @@
 apps/erpnext/erpnext/templates/generators/item/item_add_to_cart.html,View in Cart,လှည်းအတွက်ကြည့်ရန်
 DocType: Employee Checkin,Shift Actual Start,အမှန်တကယ် Start ကို Shift
 DocType: Tally Migration,Is Day Book Data Imported,နေ့စာအုပ်ဒေတာများကအရေးကြီးတယ်
+,Purchase Order Items To Be Received or Billed1,ရရှိထားသည့်ခံရစေရန်အမိန့်ပစ္စည်းများဝယ်ယူရန်သို့မဟုတ် Billed1
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py,Marketing Expenses,marketing အသုံးစရိတ်များ
 apps/erpnext/erpnext/stock/doctype/pick_list/pick_list.py,{0} units of {1} is not available.,{1} ၏ {0} ယူနစ်မရရှိနိုင်။
 ,Item Shortage Report,item ပြတ်လပ်အစီရင်ခံစာ
@@ -3186,7 +3198,6 @@
 apps/erpnext/erpnext/public/js/call_popup/call_popup.js,View all issues from {0},{0} ကနေအားလုံးကိစ္စများ View
 DocType: Quality Inspection,MAT-QA-.YYYY.-,MAT-QA သို့-.YYYY.-
 DocType: Quality Meeting Table,Quality Meeting Table,အရည်အသွေးအစည်းအဝေးဇယား
-apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,Setup ကို&gt; Setting&gt; အမည်ဖြင့်သမုတ်စီးရီးကနေတဆင့် {0} များအတွက်စီးရီးအမည်ဖြင့်သမုတ်သတ်မှတ်ထား ကျေးဇူးပြု.
 apps/erpnext/erpnext/templates/pages/help.html,Visit the forums,အဆိုပါဖိုရမ်သို့သွားရောက်
 DocType: Student,Student Mobile Number,ကျောင်းသားသမဂ္ဂမိုဘိုင်းနံပါတ်
 DocType: Item,Has Variants,မူကွဲရှိပါတယ်
@@ -3330,6 +3341,7 @@
 ,Campaign Efficiency,ကင်ပိန်းစွမ်းရည်
 ,Campaign Efficiency,ကင်ပိန်းစွမ်းရည်
 DocType: Discussion,Discussion,ဆွေးနွေးချက်
+apps/erpnext/erpnext/setup/default_energy_point_rules.py,On Sales Order Submission,အရောင်းအမိန့်တင်ပြမှုတွင်
 DocType: Bank Transaction,Transaction ID,ငွေသွင်းငွေထုတ် ID ကို
 DocType: Payroll Entry,Deduct Tax For Unsubmitted Tax Exemption Proof,သက်သေပြချက်အခွန်သည် Unsubmitted အခွန်ကင်းလွတ်ခွင့်နုတ်
 DocType: Volunteer,Anytime,အချိန်မရွေး
@@ -3337,7 +3349,6 @@
 DocType: Employee Tax Exemption Proof Submission,Employee Tax Exemption Proof Submission,ဝန်ထမ်းအခွန်ကင်းလွတ်ခွင့်အထောက်အထားတင်ပြမှု
 DocType: Patient,Surgical History,ခွဲစိတ်သမိုင်း
 DocType: Bank Statement Settings Item,Mapped Header,တစ်ခုသို့ဆက်စပ် Header ကို
-apps/erpnext/erpnext/hr/doctype/employee/employee.py,Please setup Employee Naming System in Human Resource &gt; HR Settings,လူ့စွမ်းအားအရင်းအမြစ်အတွက် System ကိုအမည်ဖြင့်သမုတ် ကျေးဇူးပြု. setup ကိုထမ်း&gt; HR က Settings
 DocType: Employee,Resignation Letter Date,နုတ်ထွက်ပေးစာနေ့စွဲ
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Pricing Rules are further filtered based on quantity.,စျေးနှုန်းနည်းဥပဒေများနောက်ထပ်အရေအတွက်ပေါ် အခြေခံ. filtered နေကြပါတယ်။
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py,Please set the Date Of Joining for employee {0},ဝန်ထမ်း {0} အဘို့အချိတ်တွဲ၏နေ့စွဲသတ်မှတ်ပေးပါ
@@ -3352,6 +3363,7 @@
 DocType: Bank Statement Settings,Mapped Items,တစ်ခုသို့ဆက်စပ်ပစ္စည်းများ
 DocType: Amazon MWS Settings,IT,အိုင်တီ
 DocType: Chapter,Chapter,အခနျး
+,Fixed Asset Register,Fixed Asset မှတ်ပုံတင်မည်
 apps/erpnext/erpnext/utilities/user_progress.py,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,Select BOM and Qty for Production,ထုတ်လုပ်မှုများအတွက် BOM နှင့်အရည်အတွက်ကို Select လုပ်ပါ
@@ -3487,7 +3499,6 @@
 apps/erpnext/erpnext/templates/emails/reorder_item.html,Following Material Requests have been raised automatically based on Item's re-order level,အောက်ပါပစ္စည်းများတောင်းဆိုမှုများပစ္စည်းရဲ့ Re-အမိန့် level ကိုအပေါ်အခြေခံပြီးအလိုအလြောကျထမြောက်ကြပါပြီ
 apps/erpnext/erpnext/controllers/accounts_controller.py,Account {0} is invalid. Account Currency must be {1},အကောင့်ကို {0} မမှန်ကန်ဘူး။ အကောင့်ကိုငွေကြေးစနစ် {1} ဖြစ်ရပါမည်
 apps/erpnext/erpnext/hr/doctype/salary_structure_assignment/salary_structure_assignment.py,From Date {0} cannot be after employee's relieving Date {1},နေ့စွဲကနေ {0} ဝန်ထမ်းရဲ့စိတ်သက်သာရာနေ့စွဲ {1} ပြီးနောက်မဖွစျနိုငျ
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py,Debit Note {0} has been created automatically,debit မှတ်ချက် {0} ကိုအလိုအလျောက်ဖန်တီးလိုက်ပါပြီ
 apps/erpnext/erpnext/accounts/doctype/payment_order/payment_order.js,Create Payment Entries,ငွေပေးချေမှုရမည့် Entries Create
 DocType: Supplier,Is Internal Supplier,ပြည်တွင်းပေးသွင်းဖြစ်ပါသည်
 DocType: Employee,Create User Permission,အသုံးပြုသူခွင့်ပြုချက် Create
@@ -4051,7 +4062,6 @@
 DocType: Project User,Project Status,စီမံချက်လက်ရှိအခြေအနေ
 DocType: UOM,Check this to disallow fractions. (for Nos),အပိုငျးအမြစ်တားရန်ဤစစ်ဆေးပါ။ (အမှတ်အတွက်)
 DocType: Student Admission Program,Naming Series (for Student Applicant),(ကျောင်းသားလျှောက်ထားသူအတွက်) စီးရီးအမည်ဖြင့်သမုတ်
-apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.py,UOM Conversion factor ({0} -&gt; {1}) not found for item: {2},UOM ကူးပြောင်းခြင်းအချက် ({0} -&gt; {1}) ကို item ဘို့မတွေ့ရှိ: {2}
 apps/erpnext/erpnext/hr/doctype/retention_bonus/retention_bonus.py,Bonus Payment Date cannot be a past date,အပိုဆုငွေပေးချေမှုရမည့်နေ့စွဲတစ်အတိတ်နေ့စွဲမဖွစျနိုငျ
 DocType: Travel Request,Copy of Invitation/Announcement,ဖိတ်ကြားလွှာ / ကြေညာချက်၏မိတ္တူ
 DocType: Practitioner Service Unit Schedule,Practitioner Service Unit Schedule,Practitioner ဝန်ဆောင်မှုယူနစ်ဇယား
@@ -4200,6 +4210,7 @@
 apps/erpnext/erpnext/utilities/user_progress.py,Setup Company,Setup ကိုကုမ္ပဏီ
 ,Lab Test Report,Lab ကစမ်းသပ်အစီရင်ခံစာ
 DocType: Employee Benefit Application,Employee Benefit Application,ဝန်ထမ်းအကျိုးခံစားခွင့်လျှောက်လွှာ
+apps/erpnext/erpnext/accounts/doctype/invoice_discounting/invoice_discounting.py,Row({0}): {1} is already discounted in {2},row ({0}): {1} ပြီးသား {2} အတွက်လျှော့နေသည်
 apps/erpnext/erpnext/hr/doctype/additional_salary/additional_salary.py,Additional Salary Component Exists.,အပိုဆောင်းလစာစိတျအပိုငျးတည်ရှိ။
 DocType: Purchase Invoice,Unregistered,မှတ်ပုံတင်မထားတဲ့
 DocType: Student Applicant,Application Date,လျှောက်လွှာနေ့စွဲ
@@ -4279,7 +4290,6 @@
 DocType: Journal Entry,Accounting Entries,စာရင်းကိုင် Entries
 DocType: Job Card Time Log,Job Card Time Log,ယောဘသည် Card ကိုအချိန် Log in ဝင်ရန်
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,"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;လယ်ပြင်၌ခေါ်ယူလိမ့်မည်။"
-apps/erpnext/erpnext/education/doctype/instructor/instructor.py,Please setup Instructor Naming System in Education &gt; Education Settings,ပညာရေးအတွက် System ကိုအမည်ဖြင့်သမုတ် ကျေးဇူးပြု. setup ကိုနည်းပြ&gt; ပညာရေးကိုဆက်တင်
 DocType: Journal Entry,Paid Loan,paid ချေးငွေ
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py,Duplicate Entry. Please check Authorization Rule {0},Entry Duplicate ။ ခွင့်ပြုချက်နည်းဥပဒေ {0} စစ်ဆေးပါ
 DocType: Journal Entry Account,Reference Due Date,ကိုးကားစရာကြောင့်နေ့စွဲ
@@ -4296,7 +4306,6 @@
 apps/erpnext/erpnext/templates/pages/projects.html,No time sheets,အဘယ်သူမျှမအချိန်စာရွက်များ
 DocType: GoCardless Mandate,GoCardless Customer,GoCardless ဖောက်သည်
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py,Leave Type {0} cannot be carry-forwarded,{0} သယ်-forward နိုင်သည်မရနိုင်ပါ Type နေရာမှာ Leave
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Item Code &gt; Item Group &gt; Brand,item Code ကို&gt; item Group မှ&gt; အမှတ်တံဆိပ်
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py,Maintenance Schedule is not generated for all the items. Please click on 'Generate Schedule',ပြုပြင်ထိန်းသိမ်းမှုဇယားအပေါငျးတို့သပစ္စည်းများသည် generated မဟုတ်ပါ။ &#39;&#39; Generate ဇယား &#39;&#39; ကို click ပါ ကျေးဇူးပြု.
 ,To Produce,ထုတ်လုပ်
 DocType: Leave Encashment,Payroll,အခစာရင်း
@@ -4412,7 +4421,6 @@
 DocType: Stock Ledger Entry,Actual Qty After Transaction,Transaction ပြီးနောက်အမှန်တကယ် Qty
 ,Pending SO Items For Purchase Request,ဝယ်ယူခြင်းတောင်းဆိုခြင်းသည်ဆိုင်းငံ SO ပစ္စည်းများ
 apps/erpnext/erpnext/education/doctype/student_admission/student_admission.py,Student Admissions,ကျောင်းသားသမဂ္ဂအဆင့်လက်ခံရေး
-apps/erpnext/erpnext/accounts/party.py,{0} {1} is disabled,{0} {1} ကိုပိတ်ထားသည်
 DocType: Supplier,Billing Currency,ငွေတောင်းခံငွေကြေးစနစ်
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py,Extra Large,အပိုအကြီးစား
 DocType: Loan,Loan Application,ချေးငွေလျှောက်လွှာ
@@ -4489,7 +4497,6 @@
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py,Only Leave Applications with status 'Approved' and 'Rejected' can be submitted,&#39;&#39; Approved &#39;နဲ့&#39; ငြင်းပယ် &#39;&#39; တင်သွင်းနိုင်ပါသည် status ကိုအတူ Applications ကိုသာလျှင် Leave
 apps/erpnext/erpnext/accounts/doctype/accounting_dimension/accounting_dimension.py,Creating Dimensions...,Creating အရွယ်အစား ...
 apps/erpnext/erpnext/education/doctype/student_group_creation_tool/student_group_creation_tool.py,Student Group Name is mandatory in row {0},ကျောင်းသားအုပ်စုအမည်အတန်း {0} အတွက်မဖြစ်မနေဖြစ်ပါသည်
-DocType: Customer Credit Limit,Bypass credit limit_check,Bypass လုပ်ရအကြွေး limit_check
 DocType: Homepage,Products to be shown on website homepage,ဝက်ဘ်ဆိုက်ပင်မစာမျက်နှာပေါ်မှာပြသခံရဖို့ထုတ်ကုန်များ
 DocType: HR Settings,Password Policy,Password ကိုပေါ်လစီ
 apps/erpnext/erpnext/setup/doctype/customer_group/customer_group.js,This is a root customer group and cannot be edited.,"ဒါကအမြစ်ဖောက်သည်အုပ်စုဖြစ်ပြီး, edited မရနိုင်ပါ။"
@@ -4783,6 +4790,7 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py,Row {0}: Advance against Customer must be credit,row {0}: ဖောက်သည်ဆန့်ကျင်ကြိုတင်အကြွေးဖြစ်ရပါမည်
 DocType: Quality Meeting,Quality Meeting,အရည်အသွေးအစည်းအဝေး
 apps/erpnext/erpnext/accounts/doctype/account/account.js,Non-Group to Group,Group ကိုမှ non-Group က
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,Setup ကို&gt; Setting&gt; အမည်ဖြင့်သမုတ်စီးရီးကနေတဆင့် {0} များအတွက်စီးရီးအမည်ဖြင့်သမုတ်သတ်မှတ်ထား ကျေးဇူးပြု.
 DocType: Employee,ERPNext User,ERPNext အသုံးပြုသူ
 apps/erpnext/erpnext/education/doctype/student_group_creation_tool/student_group_creation_tool.py,Batch is mandatory in row {0},batch အတန်း {0} အတွက်မဖြစ်မနေဖြစ်ပါသည်
 apps/erpnext/erpnext/education/doctype/student_group_creation_tool/student_group_creation_tool.py,Batch is mandatory in row {0},batch အတန်း {0} အတွက်မဖြစ်မနေဖြစ်ပါသည်
@@ -5082,6 +5090,7 @@
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py,No {0} found for Inter Company Transactions.,{0} အင်တာမီလန်ကုမ္ပဏီအရောင်းအဝယ်ဘို့မျှမတွေ့ပါ။
 DocType: Travel Itinerary,Rented Car,ငှားရမ်းထားသောကား
 apps/erpnext/erpnext/public/js/hub/components/profile_dialog.js,About your Company,သင့်ရဲ့ကုမ္ပဏီအကြောင်း
+apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.js,Show Stock Ageing Data,စတော့အိတ်အိုမင်းခြင်းဟာဒေတာများကိုပြရန်
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py,Credit To account must be a Balance Sheet account,အကောင့်ကိုရန်အကြွေးတစ်ဦး Balance ကိုစာရွက်အကောင့်ကိုသူဖြစ်ရမည်
 DocType: Donor,Donor,အလှူရှင်
 DocType: Global Defaults,Disable In Words,စကားထဲမှာ disable
@@ -5096,8 +5105,10 @@
 DocType: Practitioner Schedule,Schedule Name,ဇယားအမည်
 apps/erpnext/erpnext/regional/doctype/gstr_3b_report/gstr_3b_report.py,Please enter GSTIN and state for the Company Address {0},အဆိုပါကုမ္ပဏီလိပ်စာ {0} များအတွက် GSTIN နှင့်ပြည်နယ်ရိုက်ထည့်ပေးပါ
 DocType: Currency Exchange,For Buying,ဝယ်သည်အတွက်
+apps/erpnext/erpnext/setup/default_energy_point_rules.py,On Purchase Order Submission,အရစ်ကျမိန့်တင်ပြမှုတွင်
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js,Add All Suppliers,အားလုံးပေးသွင်း Add
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py,Row #{0}: Allocated Amount cannot be greater than outstanding amount.,အတန်း # {0}: ခွဲဝေငွေပမာဏထူးချွန်ငွေပမာဏထက် သာ. ကြီးမြတ်မဖြစ်နိုင်ပါ။
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Customer &gt; Customer Group &gt; Territory,ဖောက်သည်&gt; ဖောက်သည် Group မှ&gt; နယ်မြေတွေကို
 DocType: Tally Migration,Parties,ပါတီများက
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js,Browse BOM,Browse ကို BOM
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py,Secured Loans,လုံခြုံသောချေးငွေ
@@ -5129,6 +5140,7 @@
 apps/erpnext/erpnext/stock/doctype/item_alternative/item_alternative.py,Not allow to set alternative item for the item {0},ပစ္စည်း {0} များအတွက်အခြားရွေးချယ်စရာကို item set ဖို့ခွင့်မပြု
 apps/erpnext/erpnext/hr/doctype/leave_block_list/leave_block_list.py,Date is repeated,နေ့စွဲထပ်ခါတလဲလဲဖြစ်ပါတယ်
 apps/erpnext/erpnext/accounts/print_format/payment_receipt_voucher/payment_receipt_voucher.html,Authorized Signatory,Authorized လက်မှတ်ရေးထိုးထားသော
+apps/erpnext/erpnext/education/doctype/instructor/instructor.py,Please setup Instructor Naming System in Education &gt; Education Settings,ပညာရေးအတွက် System ကိုအမည်ဖြင့်သမုတ် ကျေးဇူးပြု. setup ကိုနည်းပြ&gt; ပညာရေးကိုဆက်တင်
 apps/erpnext/erpnext/regional/doctype/gstr_3b_report/gstr_3b_report.html,Net ITC Available(A) - (B),Net က ITC ရရှိနိုင်သော (က) - (ခ)
 apps/erpnext/erpnext/education/doctype/fee_schedule/fee_schedule.js,Create Fees,အခကြေးငွေ Create
 DocType: Project,Total Purchase Cost (via Purchase Invoice),(ဝယ်ယူခြင်းပြေစာကနေတဆင့်) စုစုပေါင်းဝယ်ယူကုန်ကျစရိတ်
@@ -5149,6 +5161,7 @@
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.js,Message Sent,message Sent
 apps/erpnext/erpnext/accounts/doctype/account/account.py,Account with child nodes cannot be set as ledger,ကလေးသူငယ် node များနှင့်အတူအကောင့်ကိုလယ်ဂျာအဖြစ်သတ်မှတ်မရနိုငျ
 DocType: C-Form,II,II ကို
+apps/erpnext/erpnext/assets/report/fixed_asset_register/fixed_asset_register.py,Vendor Name,vendor အမည်
 DocType: Quiz Result,Wrong,မှားသော
 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 ကပမာဏ (ကုမ္ပဏီငွေကြေးစနစ်)
@@ -5394,6 +5407,7 @@
 DocType: Stock Settings,Auto Material Request,မော်တော်ကားပစ္စည်းတောင်းဆိုခြင်း
 DocType: Woocommerce Settings,API consumer secret,API ကိုစားသုံးသူလျှို့ဝှက်ချက်
 DocType: Delivery Note Item,Available Batch Qty at From Warehouse,ဂိုဒေါင် မှစ. မှာရရှိနိုင်တဲ့ Batch Qty
+,Received Qty Amount,ရရှိထားသည့်အရည်အတွက်ငွေပမာဏ
 DocType: Salary Slip,Gross Pay - Total Deduction - Loan Repayment,စုစုပေါင်း Pay ကို - စုစုပေါင်းထုတ်ယူ - ချေးငွေပြန်ဆပ်
 DocType: Bank Account,Last Integration Date,နောက်ဆုံးပေါင်းစည်းရေးနေ့စွဲ
 DocType: Expense Claim,Expense Taxes and Charges,ကုန်ကျစရိတ်အခွန်နှင့်စွပ်စွဲချက်
@@ -5858,6 +5872,8 @@
 DocType: Drug Prescription,Hour,နာရီ
 DocType: Restaurant Order Entry,Last Sales Invoice,နောက်ဆုံးအရောင်းပြေစာ
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py,Please select Qty against item {0},ကို item ဆန့်ကျင် {0} အရည်အတွက်ကို select ပေးပါ
+apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py,Latest Age,နောက်ဆုံးရခေတ်
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js,Transfer Material to Supplier,ပေးသွင်းဖို့ပစ္စည်းလွှဲပြောင်း
 apps/erpnext/erpnext/hr/report/loan_repayment/loan_repayment.py,EMI,EMI
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py,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
@@ -5881,7 +5897,6 @@
 apps/erpnext/erpnext/hr/doctype/employee_benefit_application/employee_benefit_application.py,"An amount of {0} already claimed for the component {1},\
 						 set the amount equal or greater than {2}","{0} တစ်ခုငွေပမာဏထားပြီးအစိတ်အပိုင်း {1}, \ {2} ထက်တန်းတူသို့မဟုတ် သာ. ကွီးမွတျပမာဏကိုသတ်မှတ်ထားများအတွက်အခိုင်အမာ"
 DocType: Shipping Rule,Shipping Rule Conditions,သဘောင်္တင်ခ Rule စည်းကမ်းချက်များ
-DocType: Purchase Invoice,Export Type,ပို့ကုန်အမျိုးအစား
 DocType: Salary Slip Loan,Salary Slip Loan,လစာစလစ်ဖြတ်ပိုင်းပုံစံချေးငွေ
 DocType: BOM Update Tool,The new BOM after replacement,အစားထိုးပြီးနောက်အသစ် BOM
 ,Point of Sale,ရောင်းမည်၏ပွိုင့်
@@ -6003,7 +6018,6 @@
 DocType: Purchase Order Item,Blanket Order Rate,စောင်အမိန့်နှုန်း
 ,Customer Ledger Summary,ဖောက်သည် Ledger အကျဉ်းချုပ်
 apps/erpnext/erpnext/hooks.py,Certification,လက်မှတ်ပေးခြင်း
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js,Are you sure you want to make debit note?,သငျသညျ debit မှတ်ချက်ဖြစ်စေလိုတာသေချာလား?
 DocType: Bank Guarantee,Clauses and Conditions,clauses နှင့်အခြေအနေများ
 DocType: Serial No,Creation Document Type,ဖန်ဆင်းခြင်း Document ဖိုင် Type
 DocType: Amazon MWS Settings,ES,ES
@@ -6041,8 +6055,6 @@
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py,Financial Services,ဘဏ္ဍာရေးန်ဆောင်မှုများ
 DocType: Student Sibling,Student ID,ကျောင်းသား ID ကို
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.js,For Quantity must be greater than zero,အရေအတွက်အဘို့အသုညထက်ကြီးမြတ်သူဖြစ်ရမည်
-apps/erpnext/erpnext/hr/doctype/employee_transfer/employee_transfer.py,"Please delete the Employee <a href=""#Form/Employee/{0}"">{0}</a>\
-					to cancel this document","အဆိုပါထမ်း delete ကျေးဇူးပြု. <a href=""#Form/Employee/{0}"">{0}</a> ဤစာရွက်စာတမ်းဖျက်သိမ်းရန် \"
 apps/erpnext/erpnext/config/projects.py,Types of activities for Time Logs,အချိန်မှတ်တမ်းများအဘို့အလှုပ်ရှားမှုများအမျိုးအစားများ
 DocType: Opening Invoice Creation Tool,Sales,အရောင်း
 DocType: Stock Entry Detail,Basic Amount,အခြေခံပညာပမာဏ
@@ -6121,6 +6133,7 @@
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py,Print and Stationery,ပုံနှိပ်နှင့်စာရေးကိရိယာ
 DocType: Stock Settings,Show Barcode Field,Show ကိုဘားကုဒ်ဖျော်ဖြေမှု
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js,Send Supplier Emails,ပေးသွင်းထားတဲ့အီးမေးလ်ပို့ပါ
+DocType: Asset Movement,ACC-ASM-.YYYY.-,ACC-ASM-.YYYY.-
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py,"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
 apps/erpnext/erpnext/hr/doctype/employee_onboarding/employee_onboarding.py,Submit this to create the Employee record,အဆိုပါထမ်းစံချိန်ကိုဖန်တီးရန်ဒီ Submit
@@ -6201,7 +6214,6 @@
 DocType: Sales Team,Contact No.,ဆက်သွယ်ရန်အမှတ်
 apps/erpnext/erpnext/templates/includes/cart/cart_address.html,Billing Address is same as Shipping Address,ငွေတောင်းခံလိပ်စာသင်္ဘောလိပ်စာအဖြစ်အတူတူပင်ဖြစ်ပါသည်
 DocType: Bank Reconciliation,Payment Entries,ငွေပေးချေမှုရမည့် Entries
-apps/erpnext/erpnext/erpnext_integrations/doctype/shopify_settings/shopify_settings.py,Access token or Shopify URL missing,Access ကိုတိုကင်နံပါတ်သို့မဟုတ် Shopify URL ကိုပျောက်ဆုံး
 DocType: Location,Latitude,လတီ္တတွဒ်
 DocType: Work Order,Scrap Warehouse,အပိုင်းအစဂိုဒေါင်
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py,"Warehouse required at Row No {0}, please set default warehouse for the item {1} for the company {2}","Row အဘယ်သူမျှမ {0}, {2} ကုမ္ပဏီအတွက်ပစ္စည်း {1} များအတွက် default အဂိုဒေါင် set ကျေးဇူးပြုပြီးမှာလိုအပ်ဂိုဒေါင်"
@@ -6246,7 +6258,6 @@
 DocType: Job Offer Term,Value / Description,Value တစ်ခု / ဖော်ပြချက်များ
 apps/erpnext/erpnext/controllers/accounts_controller.py,"Row #{0}: Asset {1} cannot be submitted, it is already {2}","အတန်း # {0}: ပိုင်ဆိုင်မှု {1} တင်သွင်းမရနိုငျ, က {2} ပြီးသားဖြစ်ပါတယ်"
 DocType: Tax Rule,Billing Country,ငွေတောင်းခံနိုင်ငံ
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js,Are you sure you want to make credit note?,သငျသညျခရက်ဒစ်မှတ်ချက်ဖြစ်စေလိုတာသေချာလား?
 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,Debit and Credit not equal for {0} #{1}. Difference is {2}.,{0} # {1} တန်းတူမ debit နှင့် Credit ။ ခြားနားချက် {2} ဖြစ်ပါတယ်။
@@ -6371,6 +6382,7 @@
 DocType: Purchase Invoice,Taxes and Charges Added,အခွန်နှင့်စွပ်စွဲချက် Added
 apps/erpnext/erpnext/assets/doctype/asset/asset.py,Depreciation Row {0}: Next Depreciation Date cannot be before Available-for-use Date,တန်ဖိုးလျော့ Row {0}: Next ကိုတန်ဖိုးနေ့စွဲရှိနိုင်-for-အသုံးပြုမှုနေ့စွဲမတိုင်မီမဖွစျနိုငျ
 ,Sales Funnel,အရောင်းကတော့
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Item Code &gt; Item Group &gt; Brand,item Code ကို&gt; item Group မှ&gt; အမှတ်တံဆိပ်
 apps/erpnext/erpnext/setup/doctype/company/company.py,Abbreviation is mandatory,အတိုကောက်မဖြစ်မနေဖြစ်ပါသည်
 DocType: Project,Task Progress,task ကိုတိုးတက်ရေးပါတီ
 apps/erpnext/erpnext/templates/includes/navbar/navbar_items.html,Cart,လှည်း
@@ -6616,6 +6628,7 @@
 DocType: Employee Grade,Employee Grade,ဝန်ထမ်းအဆင့်
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py,Piecework,Piecework
 DocType: GSTR 3B Report,June,ဇွန်လ
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Supplier &gt; Supplier Type,ပေးသွင်း&gt; ပေးသွင်းအမျိုးအစား
 DocType: Share Balance,From No,အဘယ်သူမျှမကနေ
 DocType: Shift Type,Early Exit Grace Period,အစောပိုင်း Exit ကိုကျေးဇူးတော်ရှိစေသတည်းကာလ
 DocType: Task,Actual Time (in Hours),(နာရီအတွက်) အမှန်တကယ်အချိန်
@@ -6902,6 +6915,7 @@
 DocType: Warehouse,Warehouse Name,ဂိုဒေါင်အမည်
 DocType: Naming Series,Select Transaction,Transaction ကိုရွေးပါ
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py,Please enter Approving Role or Approving User,အခန်းက္ပအတည်ပြုပေးသောသို့မဟုတ်အသုံးပြုသူအတည်ပြုပေးသောရိုက်ထည့်ပေးပါ
+apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.py,UOM Conversion factor ({0} -&gt; {1}) not found for item: {2},UOM ကူးပြောင်းခြင်းအချက် ({0} -&gt; {1}) ကို item ဘို့မတွေ့ရှိ: {2}
 apps/erpnext/erpnext/support/doctype/service_level_agreement/service_level_agreement.py,Service Level Agreement with Entity Type {0} and Entity {1} already exists.,Entity အမျိုးအစား {0} နှင့် Entity {1} ပြီးသားတည်ရှိနှင့်အတူဝန်ဆောင်မှုအဆင့်သဘောတူညီချက်ကို။
 DocType: Journal Entry,Write Off Entry,Entry ပိတ်ရေးထား
 DocType: BOM,Rate Of Materials Based On,ပစ္စည်းများအခြေတွင်အမျိုးမျိုး rate
@@ -7093,6 +7107,7 @@
 DocType: Quality Inspection Reading,Quality Inspection Reading,အရည်အသွေးအစစ်ဆေးရေးစာဖတ်ခြင်း
 apps/erpnext/erpnext/stock/doctype/stock_settings/stock_settings.py,`Freeze Stocks Older Than` should be smaller than %d days.,`Freeze စတော့စျေးကွက် Older Than`%d ရက်ထက်နည်းသင့်သည်။
 DocType: Tax Rule,Purchase Tax Template,ဝယ်ယူခွန် Template ကို
+apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py,Earliest Age,အစောဆုံးခေတ်
 apps/erpnext/erpnext/utilities/user_progress.py,Set a sales goal you'd like to achieve for your company.,သင်သည်သင်၏ကုမ္ပဏီအတွက်အောင်မြင်ရန်ချင်ပါတယ်အရောင်းရည်မှန်းချက်သတ်မှတ်မည်။
 DocType: Quality Goal,Revision,ပြန်လည်စစ်ဆေးကြည့်ရှုခြင်း
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js,Healthcare Services,ကျန်းမာရေးစောင့်ရှောက်မှုန်ဆောင်မှုများ
@@ -7136,6 +7151,7 @@
 apps/erpnext/erpnext/healthcare/doctype/patient_encounter/patient_encounter.js,Schedule Discharge,ဇယား discharge
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py,Cheques and Deposits incorrectly cleared,မှားယွင်းစွာရှင်းလင်း Cheques နှင့်စာရင်း
 DocType: Homepage Section Card,Homepage Section Card,မူလစာမျက်နှာပုဒ်မ Card ကို
+,Amount To Be Billed,ငွေတောင်းခံထားမှုခံရရန်ငွေပမာဏ
 apps/erpnext/erpnext/accounts/doctype/account/account.py,Account {0}: You can not assign itself as parent account,အကောင့်ကို {0}: သင့်မိဘအကောင့်ကိုတခုအဖြစ်သတ်မှတ်လို့မရပါဘူး
 DocType: Purchase Invoice Item,Price List Rate,စျေးနှုန်း List ကို Rate
 apps/erpnext/erpnext/utilities/activation.py,Create customer quotes,ဖောက်သည်ကိုးကား Create
@@ -7188,6 +7204,7 @@
 DocType: Supplier Scorecard Criteria,Supplier Scorecard Criteria,ပေးသွင်း Scorecard လိုအပ်ချက်
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py,Please select Start Date and End Date for Item {0},Item {0} သည် Start ကိုနေ့စွဲနဲ့ End Date ကို select လုပ်ပါ ကျေးဇူးပြု.
 DocType: Maintenance Schedule,MAT-MSH-.YYYY.-,MAT-MSH-.YYYY.-
+,Amount to Receive,လက်ခံမှငွေပမာဏ
 apps/erpnext/erpnext/education/doctype/student_group_creation_tool/student_group_creation_tool.py,Course is mandatory in row {0},သင်တန်းအတန်း {0} အတွက်မဖြစ်မနေဖြစ်ပါသည်
 apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py,From date can not be greater than than To date,နေ့စွဲကနေယနေ့အထိထက်ထက် သာ. ကြီးမြတ်မဖွစျနိုငျ
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py,To date cannot be before from date,ယနေ့အထိသည့်နေ့ရက်မှခင်မဖွစျနိုငျ
@@ -7438,7 +7455,6 @@
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js,BOM and Manufacturing Quantity are required,BOM နှင့်ကုန်ထုတ်လုပ်မှုပမာဏလိုအပ်သည်
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js,Ageing Range 2,Ageing Range 2
 DocType: SG Creation Tool Course,Max Strength,မက်စ်အစွမ်းသတ္တိ
-apps/erpnext/erpnext/accounts/doctype/account/account.py,"Account {0} already exists in child company {1}. The following fields have different values, they should be same:<ul><li>{2}</li></ul>","အကောင့် {0} ပြီးသားကလေးကကုမ္ပဏီ {1} ရှိ။ အောက်ပါကွက်လပ်များကိုကွဲပြားခြားနားသောတန်ဖိုးများရှိသည်, သူတို့အတူတူပင်ဖြစ်သင့်သည်: <ul><li> {2} </li></ul>"
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py,Installing presets,ရလာဒ်ကဒိ Installing
 DocType: Fee Schedule,EDU-FSH-.YYYY.-,EDU တွင်-FSH-.YYYY.-
 apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js,No Delivery Note selected for Customer {},ဖောက်သည်များအတွက်မရွေး Delivery မှတ်ချက် {}
@@ -7650,6 +7666,7 @@
 DocType: Delivery Note,Print Without Amount,ငွေပမာဏမရှိရင် Print
 apps/erpnext/erpnext/accounts/report/asset_depreciation_ledger/asset_depreciation_ledger.py,Depreciation Date,တန်ဖိုးနေ့စွဲ
 ,Work Orders in Progress,တိုးတက်မှုအတွက်အလုပ်အမိန့်
+DocType: Customer Credit Limit,Bypass Credit Limit Check,Bypass လုပ်ရခရက်ဒစ်ကန့်သတ်စစ်ဆေးမှု
 DocType: Issue,Support Team,Support Team သို့
 apps/erpnext/erpnext/stock/report/batch_item_expiry_status/batch_item_expiry_status.py,Expiry (In Days),(နေ့ရက်များခုနှစ်တွင်) သက်တမ်းကုန်ဆုံး
 DocType: Appraisal,Total Score (Out of 5),(5 ထဲက) စုစုပေါင်းရမှတ်
@@ -7836,6 +7853,7 @@
 DocType: Sales Invoice,Customer GSTIN,ဖောက်သည် GSTIN
 DocType: Crop Cycle,List of diseases detected on the field. When selected it'll automatically add a list of tasks to deal with the disease ,လယ်ပြင်ပေါ်တွင်ရှာဖွေတွေ့ရှိရောဂါများစာရင်း။ မရွေးသည့်အခါအလိုအလျောက်ရောဂါနှင့်အတူကိုင်တွယ်ရန်အလုပ်များကိုစာရင်းတစ်ခုထပ်ထည့်ပါမယ်
 apps/erpnext/erpnext/manufacturing/page/bom_comparison_tool/bom_comparison_tool.js,BOM 1,BOM 1
+apps/erpnext/erpnext/assets/report/fixed_asset_register/fixed_asset_register.py,Asset Id,ပိုင်ဆိုင်မှု Id
 apps/erpnext/erpnext/healthcare/doctype/healthcare_service_unit/healthcare_service_unit.js,This is a root healthcare service unit and cannot be edited.,ဒါကအမြစ်ကျန်းမာရေးစောင့်ရှောက်မှုဝန်ဆောင်မှုယူနစ်သည်နှင့်တည်းဖြတ်မရနိုင်ပါ။
 DocType: Asset Repair,Repair Status,ပြုပြင်ရေးအခြေအနေ
 apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.js,"Requested Qty: Quantity requested for purchase, but not ordered.",အရည်အတွက်တောင်းဆိုထားသော: ပမာဏဝယ်ယူဘို့မေတ္တာရပ်ခံပေမယ့်အမိန့်မဟုတ်ပါဘူး။
diff --git a/erpnext/translations/nl.csv b/erpnext/translations/nl.csv
index 5ec7766..ced3454 100644
--- a/erpnext/translations/nl.csv
+++ b/erpnext/translations/nl.csv
@@ -289,7 +289,6 @@
 DocType: Loan,Repay Over Number of Periods,Terug te betalen gedurende een aantal perioden
 apps/erpnext/erpnext/manufacturing/report/bom_stock_report/bom_stock_report.py,Quantity to Produce can not be less than Zero,Te produceren hoeveelheid mag niet minder zijn dan nul
 DocType: Stock Entry,Additional Costs,Bijkomende kosten
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Customer &gt; Customer Group &gt; Territory,Klant&gt; Klantengroep&gt; Gebied
 apps/erpnext/erpnext/accounts/doctype/account/account.py,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
@@ -587,6 +586,7 @@
 DocType: Healthcare Settings,Create documents for sample collection,Maak documenten voor het verzamelen van samples
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py,Payment against {0} {1} cannot be greater than Outstanding Amount {2},Betaling tegen {0} {1} kan niet groter zijn dan openstaande bedrag te zijn {2}
 apps/erpnext/erpnext/patches/v11_0/add_healthcare_service_unit_tree_root.py,All Healthcare Service Units,Alle Healthcare Service Units
+apps/erpnext/erpnext/setup/default_energy_point_rules.py,On Converting Opportunity,Over het converteren van kansen
 DocType: Bank Account,Address HTML,Adres HTML
 DocType: Lead,Mobile No.,Mobiel nummer
 apps/erpnext/erpnext/selling/doctype/pos_closing_voucher/closing_voucher_details.html,Mode of Payments,Wijze van betalingen
@@ -651,7 +651,6 @@
 DocType: Accounting Dimension,Dimension Name,Dimensienaam
 apps/erpnext/erpnext/healthcare/setup.py,Resistant,Resistant
 apps/erpnext/erpnext/hotels/doctype/hotel_room_reservation/hotel_room_reservation.py,Please set Hotel Room Rate on {},Stel de hotelkamerprijs in op {}
-apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py,Please setup numbering series for Attendance via Setup &gt; Numbering Series,Stel nummeringseries in voor Aanwezigheid via Setup&gt; Nummeringsseries
 DocType: Journal Entry,Multi Currency,Valuta
 DocType: Bank Statement Transaction Invoice Item,Invoice Type,Factuur Type
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py,Valid from date must be less than valid upto date,Geldig vanaf datum moet kleiner zijn dan geldig tot datum
@@ -767,6 +766,7 @@
 apps/erpnext/erpnext/accounts/page/pos/pos.js,Create a new Customer,Maak een nieuwe klant
 apps/erpnext/erpnext/non_profit/report/expiring_memberships/expiring_memberships.py,Expiring On,Vervalt op
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,"If multiple Pricing Rules continue to prevail, users are asked to set Priority manually to resolve conflict.","Als er meerdere prijzen Regels blijven die gelden, worden gebruikers gevraagd om Prioriteit handmatig instellen om conflicten op te lossen."
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js,Purchase Return,Inkoop Retour
 apps/erpnext/erpnext/utilities/activation.py,Create Purchase Orders,Maak Bestellingen
 ,Purchase Register,Inkoop Register
 apps/erpnext/erpnext/healthcare/doctype/patient/patient.py,Patient not found,Patiënt niet gevonden
@@ -782,7 +782,6 @@
 DocType: Location,Area UOM,UOM van het gebied
 apps/erpnext/erpnext/manufacturing/doctype/workstation/workstation.py,Workstation is closed on the following dates as per Holiday List: {0},Werkstation is gesloten op de volgende data als per Holiday Lijst: {0}
 apps/erpnext/erpnext/selling/page/sales_funnel/sales_funnel.py,Opportunities,Kansen
-apps/erpnext/erpnext/www/all-products/index.html,Clear filters,Filters wissen
 DocType: Lab Test Template,Single,Enkele
 DocType: Compensatory Leave Request,Work From Date,Werk vanaf datum
 DocType: Salary Slip,Total Loan Repayment,Totaal aflossing van de lening
@@ -826,6 +825,7 @@
 apps/erpnext/erpnext/education/doctype/program_enrollment_tool/program_enrollment_tool.py,Mandatory field - Academic Year,Verplicht veld - Academiejaar
 apps/erpnext/erpnext/education/doctype/program_enrollment_tool/program_enrollment_tool.py,Mandatory field - Academic Year,Verplicht veld - Academiejaar
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py,{0} {1} is not associated with {2} {3},{0} {1} is niet gekoppeld aan {2} {3}
+DocType: Opportunity,Converted By,Geconverteerd door
 apps/erpnext/erpnext/public/js/hub/components/ReviewArea.vue,You need to login as a Marketplace User before you can add any reviews.,U moet inloggen als Marketplace-gebruiker voordat u beoordelingen kunt toevoegen.
 apps/erpnext/erpnext/manufacturing/doctype/job_card/job_card.py,Row {0} : Operation is required against the raw material item {1},Rij {0}: bewerking vereist ten opzichte van het artikel met de grondstof {1}
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py,Please set default payable account for the company {0},Stel alsjeblieft de standaard betaalbare rekening voor het bedrijf in {0}
@@ -852,6 +852,8 @@
 DocType: Sales Invoice,Total Qty,Totaal Aantal
 apps/erpnext/erpnext/education/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py,Guardian2 Email ID,Guardian2 Email ID
 apps/erpnext/erpnext/education/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py,Guardian2 Email ID,Guardian2 Email ID
+apps/erpnext/erpnext/hr/doctype/employee_transfer/employee_transfer.py,"Please delete the Employee <a href=""#Form/Employee/{0}"">{0}</a>\
+					to cancel this document","Verwijder de werknemer <a href=""#Form/Employee/{0}"">{0}</a> \ om dit document te annuleren"
 DocType: Item,Show in Website (Variant),Show in Website (Variant)
 DocType: Employee,Health Concerns,Gezondheidszorgen
 DocType: Payroll Entry,Select Payroll Period,Selecteer Payroll Periode
@@ -912,7 +914,6 @@
 DocType: Codification Table,Codification Table,Codificatie Tabel
 DocType: Timesheet Detail,Hrs,hrs
 apps/erpnext/erpnext/manufacturing/page/bom_comparison_tool/bom_comparison_tool.js,Changes in {0},Veranderingen in {0}
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js,Please select Company,Selecteer Company
 DocType: Employee Skill,Employee Skill,Vaardigheden van werknemers
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.js,Difference Account,Verschillenrekening
 DocType: Pricing Rule,Discount on Other Item,Korting op ander artikel
@@ -981,6 +982,7 @@
 DocType: BOM,Operating Cost,Operationele kosten
 DocType: Crop,Produced Items,Geproduceerde items
 DocType: Bank Statement Transaction Entry,Match Transaction to Invoices,Overeenstemmende transactie met facturen
+apps/erpnext/erpnext/erpnext_integrations/exotel_integration.py,Error in Exotel incoming call,Fout in inkomende oproep van Exotel
 DocType: Sales Order Item,Gross Profit,Bruto Winst
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js,Unblock Invoice,Deblokkering factuur
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py,Increment cannot be 0,Toename kan niet worden 0
@@ -1196,6 +1198,7 @@
 DocType: Activity Cost,Activity Type,Activiteit Type
 DocType: Request for Quotation,For individual supplier,Voor individuele leverancier
 DocType: BOM Operation,Base Hour Rate(Company Currency),Base Uur Rate (Company Munt)
+,Qty To Be Billed,Te factureren hoeveelheid
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py,Delivered Amount,Afgeleverd Bedrag
 apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.js,Reserved Qty for Production: Raw materials quantity to make manufacturing items.,Gereserveerde hoeveelheid voor productie: Hoeveelheid grondstoffen om productieartikelen te maken.
 DocType: Loyalty Point Entry Redemption,Redemption Date,Verlossingsdatum
@@ -1316,7 +1319,7 @@
 apps/erpnext/erpnext/education/doctype/student_group/student_group.py,Please select Program,Selecteer alsjeblieft Programma
 apps/erpnext/erpnext/education/doctype/student_group/student_group.py,Please select Program,Selecteer alsjeblieft Programma
 DocType: Project,Estimated Cost,Geschatte kosten
-DocType: Request for Quotation,Link to material requests,Koppeling naar materiaal aanvragen
+DocType: Supplier Quotation,Link to material requests,Koppeling naar materiaal aanvragen
 apps/erpnext/erpnext/public/js/hub/pages/Publish.vue,Publish,Publiceren
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py,Aerospace,Ruimtevaart
 ,Fichier des Ecritures Comptables [FEC],Fichier des Ecritures Comptables [FEC]
@@ -1329,6 +1332,7 @@
 apps/erpnext/erpnext/utilities/transaction_base.py,Invalid Posting Time,Ongeldige boekingstijd
 DocType: Salary Component,Condition and Formula,Conditie en formule
 DocType: Lead,Campaign Name,Campagnenaam
+apps/erpnext/erpnext/setup/default_energy_point_rules.py,On Task Completion,Bij voltooiing van de taak
 apps/erpnext/erpnext/hr/doctype/compensatory_leave_request/compensatory_leave_request.py,There is no leave period in between {0} and {1},Er is geen verlofperiode tussen {0} en {1}
 DocType: Fee Validity,Healthcare Practitioner,Gezondheidszorg beoefenaar
 DocType: Hotel Room,Capacity,Capaciteit
@@ -1692,7 +1696,6 @@
 DocType: Quality Feedback Template,Quality Feedback Template,Kwaliteitsfeedbacksjabloon
 apps/erpnext/erpnext/config/education.py,LMS Activity,LMS-activiteit
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py,Internet Publishing,internet Publishing
-DocType: Prescription Duration,Number,Aantal
 apps/erpnext/erpnext/accounts/doctype/opening_invoice_creation_tool/opening_invoice_creation_tool.js,Creating {0} Invoice,{0} factuur aanmaken
 DocType: Medical Code,Medical Code Standard,Medische Code Standaard
 DocType: Soil Texture,Clay Composition (%),Kleisamenstelling (%)
@@ -1767,6 +1770,7 @@
 DocType: Support Settings,Get Started Sections,Aan de slag Secties
 DocType: Lead,CRM-LEAD-.YYYY.-,CRM-LEAD-.YYYY.-
 DocType: Invoice Discounting,Sanctioned,Sanctioned
+,Base Amount,Basis aantal
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.js,Total Contribution Amount: {0},Totale bijdragebedrag: {0}
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py,Row #{0}: Please specify Serial No for Item {1},Rij #{0}: Voer serienummer in voor artikel {1}
 DocType: Payroll Entry,Salary Slips Submitted,Salaris ingeleverd
@@ -1987,6 +1991,7 @@
 apps/erpnext/erpnext/utilities/user_progress.py,List a few of your suppliers. They could be organizations or individuals.,Lijst een paar van uw leveranciers . Ze kunnen organisaties of personen .
 DocType: Accounting Dimension,Dimension Defaults,Standaard dimensies
 apps/erpnext/erpnext/crm/report/prospects_engaged_but_not_converted/prospects_engaged_but_not_converted.js,Minimum Lead Age (Days),Minimum leeftijd (dagen)
+apps/erpnext/erpnext/assets/report/fixed_asset_register/fixed_asset_register.py,Available For Use Date,Beschikbaar voor gebruik datum
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py,All BOMs,alle stuklijsten
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js,Create Inter Company Journal Entry,Creëer Inter Company Journaalboeking
 DocType: Company,Parent Company,Moeder bedrijf
@@ -2051,6 +2056,7 @@
 ,IRS 1099,IRS 1099
 DocType: Salary Slip,Leave Without Pay,Onbetaald verlof
 DocType: Payment Request,Outward,naar buiten
+apps/erpnext/erpnext/setup/default_energy_point_rules.py,On {0} Creation,Bij {0} Creatie
 apps/erpnext/erpnext/regional/doctype/gstr_3b_report/gstr_3b_report.html,State/UT Tax,Staat / UT belasting
 ,Trial Balance for Party,Trial Balance voor Party
 ,Gross and Net Profit Report,Bruto- en nettowinstrapport
@@ -2168,6 +2174,7 @@
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js,Make Stock Entry,Voorraad invoeren
 DocType: Hotel Room Reservation,Hotel Reservation User,Hotelreservering Gebruiker
 apps/erpnext/erpnext/projects/doctype/project/project.js,Set Status,Stel status in
+apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py,Please setup numbering series for Attendance via Setup &gt; Numbering Series,Stel nummeringseries in voor Aanwezigheid via Setup&gt; Nummeringsseries
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py,Please select prefix first,Selecteer eerst een voorvoegsel
 DocType: Contract,Fulfilment Deadline,Uiterste nalevingstermijn
 apps/erpnext/erpnext/public/js/hub/pages/Home.vue,Near you,Dichtbij jou
@@ -2183,6 +2190,7 @@
 DocType: Announcement,All Students,Alle studenten
 apps/erpnext/erpnext/assets/doctype/asset/asset.py,Item {0} must be a non-stock item,Item {0} moet een niet-voorraad artikel zijn
 apps/erpnext/erpnext/stock/doctype/batch/batch.js,View Ledger,Bekijk Grootboek
+DocType: Cost Center,Lft,lft
 DocType: Grading Scale,Intervals,intervallen
 DocType: Bank Statement Transaction Entry,Reconciled Transactions,Verzoeningstransacties
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py,Earliest,Vroegst
@@ -2298,6 +2306,7 @@
 apps/erpnext/erpnext/hr/doctype/employee_benefit_application/employee_benefit_application.py,As per your assigned Salary Structure you cannot apply for benefits,Vanaf uw toegewezen Salarisstructuur kunt u geen voordelen aanvragen
 apps/erpnext/erpnext/stock/doctype/item/item.py,Website Image should be a public file or website URL,Website Afbeelding moet een openbaar bestand of website URL zijn
 DocType: Purchase Invoice Item,BOM,BOM
+apps/erpnext/erpnext/stock/doctype/item/item.py,Duplicate entry in Manufacturers table,Dubbele invoer in de tabel Fabrikanten
 apps/erpnext/erpnext/setup/doctype/item_group/item_group.js,This is a root item group and cannot be edited.,Dit is een basis artikelgroep en kan niet worden bewerkt .
 apps/erpnext/erpnext/accounts/doctype/account/account.js,Merge,samensmelten
 DocType: Journal Entry Account,Purchase Order,Inkooporder
@@ -2443,7 +2452,6 @@
 DocType: Asset,Depreciation Schedules,afschrijvingen Roosters
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.js,Create Sales Invoice,Creëer verkoopfactuur
 apps/erpnext/erpnext/regional/doctype/gstr_3b_report/gstr_3b_report.html,Ineligible ITC,Niet in aanmerking komende ITC
-apps/erpnext/erpnext/erpnext_integrations/doctype/shopify_settings/shopify_settings.py,"Support for public app is deprecated. Please setup private app, for more details refer user manual",Ondersteuning voor openbare app is verouderd. Stel een persoonlijke app in. Raadpleeg de handleiding voor meer informatie
 DocType: Task,Dependent Tasks,Afhankelijke taken
 apps/erpnext/erpnext/regional/report/gstr_1/gstr_1.py,Following accounts might be selected in GST Settings:,Volgende accounts kunnen worden geselecteerd in GST-instellingen:
 apps/erpnext/erpnext/manufacturing/report/bom_stock_report/bom_stock_report.js,Quantity to Produce,Te produceren hoeveelheid
@@ -2696,6 +2704,7 @@
 DocType: Water Analysis,Container,houder
 apps/erpnext/erpnext/regional/report/gstr_1/gstr_1.py,Please set valid GSTIN No. in Company Address,Stel een geldig GSTIN-nummer in het bedrijfsadres in
 apps/erpnext/erpnext/education/utils.py,Student {0} - {1} appears Multiple times in row {2} & {3},Student {0} - {1} meerdere keren in rij {2} en {3}
+apps/erpnext/erpnext/selling/doctype/customer/customer.py,Following fields are mandatory to create address:,De volgende velden zijn verplicht om een adres te maken:
 DocType: Item Alternative,Two-way,Tweezijdig
 DocType: Item,Manufacturers,fabrikanten
 apps/erpnext/erpnext/accounts/deferred_revenue.py,Error while processing deferred accounting for {0},Fout bij het verwerken van uitgestelde boekhouding voor {0}
@@ -2771,9 +2780,9 @@
 DocType: Employee,HR-EMP-,HR-EMP
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py,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: Quality Meeting Minutes,Quality Meeting Minutes,Kwaliteitsvergaderingsnotulen
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Supplier &gt; Supplier Type,Leverancier&gt; Type leverancier
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py,Employee Referral,Employee Referral
 DocType: Student Group,Set 0 for no limit,Stel 0 voor geen limiet
+DocType: Cost Center,rgt,RGT
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py,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.
 DocType: Customer,Primary Address and Contact Detail,Primaire adres en contactgegevens
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.js,Resend Payment Email,E-mail opnieuw te verzenden Betaling
@@ -2883,7 +2892,6 @@
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py,Against Supplier Invoice {0} dated {1},Tegen Leverancier Factuur {0} gedateerd {1}
 DocType: Customer,Default Price List,Standaard Prijslijst
 apps/erpnext/erpnext/assets/doctype/asset/asset.py,Asset Movement record {0} created,Asset bewegingsartikel {0} aangemaakt
-apps/erpnext/erpnext/utilities/page/leaderboard/leaderboard.js,No items found.,Geen items gevonden.
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py,You cannot delete Fiscal Year {0}. Fiscal Year {0} is set as default in Global Settings,Je kunt niet verwijderen boekjaar {0}. Boekjaar {0} is ingesteld als standaard in Global Settings
 DocType: Share Transfer,Equity/Liability Account,Aandelen / aansprakelijkheidsrekening
 apps/erpnext/erpnext/setup/doctype/customer_group/customer_group.py,A customer with the same name already exists,Er bestaat al een klant met dezelfde naam
@@ -2899,6 +2907,7 @@
 apps/erpnext/erpnext/selling/doctype/customer/customer.py,Credit limit has been crossed for customer {0} ({1}/{2}),Kredietlimiet is overschreden voor klant {0} ({1} / {2})
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py,Customer required for 'Customerwise Discount',Klant nodig voor 'Klantgebaseerde Korting'
 apps/erpnext/erpnext/config/accounting.py,Update bank payment dates with journals.,Bijwerken bank betaaldata met journaalposten
+,Billed Qty,Gefactureerd aantal
 apps/erpnext/erpnext/stock/doctype/item/item_dashboard.py,Pricing,pricing
 DocType: Employee,Attendance Device ID (Biometric/RF tag ID),Aanwezigheidsapparaat-ID (biometrische / RF-tag-ID)
 DocType: Quotation,Term Details,Voorwaarde Details
@@ -2922,6 +2931,7 @@
 DocType: Share Transfer,Asset Account,ActivAccount
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js,New release date should be in the future,Nieuwe releasedatum zou in de toekomst moeten liggen
 DocType: Purchase Invoice,End date of current invoice's period,Einddatum van de huidige factuurperiode
+apps/erpnext/erpnext/hr/doctype/employee/employee.py,Please setup Employee Naming System in Human Resource &gt; HR Settings,Stel het naamgevingssysteem voor werknemers in via Human Resource&gt; HR-instellingen
 DocType: Lab Test,Technician Name,Technicus Naam
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py,"Cannot ensure delivery by Serial No as \
 					Item {0} is added with and without Ensure Delivery by \
@@ -2929,6 +2939,7 @@
 DocType: Accounts Settings,Unlink Payment on Cancellation of Invoice,Ontkoppelen Betaling bij annulering van de factuur
 DocType: Bank Reconciliation,From Date,Van Datum
 apps/erpnext/erpnext/hr/doctype/vehicle_log/vehicle_log.py,Current Odometer reading entered should be greater than initial Vehicle Odometer {0},Huidige kilometerstand ingevoerd moet groter zijn dan de initiële kilometerstand van het voertuig zijn {0}
+,Purchase Order Items To Be Received or Billed,Aankooporderartikelen die moeten worden ontvangen of gefactureerd
 DocType: Restaurant Reservation,No Show,Geen voorstelling
 apps/erpnext/erpnext/regional/india/utils.py,You must be a registered supplier to generate e-Way Bill,U moet een geregistreerde leverancier zijn om e-Way Bill te genereren
 DocType: Shipping Rule Country,Shipping Rule Country,Verzenden Regel Land
@@ -2971,6 +2982,7 @@
 apps/erpnext/erpnext/templates/generators/item/item_add_to_cart.html,View in Cart,Bekijk in winkelwagen
 DocType: Employee Checkin,Shift Actual Start,Shift werkelijke start
 DocType: Tally Migration,Is Day Book Data Imported,Worden dagboekgegevens geïmporteerd
+,Purchase Order Items To Be Received or Billed1,In te kopen of te factureren artikelen 1
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py,Marketing Expenses,Marketingkosten
 apps/erpnext/erpnext/stock/doctype/pick_list/pick_list.py,{0} units of {1} is not available.,{0} eenheden van {1} is niet beschikbaar.
 ,Item Shortage Report,Artikel Tekort Rapport
@@ -3199,7 +3211,6 @@
 apps/erpnext/erpnext/public/js/call_popup/call_popup.js,View all issues from {0},Bekijk alle problemen van {0}
 DocType: Quality Inspection,MAT-QA-.YYYY.-,MAT-QA-.YYYY.-
 DocType: Quality Meeting Table,Quality Meeting Table,Kwaliteit vergadertafel
-apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,Stel Naming Series in op {0} via Setup&gt; Instellingen&gt; Naming Series
 apps/erpnext/erpnext/templates/pages/help.html,Visit the forums,Bezoek de forums
 DocType: Student,Student Mobile Number,Student Mobile Number
 DocType: Item,Has Variants,Heeft Varianten
@@ -3343,6 +3354,7 @@
 DocType: Homepage Section,Section Cards,Sectiekaarten
 ,Campaign Efficiency,Campagne-efficiëntie
 DocType: Discussion,Discussion,Discussie
+apps/erpnext/erpnext/setup/default_energy_point_rules.py,On Sales Order Submission,Bij het verzenden van klantorders
 DocType: Bank Transaction,Transaction ID,Transactie ID
 DocType: Payroll Entry,Deduct Tax For Unsubmitted Tax Exemption Proof,Belastingaftrek voor niet-ingediende bewijs van belastingvrijstelling
 DocType: Volunteer,Anytime,Anytime
@@ -3350,7 +3362,6 @@
 DocType: Employee Tax Exemption Proof Submission,Employee Tax Exemption Proof Submission,Vrijstelling van werknemersbelasting Bewijsverzending
 DocType: Patient,Surgical History,Chirurgische Geschiedenis
 DocType: Bank Statement Settings Item,Mapped Header,Toegewezen koptekst
-apps/erpnext/erpnext/hr/doctype/employee/employee.py,Please setup Employee Naming System in Human Resource &gt; HR Settings,Stel het naamgevingssysteem voor werknemers in via Human Resource&gt; HR-instellingen
 DocType: Employee,Resignation Letter Date,Ontslagbrief Datum
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Pricing Rules are further filtered based on quantity.,Prijsbepalingsregels worden verder gefilterd op basis van aantal.
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py,Please set the Date Of Joining for employee {0},Stel de datum van aansluiting in voor werknemer {0}
@@ -3365,6 +3376,7 @@
 DocType: Bank Statement Settings,Mapped Items,Toegewezen items
 DocType: Amazon MWS Settings,IT,HET
 DocType: Chapter,Chapter,Hoofdstuk
+,Fixed Asset Register,Vaste-activaregister
 apps/erpnext/erpnext/utilities/user_progress.py,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,Select BOM and Qty for Production,Selecteer BOM en Aantal voor productie
@@ -3500,7 +3512,6 @@
 apps/erpnext/erpnext/templates/emails/reorder_item.html,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
 apps/erpnext/erpnext/controllers/accounts_controller.py,Account {0} is invalid. Account Currency must be {1},Account {0} is ongeldig. Account Valuta moet {1} zijn
 apps/erpnext/erpnext/hr/doctype/salary_structure_assignment/salary_structure_assignment.py,From Date {0} cannot be after employee's relieving Date {1},Vanaf datum {0} kan niet worden na ontlastingsdatum van medewerker {1}
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py,Debit Note {0} has been created automatically,Debetnota {0} is automatisch aangemaakt
 apps/erpnext/erpnext/accounts/doctype/payment_order/payment_order.js,Create Payment Entries,Creëer betalingsinvoer
 DocType: Supplier,Is Internal Supplier,Is interne leverancier
 DocType: Employee,Create User Permission,Maak gebruiker toestemming
@@ -4062,7 +4073,6 @@
 DocType: Project User,Project Status,Project Status
 DocType: UOM,Check this to disallow fractions. (for Nos),Aanvinken om delingen te verbieden.
 DocType: Student Admission Program,Naming Series (for Student Applicant),Naming Series (voor Student Aanvrager)
-apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.py,UOM Conversion factor ({0} -&gt; {1}) not found for item: {2},UOM-conversiefactor ({0} -&gt; {1}) niet gevonden voor item: {2}
 apps/erpnext/erpnext/hr/doctype/retention_bonus/retention_bonus.py,Bonus Payment Date cannot be a past date,Bonus Betalingsdatum kan geen datum in het verleden zijn
 DocType: Travel Request,Copy of Invitation/Announcement,Kopie van uitnodiging / aankondiging
 DocType: Practitioner Service Unit Schedule,Practitioner Service Unit Schedule,Practitioner Service Unit Schedule
@@ -4231,6 +4241,7 @@
 apps/erpnext/erpnext/utilities/user_progress.py,Setup Company,Setup Company
 ,Lab Test Report,Lab Test Report
 DocType: Employee Benefit Application,Employee Benefit Application,Employee Benefit Application
+apps/erpnext/erpnext/accounts/doctype/invoice_discounting/invoice_discounting.py,Row({0}): {1} is already discounted in {2},Rij ({0}): {1} is al verdisconteerd in {2}
 apps/erpnext/erpnext/hr/doctype/additional_salary/additional_salary.py,Additional Salary Component Exists.,Extra salariscomponent bestaat.
 DocType: Purchase Invoice,Unregistered,niet ingeschreven
 DocType: Student Applicant,Application Date,Application Date
@@ -4309,7 +4320,6 @@
 DocType: Journal Entry,Accounting Entries,Boekingen
 DocType: Job Card Time Log,Job Card Time Log,Tijdkaart taakkaart
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,"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;."
-apps/erpnext/erpnext/education/doctype/instructor/instructor.py,Please setup Instructor Naming System in Education &gt; Education Settings,Stel het naamsysteem voor instructeurs in Onderwijs&gt; Onderwijsinstellingen in
 DocType: Journal Entry,Paid Loan,Betaalde lening
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py,Duplicate Entry. Please check Authorization Rule {0},Dubbele invoer. Controleer Autorisatie Regel {0}
 DocType: Journal Entry Account,Reference Due Date,Referentie vervaldag
@@ -4326,7 +4336,6 @@
 apps/erpnext/erpnext/templates/pages/projects.html,No time sheets,Geen tijd sheets
 DocType: GoCardless Mandate,GoCardless Customer,GoCardless klant
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py,Leave Type {0} cannot be carry-forwarded,Verlaat Type {0} kan niet worden doorgestuurd dragen-
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Item Code &gt; Item Group &gt; Brand,Artikelcode&gt; Artikelgroep&gt; Merk
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py,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
 DocType: Leave Encashment,Payroll,Loonlijst
@@ -4442,7 +4451,6 @@
 DocType: Stock Ledger Entry,Actual Qty After Transaction,Werkelijke Aantal Na Transactie
 ,Pending SO Items For Purchase Request,In afwachting van Verkoop Artikelen voor Inkoopaanvraag
 apps/erpnext/erpnext/education/doctype/student_admission/student_admission.py,Student Admissions,studentenadministratie
-apps/erpnext/erpnext/accounts/party.py,{0} {1} is disabled,{0} {1} is uitgeschakeld
 DocType: Supplier,Billing Currency,Valuta
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py,Extra Large,Extra Groot
 DocType: Loan,Loan Application,Aanvraag voor een lening
@@ -4519,7 +4527,6 @@
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py,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/accounts/doctype/accounting_dimension/accounting_dimension.py,Creating Dimensions...,Dimensies maken ...
 apps/erpnext/erpnext/education/doctype/student_group_creation_tool/student_group_creation_tool.py,Student Group Name is mandatory in row {0},Student groepsnaam is verplicht in de rij {0}
-DocType: Customer Credit Limit,Bypass credit limit_check,Bypass credit limit_check
 DocType: Homepage,Products to be shown on website homepage,Producten die worden getoond op de website homepage
 DocType: HR Settings,Password Policy,Wachtwoord beleid
 apps/erpnext/erpnext/setup/doctype/customer_group/customer_group.js,This is a root customer group and cannot be edited.,Dit is een basis klantgroep en kan niet worden bewerkt .
@@ -4825,6 +4832,7 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py,Row {0}: Advance against Customer must be credit,Rij {0}: Advance tegen Klant moet krediet
 DocType: Quality Meeting,Quality Meeting,Kwaliteitsvergadering
 apps/erpnext/erpnext/accounts/doctype/account/account.js,Non-Group to Group,Non-groep tot groep
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,Stel Naming Series in op {0} via Setup&gt; Instellingen&gt; Naming Series
 DocType: Employee,ERPNext User,ERPNext Gebruiker
 apps/erpnext/erpnext/education/doctype/student_group_creation_tool/student_group_creation_tool.py,Batch is mandatory in row {0},Partij is verplicht in rij {0}
 apps/erpnext/erpnext/education/doctype/student_group_creation_tool/student_group_creation_tool.py,Batch is mandatory in row {0},Partij is verplicht in rij {0}
@@ -5123,6 +5131,7 @@
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py,No {0} found for Inter Company Transactions.,Geen {0} gevonden voor transacties tussen bedrijven.
 DocType: Travel Itinerary,Rented Car,Gehuurde auto
 apps/erpnext/erpnext/public/js/hub/components/profile_dialog.js,About your Company,Over uw bedrijf
+apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.js,Show Stock Ageing Data,Toon veroudering van aandelen
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py,Credit To account must be a Balance Sheet account,Credit Om rekening moet een balansrekening zijn
 DocType: Donor,Donor,schenker
 DocType: Global Defaults,Disable In Words,Uitschakelen In Woorden
@@ -5137,8 +5146,10 @@
 DocType: Practitioner Schedule,Schedule Name,Schema Naam
 apps/erpnext/erpnext/regional/doctype/gstr_3b_report/gstr_3b_report.py,Please enter GSTIN and state for the Company Address {0},Voer GSTIN in en vermeld het bedrijfsadres {0}
 DocType: Currency Exchange,For Buying,Om te kopen
+apps/erpnext/erpnext/setup/default_energy_point_rules.py,On Purchase Order Submission,Bij het indienen van een inkooporder
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js,Add All Suppliers,Voeg alle leveranciers toe
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py,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/accounts/doctype/pricing_rule/pricing_rule.js,Customer &gt; Customer Group &gt; Territory,Klant&gt; Klantengroep&gt; Gebied
 DocType: Tally Migration,Parties,partijen
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js,Browse BOM,Bladeren BOM
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py,Secured Loans,Leningen met onderpand
@@ -5170,6 +5181,7 @@
 apps/erpnext/erpnext/stock/doctype/item_alternative/item_alternative.py,Not allow to set alternative item for the item {0},Niet toestaan om alternatief item in te stellen voor het item {0}
 apps/erpnext/erpnext/hr/doctype/leave_block_list/leave_block_list.py,Date is repeated,Datum wordt herhaald
 apps/erpnext/erpnext/accounts/print_format/payment_receipt_voucher/payment_receipt_voucher.html,Authorized Signatory,Geautoriseerd ondertekenaar
+apps/erpnext/erpnext/education/doctype/instructor/instructor.py,Please setup Instructor Naming System in Education &gt; Education Settings,Stel het naamsysteem voor instructeurs in Onderwijs&gt; Onderwijsinstellingen in
 apps/erpnext/erpnext/regional/doctype/gstr_3b_report/gstr_3b_report.html,Net ITC Available(A) - (B),Net ITC beschikbaar (A) - (B)
 apps/erpnext/erpnext/education/doctype/fee_schedule/fee_schedule.js,Create Fees,Fees maken
 DocType: Project,Total Purchase Cost (via Purchase Invoice),Totale aanschafkosten (via Purchase Invoice)
@@ -5190,6 +5202,7 @@
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.js,Message Sent,bericht verzonden
 apps/erpnext/erpnext/accounts/doctype/account/account.py,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/assets/report/fixed_asset_register/fixed_asset_register.py,Vendor Name,Naam van de leverancier
 DocType: Quiz Result,Wrong,Fout
 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)
@@ -5435,6 +5448,7 @@
 DocType: Stock Settings,Auto Material Request,Automatisch Materiaal Request
 DocType: Woocommerce Settings,API consumer secret,API-gebruikersgeheim
 DocType: Delivery Note Item,Available Batch Qty at From Warehouse,Beschikbaar Aantal Batch bij Van Warehouse
+,Received Qty Amount,Aantal ontvangen
 DocType: Salary Slip,Gross Pay - Total Deduction - Loan Repayment,Brutoloon - Total Aftrek - aflossing van de lening
 DocType: Bank Account,Last Integration Date,Laatste integratiedatum
 DocType: Expense Claim,Expense Taxes and Charges,Kosten en heffingen
@@ -5899,6 +5913,8 @@
 DocType: Drug Prescription,Hour,uur
 DocType: Restaurant Order Entry,Last Sales Invoice,Laatste verkoopfactuur
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py,Please select Qty against item {0},Selecteer alstublieft Aantal tegen item {0}
+apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py,Latest Age,Laatste leeftijd
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js,Transfer Material to Supplier,Transfer Material aan Leverancier
 apps/erpnext/erpnext/hr/report/loan_repayment/loan_repayment.py,EMI,EMI
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py,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
@@ -5922,7 +5938,6 @@
 apps/erpnext/erpnext/hr/doctype/employee_benefit_application/employee_benefit_application.py,"An amount of {0} already claimed for the component {1},\
 						 set the amount equal or greater than {2}","Een hoeveelheid {0} die al is geclaimd voor de component {1}, \ stelt het bedrag in dat gelijk is aan of groter is dan {2}"
 DocType: Shipping Rule,Shipping Rule Conditions,Verzendregel Voorwaarden
-DocType: Purchase Invoice,Export Type,Exporttype
 DocType: Salary Slip Loan,Salary Slip Loan,Salaris Sliplening
 DocType: BOM Update Tool,The new BOM after replacement,De nieuwe Stuklijst na vervanging
 ,Point of Sale,Point of Sale
@@ -6044,7 +6059,6 @@
 DocType: Purchase Order Item,Blanket Order Rate,Deken Besteltarief
 ,Customer Ledger Summary,Overzicht klantenboek
 apps/erpnext/erpnext/hooks.py,Certification,certificaat
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js,Are you sure you want to make debit note?,Weet u zeker dat u een debetnota wilt maken?
 DocType: Bank Guarantee,Clauses and Conditions,Clausules en voorwaarden
 DocType: Serial No,Creation Document Type,Aanmaken Document type
 DocType: Amazon MWS Settings,ES,ES
@@ -6082,8 +6096,6 @@
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py,Financial Services,Financiële Dienstverlening
 DocType: Student Sibling,Student ID,student ID
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.js,For Quantity must be greater than zero,Voor Hoeveelheid moet groter zijn dan nul
-apps/erpnext/erpnext/hr/doctype/employee_transfer/employee_transfer.py,"Please delete the Employee <a href=""#Form/Employee/{0}"">{0}</a>\
-					to cancel this document","Verwijder de werknemer <a href=""#Form/Employee/{0}"">{0}</a> \ om dit document te annuleren"
 apps/erpnext/erpnext/config/projects.py,Types of activities for Time Logs,Soorten activiteiten voor Time Logs
 DocType: Opening Invoice Creation Tool,Sales,Verkoop
 DocType: Stock Entry Detail,Basic Amount,Basisbedrag
@@ -6162,6 +6174,7 @@
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py,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,Send Supplier Emails,Stuur Leverancier Emails
+DocType: Asset Movement,ACC-ASM-.YYYY.-,ACC-ASM-.YYYY.-
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py,"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
 apps/erpnext/erpnext/hr/doctype/employee_onboarding/employee_onboarding.py,Submit this to create the Employee record,Dien dit in om het werknemersrecord te creëren
@@ -6242,7 +6255,6 @@
 DocType: Sales Team,Contact No.,Contact Nr
 apps/erpnext/erpnext/templates/includes/cart/cart_address.html,Billing Address is same as Shipping Address,Factuuradres is hetzelfde als verzendadres
 DocType: Bank Reconciliation,Payment Entries,betaling Entries
-apps/erpnext/erpnext/erpnext_integrations/doctype/shopify_settings/shopify_settings.py,Access token or Shopify URL missing,Toegangstoken of Shopify-URL ontbreekt
 DocType: Location,Latitude,Breedtegraad
 DocType: Work Order,Scrap Warehouse,Scrap Warehouse
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py,"Warehouse required at Row No {0}, please set default warehouse for the item {1} for the company {2}","Magazijn vereist bij rij Nee {0}, stel het standaardmagazijn in voor het artikel {1} voor het bedrijf {2}"
@@ -6287,7 +6299,6 @@
 DocType: Job Offer Term,Value / Description,Waarde / Beschrijving
 apps/erpnext/erpnext/controllers/accounts_controller.py,"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
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js,Are you sure you want to make credit note?,Weet u zeker dat u een creditnota wilt maken?
 DocType: Purchase Order Item,Expected Delivery Date,Verwachte leverdatum
 DocType: Restaurant Order Entry,Restaurant Order Entry,Restaurantbestelling
 apps/erpnext/erpnext/accounts/general_ledger.py,Debit and Credit not equal for {0} #{1}. Difference is {2}.,Debet en Credit niet gelijk voor {0} # {1}. Verschil {2}.
@@ -6412,6 +6423,7 @@
 DocType: Purchase Invoice,Taxes and Charges Added,Belastingen en Toeslagen toegevoegd
 apps/erpnext/erpnext/assets/doctype/asset/asset.py,Depreciation Row {0}: Next Depreciation Date cannot be before Available-for-use Date,Afschrijving Rij {0}: Volgende Afschrijvingsdatum kan niet eerder zijn dan Beschikbaar-voor-gebruik Datum
 ,Sales Funnel,Verkoop Trechter
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Item Code &gt; Item Group &gt; Brand,Artikelcode&gt; Artikelgroep&gt; Merk
 apps/erpnext/erpnext/setup/doctype/company/company.py,Abbreviation is mandatory,Afkorting is verplicht
 DocType: Project,Task Progress,Task Progress
 apps/erpnext/erpnext/templates/includes/navbar/navbar_items.html,Cart,Kar
@@ -6658,6 +6670,7 @@
 DocType: Employee Grade,Employee Grade,Werknemersrang
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py,Piecework,stukwerk
 DocType: GSTR 3B Report,June,juni-
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Supplier &gt; Supplier Type,Leverancier&gt; Type leverancier
 DocType: Share Balance,From No,Van Nee
 DocType: Shift Type,Early Exit Grace Period,Grace Exit-periode
 DocType: Task,Actual Time (in Hours),Werkelijke tijd (in uren)
@@ -6942,6 +6955,7 @@
 DocType: Warehouse,Warehouse Name,Magazijn Naam
 DocType: Naming Series,Select Transaction,Selecteer Transactie
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py,Please enter Approving Role or Approving User,Vul de Goedkeurders Rol of Goedkeurende Gebruiker in
+apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.py,UOM Conversion factor ({0} -&gt; {1}) not found for item: {2},UOM-conversiefactor ({0} -&gt; {1}) niet gevonden voor item: {2}
 apps/erpnext/erpnext/support/doctype/service_level_agreement/service_level_agreement.py,Service Level Agreement with Entity Type {0} and Entity {1} already exists.,Service Level Agreement met Entity Type {0} en Entity {1} bestaat al.
 DocType: Journal Entry,Write Off Entry,Invoer afschrijving
 DocType: BOM,Rate Of Materials Based On,Prijs van materialen op basis van
@@ -7132,6 +7146,7 @@
 DocType: Quality Inspection Reading,Quality Inspection Reading,Kwaliteitscontrole Meting
 apps/erpnext/erpnext/stock/doctype/stock_settings/stock_settings.py,`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/stock/report/stock_balance/stock_balance.py,Earliest Age,Vroegste leeftijd
 apps/erpnext/erpnext/utilities/user_progress.py,Set a sales goal you'd like to achieve for your company.,Stel een verkoopdoel dat u voor uw bedrijf wilt bereiken.
 DocType: Quality Goal,Revision,Herziening
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js,Healthcare Services,Gezondheidszorg
@@ -7175,6 +7190,7 @@
 apps/erpnext/erpnext/healthcare/doctype/patient_encounter/patient_encounter.js,Schedule Discharge,Scheiding plannen
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py,Cheques and Deposits incorrectly cleared,Cheques en Deposito verkeerd ontruimd
 DocType: Homepage Section Card,Homepage Section Card,Homepage Sectiekaart
+,Amount To Be Billed,Te factureren bedrag
 apps/erpnext/erpnext/accounts/doctype/account/account.py,Account {0}: You can not assign itself as parent account,Rekening {0}: U kunt niet de rekening zelf toewijzen als bovenliggende rekening
 DocType: Purchase Invoice Item,Price List Rate,Prijslijst Tarief
 apps/erpnext/erpnext/utilities/activation.py,Create customer quotes,Maak een offerte voor de klant
@@ -7227,6 +7243,7 @@
 DocType: Supplier Scorecard Criteria,Supplier Scorecard Criteria,Leveranciers Scorecard Criteria
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py,Please select Start Date and End Date for Item {0},Selecteer Start- en Einddatum voor Artikel {0}
 DocType: Maintenance Schedule,MAT-MSH-.YYYY.-,MAT-MSH-.YYYY.-
+,Amount to Receive,Te ontvangen bedrag
 apps/erpnext/erpnext/education/doctype/student_group_creation_tool/student_group_creation_tool.py,Course is mandatory in row {0},Natuurlijk is verplicht in de rij {0}
 apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py,From date can not be greater than than To date,Vanaf-datum kan niet groter zijn dan Tot-datum
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py,To date cannot be before from date,Tot Datum kan niet eerder zijn dan Van Datum
@@ -7477,7 +7494,6 @@
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js,BOM and Manufacturing Quantity are required,BOM en Productie Hoeveelheid nodig
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js,Ageing Range 2,Vergrijzing Range 2
 DocType: SG Creation Tool Course,Max Strength,Max Strength
-apps/erpnext/erpnext/accounts/doctype/account/account.py,"Account {0} already exists in child company {1}. The following fields have different values, they should be same:<ul><li>{2}</li></ul>","Account {0} bestaat al in kinderbedrijf {1}. De volgende velden hebben verschillende waarden, ze moeten hetzelfde zijn: <ul><li> {2} </li></ul>"
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py,Installing presets,Voorinstellingen installeren
 DocType: Fee Schedule,EDU-FSH-.YYYY.-,EDU-FSH-.YYYY.-
 apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js,No Delivery Note selected for Customer {},Geen leveringsbewijs geselecteerd voor klant {}
@@ -7688,6 +7704,7 @@
 DocType: Delivery Note,Print Without Amount,Printen zonder Bedrag
 apps/erpnext/erpnext/accounts/report/asset_depreciation_ledger/asset_depreciation_ledger.py,Depreciation Date,afschrijvingen Date
 ,Work Orders in Progress,Werkorders in uitvoering
+DocType: Customer Credit Limit,Bypass Credit Limit Check,Controle van kredietlimiet omzeilen
 DocType: Issue,Support Team,Support Team
 apps/erpnext/erpnext/stock/report/batch_item_expiry_status/batch_item_expiry_status.py,Expiry (In Days),Vervallen (in dagen)
 DocType: Appraisal,Total Score (Out of 5),Totale Score (van de 5)
@@ -7874,6 +7891,7 @@
 DocType: Sales Invoice,Customer GSTIN,Klant GSTIN
 DocType: Crop Cycle,List of diseases detected on the field. When selected it'll automatically add a list of tasks to deal with the disease ,Lijst met gedetecteerde ziekten op het veld. Na selectie voegt het automatisch een lijst met taken toe om de ziekte aan te pakken
 apps/erpnext/erpnext/manufacturing/page/bom_comparison_tool/bom_comparison_tool.js,BOM 1,BOM 1
+apps/erpnext/erpnext/assets/report/fixed_asset_register/fixed_asset_register.py,Asset Id,Activa-ID
 apps/erpnext/erpnext/healthcare/doctype/healthcare_service_unit/healthcare_service_unit.js,This is a root healthcare service unit and cannot be edited.,Dit is een service-eenheid voor basisgezondheidszorg en kan niet worden bewerkt.
 DocType: Asset Repair,Repair Status,Reparatiestatus
 apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.js,"Requested Qty: Quantity requested for purchase, but not ordered.","Aangevraagd Hoeveelheid: Aantal gevraagd om in te kopen, maar nog niet besteld."
diff --git a/erpnext/translations/no.csv b/erpnext/translations/no.csv
index 04347f7..4c9d262 100644
--- a/erpnext/translations/no.csv
+++ b/erpnext/translations/no.csv
@@ -289,7 +289,6 @@
 DocType: Loan,Repay Over Number of Periods,Betale tilbake over antall perioder
 apps/erpnext/erpnext/manufacturing/report/bom_stock_report/bom_stock_report.py,Quantity to Produce can not be less than Zero,Mengde å produsere kan ikke være mindre enn null
 DocType: Stock Entry,Additional Costs,Tilleggskostnader
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Customer &gt; Customer Group &gt; Territory,Kunde&gt; Kundegruppe&gt; Territorium
 apps/erpnext/erpnext/accounts/doctype/account/account.py,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
@@ -587,6 +586,7 @@
 DocType: Healthcare Settings,Create documents for sample collection,Lag dokumenter for prøveinnsamling
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py,Payment against {0} {1} cannot be greater than Outstanding Amount {2},Betaling mot {0} {1} kan ikke være større enn utestående beløp {2}
 apps/erpnext/erpnext/patches/v11_0/add_healthcare_service_unit_tree_root.py,All Healthcare Service Units,Alle helsevesenetjenestene
+apps/erpnext/erpnext/setup/default_energy_point_rules.py,On Converting Opportunity,På konvertering av mulighet
 DocType: Bank Account,Address HTML,Adresse HTML
 DocType: Lead,Mobile No.,Mobile No.
 apps/erpnext/erpnext/selling/doctype/pos_closing_voucher/closing_voucher_details.html,Mode of Payments,Betalingsmåte
@@ -651,7 +651,6 @@
 DocType: Accounting Dimension,Dimension Name,Dimensjonsnavn
 apps/erpnext/erpnext/healthcare/setup.py,Resistant,Resistant
 apps/erpnext/erpnext/hotels/doctype/hotel_room_reservation/hotel_room_reservation.py,Please set Hotel Room Rate on {},Vennligst sett inn hotellrenten på {}
-apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py,Please setup numbering series for Attendance via Setup &gt; Numbering Series,Angi nummereringsserier for Oppmøte via Oppsett&gt; Nummereringsserier
 DocType: Journal Entry,Multi Currency,Multi Valuta
 DocType: Bank Statement Transaction Invoice Item,Invoice Type,Faktura Type
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py,Valid from date must be less than valid upto date,Gyldig fra dato må være mindre enn gyldig til dato
@@ -769,6 +768,7 @@
 apps/erpnext/erpnext/accounts/page/pos/pos.js,Create a new Customer,Opprett en ny kunde
 apps/erpnext/erpnext/non_profit/report/expiring_memberships/expiring_memberships.py,Expiring On,Utløper på
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,"If multiple Pricing Rules continue to prevail, users are asked to set Priority manually to resolve conflict.","Hvis flere Pris Regler fortsette å råde, blir brukerne bedt om å sette Priority manuelt for å løse konflikten."
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js,Purchase Return,Kjøp Return
 apps/erpnext/erpnext/utilities/activation.py,Create Purchase Orders,Opprette innkjøpsordrer
 ,Purchase Register,Kjøp Register
 apps/erpnext/erpnext/healthcare/doctype/patient/patient.py,Patient not found,Pasient ikke funnet
@@ -784,7 +784,6 @@
 DocType: Location,Area UOM,Område UOM
 apps/erpnext/erpnext/manufacturing/doctype/workstation/workstation.py,Workstation is closed on the following dates as per Holiday List: {0},Workstation er stengt på følgende datoer som per Holiday Liste: {0}
 apps/erpnext/erpnext/selling/page/sales_funnel/sales_funnel.py,Opportunities,Muligheter
-apps/erpnext/erpnext/www/all-products/index.html,Clear filters,Fjern filtre
 DocType: Lab Test Template,Single,Enslig
 DocType: Compensatory Leave Request,Work From Date,Arbeid fra dato
 DocType: Salary Slip,Total Loan Repayment,Total Loan Nedbetaling
@@ -828,6 +827,7 @@
 apps/erpnext/erpnext/education/doctype/program_enrollment_tool/program_enrollment_tool.py,Mandatory field - Academic Year,Obligatorisk felt - akademisk år
 apps/erpnext/erpnext/education/doctype/program_enrollment_tool/program_enrollment_tool.py,Mandatory field - Academic Year,Obligatorisk felt - akademisk år
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py,{0} {1} is not associated with {2} {3},{0} {1} er ikke knyttet til {2} {3}
+DocType: Opportunity,Converted By,Konvertert av
 apps/erpnext/erpnext/public/js/hub/components/ReviewArea.vue,You need to login as a Marketplace User before you can add any reviews.,Du må logge deg inn som Marketplace-bruker før du kan legge til anmeldelser.
 apps/erpnext/erpnext/manufacturing/doctype/job_card/job_card.py,Row {0} : Operation is required against the raw material item {1},Row {0}: Drift er nødvendig mot råvareelementet {1}
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py,Please set default payable account for the company {0},Vennligst angi standard betalbar konto for selskapet {0}
@@ -854,6 +854,8 @@
 DocType: Sales Invoice,Total Qty,Total Antall
 apps/erpnext/erpnext/education/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py,Guardian2 Email ID,Guardian2 Email ID
 apps/erpnext/erpnext/education/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py,Guardian2 Email ID,Guardian2 Email ID
+apps/erpnext/erpnext/hr/doctype/employee_transfer/employee_transfer.py,"Please delete the Employee <a href=""#Form/Employee/{0}"">{0}</a>\
+					to cancel this document","Slett ansatt <a href=""#Form/Employee/{0}"">{0}</a> \ for å avbryte dette dokumentet"
 DocType: Item,Show in Website (Variant),Vis i Website (Variant)
 DocType: Employee,Health Concerns,Helse Bekymringer
 DocType: Payroll Entry,Select Payroll Period,Velg Lønn Periode
@@ -914,7 +916,6 @@
 DocType: Codification Table,Codification Table,Kodifiseringstabell
 DocType: Timesheet Detail,Hrs,timer
 apps/erpnext/erpnext/manufacturing/page/bom_comparison_tool/bom_comparison_tool.js,Changes in {0},Endringer i {0}
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js,Please select Company,Vennligst velg selskapet
 DocType: Employee Skill,Employee Skill,Ansattes ferdighet
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.js,Difference Account,Forskjellen konto
 DocType: Pricing Rule,Discount on Other Item,Rabatt på annen vare
@@ -983,6 +984,7 @@
 DocType: BOM,Operating Cost,Driftskostnader
 DocType: Crop,Produced Items,Produserte varer
 DocType: Bank Statement Transaction Entry,Match Transaction to Invoices,Match transaksjon til fakturaer
+apps/erpnext/erpnext/erpnext_integrations/exotel_integration.py,Error in Exotel incoming call,Feil i innkommende samtale fra Exotel
 DocType: Sales Order Item,Gross Profit,Bruttofortjeneste
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js,Unblock Invoice,Fjern blokkering av faktura
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py,Increment cannot be 0,Tilveksten kan ikke være 0
@@ -1198,6 +1200,7 @@
 DocType: Activity Cost,Activity Type,Aktivitetstype
 DocType: Request for Quotation,For individual supplier,For enkelte leverandør
 DocType: BOM Operation,Base Hour Rate(Company Currency),Base Hour Rate (Selskap Valuta)
+,Qty To Be Billed,Antall som skal faktureres
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py,Delivered Amount,Leveres Beløp
 apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.js,Reserved Qty for Production: Raw materials quantity to make manufacturing items.,Reservert antall for produksjon: Råvaremengde for å lage produksjonsvarer.
 DocType: Loyalty Point Entry Redemption,Redemption Date,Innløsningsdato
@@ -1319,7 +1322,7 @@
 apps/erpnext/erpnext/education/doctype/student_group/student_group.py,Please select Program,Vennligst velg Program
 apps/erpnext/erpnext/education/doctype/student_group/student_group.py,Please select Program,Vennligst velg Program
 DocType: Project,Estimated Cost,anslått pris
-DocType: Request for Quotation,Link to material requests,Lenke til materiale forespørsler
+DocType: Supplier Quotation,Link to material requests,Lenke til materiale forespørsler
 apps/erpnext/erpnext/public/js/hub/pages/Publish.vue,Publish,publisere
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py,Aerospace,Aerospace
 ,Fichier des Ecritures Comptables [FEC],Fichier des Ecritures Comptables [FEC]
@@ -1332,6 +1335,7 @@
 apps/erpnext/erpnext/utilities/transaction_base.py,Invalid Posting Time,Ugyldig innleggstid
 DocType: Salary Component,Condition and Formula,Tilstand og formel
 DocType: Lead,Campaign Name,Kampanjenavn
+apps/erpnext/erpnext/setup/default_energy_point_rules.py,On Task Completion,Ved fullførelse av oppgaven
 apps/erpnext/erpnext/hr/doctype/compensatory_leave_request/compensatory_leave_request.py,There is no leave period in between {0} and {1},Det er ingen permisjon mellom {0} og {1}
 DocType: Fee Validity,Healthcare Practitioner,Helsepersonell
 DocType: Hotel Room,Capacity,Kapasitet
@@ -1677,7 +1681,6 @@
 DocType: Quality Feedback Template,Quality Feedback Template,Kvalitet Tilbakemelding Mal
 apps/erpnext/erpnext/config/education.py,LMS Activity,LMS-aktivitet
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py,Internet Publishing,Internett Publisering
-DocType: Prescription Duration,Number,Antall
 apps/erpnext/erpnext/accounts/doctype/opening_invoice_creation_tool/opening_invoice_creation_tool.js,Creating {0} Invoice,Opprette {0} faktura
 DocType: Medical Code,Medical Code Standard,Medisinskode Standard
 DocType: Soil Texture,Clay Composition (%),Leirekomposisjon (%)
@@ -1752,6 +1755,7 @@
 DocType: Support Settings,Get Started Sections,Komme i gang Seksjoner
 DocType: Lead,CRM-LEAD-.YYYY.-,CRM-LEAD-.YYYY.-
 DocType: Invoice Discounting,Sanctioned,sanksjonert
+,Base Amount,Grunnbeløp
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.js,Total Contribution Amount: {0},Totalt bidragsbeløp: {0}
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py,Row #{0}: Please specify Serial No for Item {1},Row # {0}: Vennligst oppgi serienummer for varen {1}
 DocType: Payroll Entry,Salary Slips Submitted,Lønnsslipp legges inn
@@ -1974,6 +1978,7 @@
 DocType: Accounting Dimension,Dimension Defaults,Dimensjonsstandarder
 apps/erpnext/erpnext/crm/report/prospects_engaged_but_not_converted/prospects_engaged_but_not_converted.js,Minimum Lead Age (Days),Minimum levealder (dager)
 apps/erpnext/erpnext/crm/report/prospects_engaged_but_not_converted/prospects_engaged_but_not_converted.js,Minimum Lead Age (Days),Minimum levealder (dager)
+apps/erpnext/erpnext/assets/report/fixed_asset_register/fixed_asset_register.py,Available For Use Date,Tilgjengelig for bruksdato
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py,All BOMs,alle stykklister
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js,Create Inter Company Journal Entry,Opprett Inter Company Journal Entry
 DocType: Company,Parent Company,Moderselskap
@@ -2038,6 +2043,7 @@
 ,IRS 1099,IRS 1099
 DocType: Salary Slip,Leave Without Pay,Dager uten lønn
 DocType: Payment Request,Outward,Ytre
+apps/erpnext/erpnext/setup/default_energy_point_rules.py,On {0} Creation,På {0} Oppretting
 apps/erpnext/erpnext/regional/doctype/gstr_3b_report/gstr_3b_report.html,State/UT Tax,Stat / UT-skatt
 ,Trial Balance for Party,Trial Balance for partiet
 ,Gross and Net Profit Report,Brutto og netto resultatrapport
@@ -2155,6 +2161,7 @@
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js,Make Stock Entry,Gjør lageroppføring
 DocType: Hotel Room Reservation,Hotel Reservation User,Hotel Reservation Bruker
 apps/erpnext/erpnext/projects/doctype/project/project.js,Set Status,Angi status
+apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py,Please setup numbering series for Attendance via Setup &gt; Numbering Series,Angi nummereringsserier for Oppmøte via Oppsett&gt; Nummereringsserier
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py,Please select prefix first,Vennligst velg først prefiks
 DocType: Contract,Fulfilment Deadline,Oppfyllingsfrist
 apps/erpnext/erpnext/public/js/hub/pages/Home.vue,Near you,I nærheten av deg
@@ -2170,6 +2177,7 @@
 DocType: Announcement,All Students,alle studenter
 apps/erpnext/erpnext/assets/doctype/asset/asset.py,Item {0} must be a non-stock item,Element {0} må være et ikke-lagervare
 apps/erpnext/erpnext/stock/doctype/batch/batch.js,View Ledger,Vis Ledger
+DocType: Cost Center,Lft,LFT
 DocType: Grading Scale,Intervals,intervaller
 DocType: Bank Statement Transaction Entry,Reconciled Transactions,Avstemte transaksjoner
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py,Earliest,Tidligste
@@ -2285,6 +2293,7 @@
 apps/erpnext/erpnext/hr/doctype/employee_benefit_application/employee_benefit_application.py,As per your assigned Salary Structure you cannot apply for benefits,I henhold til din tildelte lønnsstruktur kan du ikke søke om fordeler
 apps/erpnext/erpnext/stock/doctype/item/item.py,Website Image should be a public file or website URL,Website Bilde bør være en offentlig fil eller nettside URL
 DocType: Purchase Invoice Item,BOM,BOM
+apps/erpnext/erpnext/stock/doctype/item/item.py,Duplicate entry in Manufacturers table,Duplisert oppføring i tabellen Produsenter
 apps/erpnext/erpnext/setup/doctype/item_group/item_group.js,This is a root item group and cannot be edited.,Dette er en rot varegruppe og kan ikke redigeres.
 apps/erpnext/erpnext/accounts/doctype/account/account.js,Merge,Slå sammen
 DocType: Journal Entry Account,Purchase Order,Bestilling
@@ -2431,7 +2440,6 @@
 DocType: Asset,Depreciation Schedules,avskrivninger tidsplaner
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.js,Create Sales Invoice,Lag salgsfaktura
 apps/erpnext/erpnext/regional/doctype/gstr_3b_report/gstr_3b_report.html,Ineligible ITC,Ikke-kvalifisert ITC
-apps/erpnext/erpnext/erpnext_integrations/doctype/shopify_settings/shopify_settings.py,"Support for public app is deprecated. Please setup private app, for more details refer user manual","Støtte for offentlig app er utdatert. Vennligst sett opp privat app, for flere detaljer, se brukerhåndboken"
 DocType: Task,Dependent Tasks,Avhengige oppgaver
 apps/erpnext/erpnext/regional/report/gstr_1/gstr_1.py,Following accounts might be selected in GST Settings:,Følgende kontoer kan velges i GST-innstillinger:
 apps/erpnext/erpnext/manufacturing/report/bom_stock_report/bom_stock_report.js,Quantity to Produce,Mengde å produsere
@@ -2683,6 +2691,7 @@
 DocType: Water Analysis,Container,Container
 apps/erpnext/erpnext/regional/report/gstr_1/gstr_1.py,Please set valid GSTIN No. in Company Address,Angi gyldig GSTIN-nr. I firmaets adresse
 apps/erpnext/erpnext/education/utils.py,Student {0} - {1} appears Multiple times in row {2} & {3},Student {0} - {1} vises flere ganger på rad {2} og {3}
+apps/erpnext/erpnext/selling/doctype/customer/customer.py,Following fields are mandatory to create address:,Følgende felt er obligatoriske for å opprette adresse:
 DocType: Item Alternative,Two-way,Toveis
 DocType: Item,Manufacturers,produsenter
 apps/erpnext/erpnext/accounts/deferred_revenue.py,Error while processing deferred accounting for {0},Feil under behandling av utsatt regnskap for {0}
@@ -2758,9 +2767,9 @@
 DocType: Employee,HR-EMP-,HR-EMP-
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py,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: Quality Meeting Minutes,Quality Meeting Minutes,Møtereferater for kvalitet
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Supplier &gt; Supplier Type,Leverandør&gt; Leverandørtype
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py,Employee Referral,Ansatt henvisning
 DocType: Student Group,Set 0 for no limit,Sett 0 for ingen begrensning
+DocType: Cost Center,rgt,RGT
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py,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.
 DocType: Customer,Primary Address and Contact Detail,Primæradresse og kontaktdetaljer
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.js,Resend Payment Email,Sende Betaling Email
@@ -2870,7 +2879,6 @@
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py,Against Supplier Invoice {0} dated {1},Mot Leverandør Faktura {0} datert {1}
 DocType: Customer,Default Price List,Standard Prisliste
 apps/erpnext/erpnext/assets/doctype/asset/asset.py,Asset Movement record {0} created,Asset Movement rekord {0} er opprettet
-apps/erpnext/erpnext/utilities/page/leaderboard/leaderboard.js,No items found.,Ingen objekter funnet.
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py,You cannot delete Fiscal Year {0}. Fiscal Year {0} is set as default in Global Settings,Du kan ikke slette regnskapsår {0}. Regnskapsåret {0} er satt som standard i Globale innstillinger
 DocType: Share Transfer,Equity/Liability Account,Egenkapital / ansvarskonto
 apps/erpnext/erpnext/setup/doctype/customer_group/customer_group.py,A customer with the same name already exists,En kunde med samme navn eksisterer allerede
@@ -2886,6 +2894,7 @@
 apps/erpnext/erpnext/selling/doctype/customer/customer.py,Credit limit has been crossed for customer {0} ({1}/{2}),Kredittgrensen er krysset for kunden {0} ({1} / {2})
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py,Customer required for 'Customerwise Discount',Kunden nødvendig for &#39;Customerwise Discount&#39;
 apps/erpnext/erpnext/config/accounting.py,Update bank payment dates with journals.,Oppdatere bankbetalings datoer med tidsskrifter.
+,Billed Qty,Fakturert antall
 apps/erpnext/erpnext/stock/doctype/item/item_dashboard.py,Pricing,Priser
 DocType: Employee,Attendance Device ID (Biometric/RF tag ID),Oppmøte enhets-ID (biometrisk / RF-tag-ID)
 DocType: Quotation,Term Details,Term Detaljer
@@ -2908,6 +2917,7 @@
 DocType: Share Transfer,Asset Account,Asset-konto
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js,New release date should be in the future,Ny utgivelsesdato bør være i fremtiden
 DocType: Purchase Invoice,End date of current invoice's period,Sluttdato for gjeldende faktura periode
+apps/erpnext/erpnext/hr/doctype/employee/employee.py,Please setup Employee Naming System in Human Resource &gt; HR Settings,Sett inn ansattes navnsystem i menneskelige ressurser&gt; HR-innstillinger
 DocType: Lab Test,Technician Name,Tekniker Navn
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py,"Cannot ensure delivery by Serial No as \
 					Item {0} is added with and without Ensure Delivery by \
@@ -2915,6 +2925,7 @@
 DocType: Accounts Settings,Unlink Payment on Cancellation of Invoice,Oppheve koblingen Betaling ved kansellering av faktura
 DocType: Bank Reconciliation,From Date,Fra Dato
 apps/erpnext/erpnext/hr/doctype/vehicle_log/vehicle_log.py,Current Odometer reading entered should be greater than initial Vehicle Odometer {0},Nåværende Kilometerstand inngått bør være større enn første Vehicle Teller {0}
+,Purchase Order Items To Be Received or Billed,Innkjøpsordrer som skal mottas eller faktureres
 DocType: Restaurant Reservation,No Show,Uteblivelse
 apps/erpnext/erpnext/regional/india/utils.py,You must be a registered supplier to generate e-Way Bill,Du må være en registrert leverandør for å generere e-Way Bill
 DocType: Shipping Rule Country,Shipping Rule Country,Shipping Rule Land
@@ -2957,6 +2968,7 @@
 apps/erpnext/erpnext/templates/generators/item/item_add_to_cart.html,View in Cart,Vis i handlekurven
 DocType: Employee Checkin,Shift Actual Start,Skift faktisk start
 DocType: Tally Migration,Is Day Book Data Imported,Er dagbokdata importert
+,Purchase Order Items To Be Received or Billed1,Innkjøpsordrer som skal mottas eller faktureres1
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py,Marketing Expenses,Markedsføringskostnader
 apps/erpnext/erpnext/stock/doctype/pick_list/pick_list.py,{0} units of {1} is not available.,{0} enheter på {1} er ikke tilgjengelig.
 ,Item Shortage Report,Sak Mangel Rapporter
@@ -3182,7 +3194,6 @@
 apps/erpnext/erpnext/public/js/call_popup/call_popup.js,View all issues from {0},Se alle utgaver fra {0}
 DocType: Quality Inspection,MAT-QA-.YYYY.-,MAT-QA-.YYYY.-
 DocType: Quality Meeting Table,Quality Meeting Table,Møtebord av kvalitet
-apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,Angi Naming Series for {0} via Setup&gt; Settings&gt; Naming Series
 apps/erpnext/erpnext/templates/pages/help.html,Visit the forums,Besøk forumene
 DocType: Student,Student Mobile Number,Student Mobilnummer
 DocType: Item,Has Variants,Har Varianter
@@ -3326,6 +3337,7 @@
 ,Campaign Efficiency,Kampanjeeffektivitet
 ,Campaign Efficiency,Kampanjeeffektivitet
 DocType: Discussion,Discussion,Diskusjon
+apps/erpnext/erpnext/setup/default_energy_point_rules.py,On Sales Order Submission,På innkjøpsordre
 DocType: Bank Transaction,Transaction ID,Transaksjons-ID
 DocType: Payroll Entry,Deduct Tax For Unsubmitted Tax Exemption Proof,Fradragsskatt for ikke-innvilget skattefrihetsbevis
 DocType: Volunteer,Anytime,Når som helst
@@ -3333,7 +3345,6 @@
 DocType: Employee Tax Exemption Proof Submission,Employee Tax Exemption Proof Submission,Skattefrihetsbevis for arbeidstakere
 DocType: Patient,Surgical History,Kirurgisk historie
 DocType: Bank Statement Settings Item,Mapped Header,Mapped Header
-apps/erpnext/erpnext/hr/doctype/employee/employee.py,Please setup Employee Naming System in Human Resource &gt; HR Settings,Sett inn ansattes navnsystem i menneskelige ressurser&gt; HR-innstillinger
 DocType: Employee,Resignation Letter Date,Resignasjon Letter Dato
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Pricing Rules are further filtered based on quantity.,Prising Reglene er videre filtreres basert på kvantitet.
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py,Please set the Date Of Joining for employee {0},Vennligst sett datoen for å bli med på ansatt {0}
@@ -3348,6 +3359,7 @@
 DocType: Bank Statement Settings,Mapped Items,Mappede elementer
 DocType: Amazon MWS Settings,IT,DEN
 DocType: Chapter,Chapter,Kapittel
+,Fixed Asset Register,Fast eiendeleregister
 apps/erpnext/erpnext/utilities/user_progress.py,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,Select BOM and Qty for Production,Velg BOM og Stk for produksjon
@@ -3483,7 +3495,6 @@
 apps/erpnext/erpnext/templates/emails/reorder_item.html,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å
 apps/erpnext/erpnext/controllers/accounts_controller.py,Account {0} is invalid. Account Currency must be {1},Konto {0} er ugyldig. Account Valuta må være {1}
 apps/erpnext/erpnext/hr/doctype/salary_structure_assignment/salary_structure_assignment.py,From Date {0} cannot be after employee's relieving Date {1},Fra dato {0} kan ikke være etter ansattes avlastningsdato {1}
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py,Debit Note {0} has been created automatically,Debetnotat {0} ble opprettet automatisk
 apps/erpnext/erpnext/accounts/doctype/payment_order/payment_order.js,Create Payment Entries,Opprett betalingsoppføringer
 DocType: Supplier,Is Internal Supplier,Er Intern Leverandør
 DocType: Employee,Create User Permission,Opprett brukertillatelse
@@ -4046,7 +4057,6 @@
 DocType: Project User,Project Status,Prosjekt Status
 DocType: UOM,Check this to disallow fractions. (for Nos),Sjekk dette for å forby fraksjoner. (For Nos)
 DocType: Student Admission Program,Naming Series (for Student Applicant),Naming Series (Student søkeren)
-apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.py,UOM Conversion factor ({0} -&gt; {1}) not found for item: {2},UOM konverteringsfaktor ({0} -&gt; {1}) ikke funnet for varen: {2}
 apps/erpnext/erpnext/hr/doctype/retention_bonus/retention_bonus.py,Bonus Payment Date cannot be a past date,Bonus Betalingsdato kan ikke være en siste dato
 DocType: Travel Request,Copy of Invitation/Announcement,Kopi av invitasjon / kunngjøring
 DocType: Practitioner Service Unit Schedule,Practitioner Service Unit Schedule,Utøvere Service Unit Schedule
@@ -4195,6 +4205,7 @@
 apps/erpnext/erpnext/utilities/user_progress.py,Setup Company,Oppsett Company
 ,Lab Test Report,Lab Test Report
 DocType: Employee Benefit Application,Employee Benefit Application,Ansattes fordel søknad
+apps/erpnext/erpnext/accounts/doctype/invoice_discounting/invoice_discounting.py,Row({0}): {1} is already discounted in {2},Rad ({0}): {1} er allerede nedsatt innen {2}
 apps/erpnext/erpnext/hr/doctype/additional_salary/additional_salary.py,Additional Salary Component Exists.,Ekstra lønnskomponent eksisterer.
 DocType: Purchase Invoice,Unregistered,uregistrert
 DocType: Student Applicant,Application Date,Søknadsdato
@@ -4274,7 +4285,6 @@
 DocType: Journal Entry,Accounting Entries,Regnskaps Entries
 DocType: Job Card Time Log,Job Card Time Log,Jobbkort tidslogg
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,"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;."
-apps/erpnext/erpnext/education/doctype/instructor/instructor.py,Please setup Instructor Naming System in Education &gt; Education Settings,Oppsett Instructor Naming System i Education&gt; Education Settings
 DocType: Journal Entry,Paid Loan,Betalt lån
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py,Duplicate Entry. Please check Authorization Rule {0},Duplisere Entry. Vennligst sjekk Authorization Rule {0}
 DocType: Journal Entry Account,Reference Due Date,Referansedato
@@ -4291,7 +4301,6 @@
 apps/erpnext/erpnext/templates/pages/projects.html,No time sheets,Ingen timelister
 DocType: GoCardless Mandate,GoCardless Customer,GoCardless kunde
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py,Leave Type {0} cannot be carry-forwarded,La Type {0} kan ikke bære-videre
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Item Code &gt; Item Group &gt; Brand,Varekode&gt; Varegruppe&gt; Merke
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py,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
 DocType: Leave Encashment,Payroll,lønn
@@ -4407,7 +4416,6 @@
 DocType: Stock Ledger Entry,Actual Qty After Transaction,Selve Antall Etter Transaksjons
 ,Pending SO Items For Purchase Request,Avventer SO varer for kjøp Request
 apps/erpnext/erpnext/education/doctype/student_admission/student_admission.py,Student Admissions,student Opptak
-apps/erpnext/erpnext/accounts/party.py,{0} {1} is disabled,{0} {1} er deaktivert
 DocType: Supplier,Billing Currency,Faktureringsvaluta
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py,Extra Large,Extra large
 DocType: Loan,Loan Application,Lånesøknad
@@ -4484,7 +4492,6 @@
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py,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/accounts/doctype/accounting_dimension/accounting_dimension.py,Creating Dimensions...,Oppretter dimensjoner ...
 apps/erpnext/erpnext/education/doctype/student_group_creation_tool/student_group_creation_tool.py,Student Group Name is mandatory in row {0},Student Gruppenavn er obligatorisk i rad {0}
-DocType: Customer Credit Limit,Bypass credit limit_check,Omkjør kredittgrense_sjekk
 DocType: Homepage,Products to be shown on website homepage,Produkter som skal vises på nettstedet hjemmeside
 DocType: HR Settings,Password Policy,Passordpolicy
 apps/erpnext/erpnext/setup/doctype/customer_group/customer_group.js,This is a root customer group and cannot be edited.,"Dette er en rot kundegruppe, og kan ikke redigeres."
@@ -4778,6 +4785,7 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py,Row {0}: Advance against Customer must be credit,Rad {0}: Advance mot Kunden må være kreditt
 DocType: Quality Meeting,Quality Meeting,Kvalitetsmøte
 apps/erpnext/erpnext/accounts/doctype/account/account.js,Non-Group to Group,Non-gruppe til gruppe
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,Angi Naming Series for {0} via Setup&gt; Settings&gt; Naming Series
 DocType: Employee,ERPNext User,ERPNext Bruker
 apps/erpnext/erpnext/education/doctype/student_group_creation_tool/student_group_creation_tool.py,Batch is mandatory in row {0},Batch er obligatorisk i rad {0}
 apps/erpnext/erpnext/education/doctype/student_group_creation_tool/student_group_creation_tool.py,Batch is mandatory in row {0},Batch er obligatorisk i rad {0}
@@ -5075,6 +5083,7 @@
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py,No {0} found for Inter Company Transactions.,Ingen {0} funnet for Inter Company Transactions.
 DocType: Travel Itinerary,Rented Car,Lei bil
 apps/erpnext/erpnext/public/js/hub/components/profile_dialog.js,About your Company,Om firmaet ditt
+apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.js,Show Stock Ageing Data,Vis lagringsalderingsdata
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py,Credit To account must be a Balance Sheet account,Kreditt til kontoen må være en balansekonto
 DocType: Donor,Donor,donor
 DocType: Global Defaults,Disable In Words,Deaktiver I Ord
@@ -5089,8 +5098,10 @@
 DocType: Practitioner Schedule,Schedule Name,Planleggingsnavn
 apps/erpnext/erpnext/regional/doctype/gstr_3b_report/gstr_3b_report.py,Please enter GSTIN and state for the Company Address {0},Vennligst tast inn GSTIN og oppgi firmanavn {0}
 DocType: Currency Exchange,For Buying,For kjøp
+apps/erpnext/erpnext/setup/default_energy_point_rules.py,On Purchase Order Submission,Ved innkjøpsordreinnlevering
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js,Add All Suppliers,Legg til alle leverandører
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py,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/accounts/doctype/pricing_rule/pricing_rule.js,Customer &gt; Customer Group &gt; Territory,Kunde&gt; Kundegruppe&gt; Territorium
 DocType: Tally Migration,Parties,Partene
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js,Browse BOM,Bla BOM
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py,Secured Loans,Sikret lån
@@ -5122,6 +5133,7 @@
 apps/erpnext/erpnext/stock/doctype/item_alternative/item_alternative.py,Not allow to set alternative item for the item {0},Ikke tillat å angi alternativt element for elementet {0}
 apps/erpnext/erpnext/hr/doctype/leave_block_list/leave_block_list.py,Date is repeated,Dato gjentas
 apps/erpnext/erpnext/accounts/print_format/payment_receipt_voucher/payment_receipt_voucher.html,Authorized Signatory,Autorisert signatur
+apps/erpnext/erpnext/education/doctype/instructor/instructor.py,Please setup Instructor Naming System in Education &gt; Education Settings,Oppsett Instructor Naming System i Education&gt; Education Settings
 apps/erpnext/erpnext/regional/doctype/gstr_3b_report/gstr_3b_report.html,Net ITC Available(A) - (B),Netto ITC tilgjengelig (A) - (B)
 apps/erpnext/erpnext/education/doctype/fee_schedule/fee_schedule.js,Create Fees,Opprett gebyrer
 DocType: Project,Total Purchase Cost (via Purchase Invoice),Total anskaffelseskost (via fakturaen)
@@ -5142,6 +5154,7 @@
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.js,Message Sent,Melding Sendt
 apps/erpnext/erpnext/accounts/doctype/account/account.py,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/assets/report/fixed_asset_register/fixed_asset_register.py,Vendor Name,Leverandørnavn
 DocType: Quiz Result,Wrong,Feil
 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)
@@ -5387,6 +5400,7 @@
 DocType: Stock Settings,Auto Material Request,Auto Materiell Request
 DocType: Woocommerce Settings,API consumer secret,API forbruker hemmelig
 DocType: Delivery Note Item,Available Batch Qty at From Warehouse,Tilgjengelig Batch Antall på From Warehouse
+,Received Qty Amount,Mottatt antall
 DocType: Salary Slip,Gross Pay - Total Deduction - Loan Repayment,Brutto lønn - Totalt Fradrag - Loan Nedbetaling
 DocType: Bank Account,Last Integration Date,Siste integreringsdato
 DocType: Expense Claim,Expense Taxes and Charges,Utgiftsskatter og avgifter
@@ -5851,6 +5865,8 @@
 DocType: Drug Prescription,Hour,Time
 DocType: Restaurant Order Entry,Last Sales Invoice,Siste salgsfaktura
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py,Please select Qty against item {0},Vennligst velg antall til elementet {0}
+apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py,Latest Age,Siste alder
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js,Transfer Material to Supplier,Overføre materialet til Leverandør
 apps/erpnext/erpnext/hr/report/loan_repayment/loan_repayment.py,EMI,EMI
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py,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
@@ -5874,7 +5890,6 @@
 apps/erpnext/erpnext/hr/doctype/employee_benefit_application/employee_benefit_application.py,"An amount of {0} already claimed for the component {1},\
 						 set the amount equal or greater than {2}","En mengde på {0} som allerede er påkrevd for komponenten {1}, \ angi beløpet lik eller større enn {2}"
 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
 DocType: BOM Update Tool,The new BOM after replacement,Den nye BOM etter utskiftning
 ,Point of Sale,Utsalgssted
@@ -5996,7 +6011,6 @@
 DocType: Purchase Order Item,Blanket Order Rate,Blanket Bestillingsfrekvens
 ,Customer Ledger Summary,Sammendrag av kundehovedbok
 apps/erpnext/erpnext/hooks.py,Certification,sertifisering
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js,Are you sure you want to make debit note?,Er du sikker på at du vil gjøre debetnotat?
 DocType: Bank Guarantee,Clauses and Conditions,Klausuler og betingelser
 DocType: Serial No,Creation Document Type,Creation dokumenttype
 DocType: Amazon MWS Settings,ES,ES
@@ -6034,8 +6048,6 @@
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py,Financial Services,Finansielle Tjenester
 DocType: Student Sibling,Student ID,Student ID
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.js,For Quantity must be greater than zero,For kvantitet må være større enn null
-apps/erpnext/erpnext/hr/doctype/employee_transfer/employee_transfer.py,"Please delete the Employee <a href=""#Form/Employee/{0}"">{0}</a>\
-					to cancel this document","Slett ansatt <a href=""#Form/Employee/{0}"">{0}</a> \ for å avbryte dette dokumentet"
 apps/erpnext/erpnext/config/projects.py,Types of activities for Time Logs,Typer aktiviteter for Tid Logger
 DocType: Opening Invoice Creation Tool,Sales,Salgs
 DocType: Stock Entry Detail,Basic Amount,Grunnbeløp
@@ -6114,6 +6126,7 @@
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py,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,Send Supplier Emails,Send Leverandør e-post
+DocType: Asset Movement,ACC-ASM-.YYYY.-,ACC-ASM-.YYYY.-
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py,"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
 apps/erpnext/erpnext/hr/doctype/employee_onboarding/employee_onboarding.py,Submit this to create the Employee record,Send inn dette for å skape medarbeideroppføringen
@@ -6194,7 +6207,6 @@
 DocType: Sales Team,Contact No.,Kontaktnummer.
 apps/erpnext/erpnext/templates/includes/cart/cart_address.html,Billing Address is same as Shipping Address,Faktureringsadresse er den samme som leveringsadresse
 DocType: Bank Reconciliation,Payment Entries,Betalings Entries
-apps/erpnext/erpnext/erpnext_integrations/doctype/shopify_settings/shopify_settings.py,Access token or Shopify URL missing,Adkomst token eller Shopify URL mangler
 DocType: Location,Latitude,Breddegrad
 DocType: Work Order,Scrap Warehouse,skrap Warehouse
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py,"Warehouse required at Row No {0}, please set default warehouse for the item {1} for the company {2}","Lager som kreves ved rad nr. {0}, angi standardlager for elementet {1} for firmaet {2}"
@@ -6239,7 +6251,6 @@
 DocType: Job Offer Term,Value / Description,Verdi / beskrivelse
 apps/erpnext/erpnext/controllers/accounts_controller.py,"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
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js,Are you sure you want to make credit note?,Er du sikker på at du vil føre kreditnota?
 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,Debit and Credit not equal for {0} #{1}. Difference is {2}.,Debet- og kredittkort ikke lik for {0} # {1}. Forskjellen er {2}.
@@ -6364,6 +6375,7 @@
 DocType: Purchase Invoice,Taxes and Charges Added,Skatter og avgifter legges
 apps/erpnext/erpnext/assets/doctype/asset/asset.py,Depreciation Row {0}: Next Depreciation Date cannot be before Available-for-use Date,Avskrivningsraden {0}: Neste avskrivningsdato kan ikke være før Tilgjengelig-til-bruk-dato
 ,Sales Funnel,Sales trakt
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Item Code &gt; Item Group &gt; Brand,Varekode&gt; Varegruppe&gt; Merke
 apps/erpnext/erpnext/setup/doctype/company/company.py,Abbreviation is mandatory,Forkortelsen er obligatorisk
 DocType: Project,Task Progress,Task Progress
 apps/erpnext/erpnext/templates/includes/navbar/navbar_items.html,Cart,Kurven
@@ -6608,6 +6620,7 @@
 DocType: Employee Grade,Employee Grade,Ansatte grad
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py,Piecework,Akkord
 DocType: GSTR 3B Report,June,juni
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Supplier &gt; Supplier Type,Leverandør&gt; Leverandørtype
 DocType: Share Balance,From No,Fra nr
 DocType: Shift Type,Early Exit Grace Period,Tidlig utgangsperiode
 DocType: Task,Actual Time (in Hours),Virkelig tid (i timer)
@@ -6892,6 +6905,7 @@
 DocType: Warehouse,Warehouse Name,Warehouse Name
 DocType: Naming Series,Select Transaction,Velg Transaksjons
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py,Please enter Approving Role or Approving User,Skriv inn Godkjenne Rolle eller Godkjenne User
+apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.py,UOM Conversion factor ({0} -&gt; {1}) not found for item: {2},UOM konverteringsfaktor ({0} -&gt; {1}) ikke funnet for varen: {2}
 apps/erpnext/erpnext/support/doctype/service_level_agreement/service_level_agreement.py,Service Level Agreement with Entity Type {0} and Entity {1} already exists.,Servicenivåavtale med enhetstype {0} og enhet {1} eksisterer allerede.
 DocType: Journal Entry,Write Off Entry,Skriv Off Entry
 DocType: BOM,Rate Of Materials Based On,Valuta materialer basert på
@@ -7082,6 +7096,7 @@
 DocType: Quality Inspection Reading,Quality Inspection Reading,Quality Inspection Reading
 apps/erpnext/erpnext/stock/doctype/stock_settings/stock_settings.py,`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/stock/report/stock_balance/stock_balance.py,Earliest Age,Tidligste alder
 apps/erpnext/erpnext/utilities/user_progress.py,Set a sales goal you'd like to achieve for your company.,Sett et salgsmål du vil oppnå for din bedrift.
 DocType: Quality Goal,Revision,Revisjon
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js,Healthcare Services,Helsetjenester
@@ -7125,6 +7140,7 @@
 apps/erpnext/erpnext/healthcare/doctype/patient_encounter/patient_encounter.js,Schedule Discharge,Planlegg utladning
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py,Cheques and Deposits incorrectly cleared,Sjekker og Innskudd feil ryddet
 DocType: Homepage Section Card,Homepage Section Card,Startside seksjonskort
+,Amount To Be Billed,Beløp som skal faktureres
 apps/erpnext/erpnext/accounts/doctype/account/account.py,Account {0}: You can not assign itself as parent account,Konto {0}: Du kan ikke tildele seg selv som forelder konto
 DocType: Purchase Invoice Item,Price List Rate,Prisliste Rate
 apps/erpnext/erpnext/utilities/activation.py,Create customer quotes,Opprett kunde sitater
@@ -7177,6 +7193,7 @@
 DocType: Supplier Scorecard Criteria,Supplier Scorecard Criteria,Leverandør Scorecard Kriterier
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py,Please select Start Date and End Date for Item {0},Vennligst velg startdato og sluttdato for Element {0}
 DocType: Maintenance Schedule,MAT-MSH-.YYYY.-,MAT-MSH-.YYYY.-
+,Amount to Receive,Beløp å motta
 apps/erpnext/erpnext/education/doctype/student_group_creation_tool/student_group_creation_tool.py,Course is mandatory in row {0},Kurset er obligatorisk i rad {0}
 apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py,From date can not be greater than than To date,Fra dato kan ikke være større enn til dags dato
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py,To date cannot be before from date,Til dags dato kan ikke være før fra dato
@@ -7426,7 +7443,6 @@
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js,BOM and Manufacturing Quantity are required,BOM og Industri Antall kreves
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js,Ageing Range 2,Aldring Range 2
 DocType: SG Creation Tool Course,Max Strength,Max Strength
-apps/erpnext/erpnext/accounts/doctype/account/account.py,"Account {0} already exists in child company {1}. The following fields have different values, they should be same:<ul><li>{2}</li></ul>","Konto {0} finnes allerede i barneselskapet {1}. Følgende felt har forskjellige verdier, de skal være like: <ul><li> {2} </li></ul>"
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py,Installing presets,Installere forhåndsinnstillinger
 DocType: Fee Schedule,EDU-FSH-.YYYY.-,EDU-FSH-.YYYY.-
 apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js,No Delivery Note selected for Customer {},Ingen leveringsnotering valgt for kunden {}
@@ -7637,6 +7653,7 @@
 DocType: Delivery Note,Print Without Amount,Skriv ut Uten Beløp
 apps/erpnext/erpnext/accounts/report/asset_depreciation_ledger/asset_depreciation_ledger.py,Depreciation Date,avskrivninger Dato
 ,Work Orders in Progress,Arbeidsordrer pågår
+DocType: Customer Credit Limit,Bypass Credit Limit Check,Omkjør kredittgrense-sjekk
 DocType: Issue,Support Team,Support Team
 apps/erpnext/erpnext/stock/report/batch_item_expiry_status/batch_item_expiry_status.py,Expiry (In Days),Utløps (i dager)
 DocType: Appraisal,Total Score (Out of 5),Total poengsum (av 5)
@@ -7823,6 +7840,7 @@
 DocType: Sales Invoice,Customer GSTIN,Kunde GSTIN
 DocType: Crop Cycle,List of diseases detected on the field. When selected it'll automatically add a list of tasks to deal with the disease ,"Liste over sykdommer oppdaget på feltet. Når den er valgt, vil den automatisk legge til en liste over oppgaver for å håndtere sykdommen"
 apps/erpnext/erpnext/manufacturing/page/bom_comparison_tool/bom_comparison_tool.js,BOM 1,BOM 1
+apps/erpnext/erpnext/assets/report/fixed_asset_register/fixed_asset_register.py,Asset Id,Eiendoms-id
 apps/erpnext/erpnext/healthcare/doctype/healthcare_service_unit/healthcare_service_unit.js,This is a root healthcare service unit and cannot be edited.,Dette er en rotasjonshelsetjenestenhet og kan ikke redigeres.
 DocType: Asset Repair,Repair Status,Reparasjonsstatus
 apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.js,"Requested Qty: Quantity requested for purchase, but not ordered.","Forespurt mengde: Mengde forespurt for kjøp, men ikke bestilt."
diff --git a/erpnext/translations/pl.csv b/erpnext/translations/pl.csv
index 426a175..fa4bacf 100644
--- a/erpnext/translations/pl.csv
+++ b/erpnext/translations/pl.csv
@@ -289,7 +289,6 @@
 DocType: Loan,Repay Over Number of Periods,Spłaty przez liczbę okresów
 apps/erpnext/erpnext/manufacturing/report/bom_stock_report/bom_stock_report.py,Quantity to Produce can not be less than Zero,Ilość do wyprodukowania nie może być mniejsza niż zero
 DocType: Stock Entry,Additional Costs,Dodatkowe koszty
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Customer &gt; Customer Group &gt; Territory,Klient&gt; Grupa klientów&gt; Terytorium
 apps/erpnext/erpnext/accounts/doctype/account/account.py,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
@@ -587,6 +586,7 @@
 DocType: Healthcare Settings,Create documents for sample collection,Tworzenie dokumentów do pobierania próbek
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py,Payment against {0} {1} cannot be greater than Outstanding Amount {2},Płatność przed {0} {1} nie może być większa niż kwota kredytu pozostała {2}
 apps/erpnext/erpnext/patches/v11_0/add_healthcare_service_unit_tree_root.py,All Healthcare Service Units,Wszystkie jednostki służby zdrowia
+apps/erpnext/erpnext/setup/default_energy_point_rules.py,On Converting Opportunity,O możliwościach konwersji
 DocType: Bank Account,Address HTML,Adres HTML
 DocType: Lead,Mobile No.,Nr tel. Komórkowego
 apps/erpnext/erpnext/selling/doctype/pos_closing_voucher/closing_voucher_details.html,Mode of Payments,Tryb płatności
@@ -651,7 +651,6 @@
 DocType: Accounting Dimension,Dimension Name,Nazwa wymiaru
 apps/erpnext/erpnext/healthcare/setup.py,Resistant,Odporny
 apps/erpnext/erpnext/hotels/doctype/hotel_room_reservation/hotel_room_reservation.py,Please set Hotel Room Rate on {},Ustaw stawkę hotelową na {}
-apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py,Please setup numbering series for Attendance via Setup &gt; Numbering Series,Skonfiguruj serie numeracji dla frekwencji poprzez Ustawienia&gt; Serie numeracji
 DocType: Journal Entry,Multi Currency,Wielowalutowy
 DocType: Bank Statement Transaction Invoice Item,Invoice Type,Typ faktury
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py,Valid from date must be less than valid upto date,Ważny od daty musi być krótszy niż data ważności
@@ -769,6 +768,7 @@
 apps/erpnext/erpnext/accounts/page/pos/pos.js,Create a new Customer,Tworzenie nowego klienta
 apps/erpnext/erpnext/non_profit/report/expiring_memberships/expiring_memberships.py,Expiring On,Wygasający
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,"If multiple Pricing Rules continue to prevail, users are asked to set Priority manually to resolve conflict.","Jeśli wiele Zasady ustalania cen nadal dominować, użytkownicy proszeni są o ustawienie Priorytet ręcznie rozwiązać konflikt."
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js,Purchase Return,Zwrot zakupu
 apps/erpnext/erpnext/utilities/activation.py,Create Purchase Orders,Stwórz zamówienie zakupu
 ,Purchase Register,Rejestracja Zakupu
 apps/erpnext/erpnext/healthcare/doctype/patient/patient.py,Patient not found,Nie znaleziono pacjenta
@@ -784,7 +784,6 @@
 DocType: Location,Area UOM,Obszar UOM
 apps/erpnext/erpnext/manufacturing/doctype/workstation/workstation.py,Workstation is closed on the following dates as per Holiday List: {0},Stacja robocza jest zamknięta w następujących terminach wg listy wakacje: {0}
 apps/erpnext/erpnext/selling/page/sales_funnel/sales_funnel.py,Opportunities,Możliwości
-apps/erpnext/erpnext/www/all-products/index.html,Clear filters,Wyczyść filtry
 DocType: Lab Test Template,Single,Pojedynczy
 DocType: Compensatory Leave Request,Work From Date,Praca od daty
 DocType: Salary Slip,Total Loan Repayment,Suma spłaty kredytu
@@ -828,6 +827,7 @@
 apps/erpnext/erpnext/education/doctype/program_enrollment_tool/program_enrollment_tool.py,Mandatory field - Academic Year,Pole obowiązkowe - rok akademicki
 apps/erpnext/erpnext/education/doctype/program_enrollment_tool/program_enrollment_tool.py,Mandatory field - Academic Year,Pole obowiązkowe - rok akademicki
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py,{0} {1} is not associated with {2} {3},{0} {1} nie jest powiązane z {2} {3}
+DocType: Opportunity,Converted By,Przekształcony przez
 apps/erpnext/erpnext/public/js/hub/components/ReviewArea.vue,You need to login as a Marketplace User before you can add any reviews.,"Musisz się zalogować jako użytkownik portalu, aby móc dodawać recenzje."
 apps/erpnext/erpnext/manufacturing/doctype/job_card/job_card.py,Row {0} : Operation is required against the raw material item {1},Wiersz {0}: operacja jest wymagana względem elementu surowcowego {1}
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py,Please set default payable account for the company {0},Proszę ustawić domyślne konto płatne dla firmy {0}
@@ -854,6 +854,8 @@
 DocType: Sales Invoice,Total Qty,Razem szt
 apps/erpnext/erpnext/education/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py,Guardian2 Email ID,Identyfikator e-mail Guardian2
 apps/erpnext/erpnext/education/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py,Guardian2 Email ID,Identyfikator e-mail Guardian2
+apps/erpnext/erpnext/hr/doctype/employee_transfer/employee_transfer.py,"Please delete the Employee <a href=""#Form/Employee/{0}"">{0}</a>\
+					to cancel this document","Usuń pracownika <a href=""#Form/Employee/{0}"">{0}</a> \, aby anulować ten dokument"
 DocType: Item,Show in Website (Variant),Pokaż w Serwisie (Variant)
 DocType: Employee,Health Concerns,Problemy Zdrowotne
 DocType: Payroll Entry,Select Payroll Period,Wybierz Okres Payroll
@@ -914,7 +916,6 @@
 DocType: Codification Table,Codification Table,Tabela kodyfikacji
 DocType: Timesheet Detail,Hrs,godziny
 apps/erpnext/erpnext/manufacturing/page/bom_comparison_tool/bom_comparison_tool.js,Changes in {0},Zmiany w {0}
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js,Please select Company,Proszę wybrać firmę
 DocType: Employee Skill,Employee Skill,Umiejętność pracownika
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.js,Difference Account,Konto Różnic
 DocType: Pricing Rule,Discount on Other Item,Rabat na inny przedmiot
@@ -983,6 +984,7 @@
 DocType: BOM,Operating Cost,Koszty Operacyjne
 DocType: Crop,Produced Items,Produkowane przedmioty
 DocType: Bank Statement Transaction Entry,Match Transaction to Invoices,Dopasuj transakcję do faktur
+apps/erpnext/erpnext/erpnext_integrations/exotel_integration.py,Error in Exotel incoming call,Błąd połączenia przychodzącego Exotel
 DocType: Sales Order Item,Gross Profit,Zysk brutto
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js,Unblock Invoice,Odblokuj fakturę
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py,Increment cannot be 0,Przyrost nie może być 0
@@ -1198,6 +1200,7 @@
 DocType: Activity Cost,Activity Type,Rodzaj aktywności
 DocType: Request for Quotation,For individual supplier,Dla indywidualnego dostawcy
 DocType: BOM Operation,Base Hour Rate(Company Currency),Baza Hour Rate (Spółka waluty)
+,Qty To Be Billed,Ilość do naliczenia
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py,Delivered Amount,Dostarczone Ilość
 apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.js,Reserved Qty for Production: Raw materials quantity to make manufacturing items.,Zarezerwowane Ilość na produkcję: Ilość surowców do produkcji artykułów.
 DocType: Loyalty Point Entry Redemption,Redemption Date,Data wykupu
@@ -1319,7 +1322,7 @@
 apps/erpnext/erpnext/education/doctype/student_group/student_group.py,Please select Program,Proszę wybrać Program
 apps/erpnext/erpnext/education/doctype/student_group/student_group.py,Please select Program,Proszę wybrać Program
 DocType: Project,Estimated Cost,Szacowany koszt
-DocType: Request for Quotation,Link to material requests,Link do żądań materialnych
+DocType: Supplier Quotation,Link to material requests,Link do żądań materialnych
 apps/erpnext/erpnext/public/js/hub/pages/Publish.vue,Publish,Publikować
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py,Aerospace,Lotnictwo
 ,Fichier des Ecritures Comptables [FEC],Fichier des Ecritures Comptables [FEC]
@@ -1332,6 +1335,7 @@
 apps/erpnext/erpnext/utilities/transaction_base.py,Invalid Posting Time,Nieprawidłowy czas publikacji
 DocType: Salary Component,Condition and Formula,Stan i wzór
 DocType: Lead,Campaign Name,Nazwa kampanii
+apps/erpnext/erpnext/setup/default_energy_point_rules.py,On Task Completion,Po zakończeniu zadania
 apps/erpnext/erpnext/hr/doctype/compensatory_leave_request/compensatory_leave_request.py,There is no leave period in between {0} and {1},Nie ma okresu próbnego między {0} a {1}
 DocType: Fee Validity,Healthcare Practitioner,Praktyk opieki zdrowotnej
 DocType: Hotel Room,Capacity,Pojemność
@@ -1696,7 +1700,6 @@
 DocType: Quality Feedback Template,Quality Feedback Template,Szablon opinii o jakości
 apps/erpnext/erpnext/config/education.py,LMS Activity,Aktywność LMS
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py,Internet Publishing,Wydawnictwa internetowe
-DocType: Prescription Duration,Number,Numer
 apps/erpnext/erpnext/accounts/doctype/opening_invoice_creation_tool/opening_invoice_creation_tool.js,Creating {0} Invoice,Tworzenie faktury {0}
 DocType: Medical Code,Medical Code Standard,Standardowy kod medyczny
 DocType: Soil Texture,Clay Composition (%),Skład gliny (%)
@@ -1771,6 +1774,7 @@
 DocType: Support Settings,Get Started Sections,Pierwsze kroki
 DocType: Lead,CRM-LEAD-.YYYY.-,CRM-LEAD-.RRRR.-
 DocType: Invoice Discounting,Sanctioned,usankcjonowane
+,Base Amount,Podstawowa kwota
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.js,Total Contribution Amount: {0},Łączna kwota dotacji: {0}
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py,Row #{0}: Please specify Serial No for Item {1},Wiersz # {0}: Proszę podać nr seryjny dla pozycji {1}
 DocType: Payroll Entry,Salary Slips Submitted,Przesłane wynagrodzenie
@@ -1992,6 +1996,7 @@
 apps/erpnext/erpnext/utilities/user_progress.py,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.
 DocType: Accounting Dimension,Dimension Defaults,Domyślne wymiary
 apps/erpnext/erpnext/crm/report/prospects_engaged_but_not_converted/prospects_engaged_but_not_converted.js,Minimum Lead Age (Days),Minimalny wiek ołowiu (dni)
+apps/erpnext/erpnext/assets/report/fixed_asset_register/fixed_asset_register.py,Available For Use Date,Data użycia
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py,All BOMs,Wszystkie LM
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js,Create Inter Company Journal Entry,Utwórz wpis do dziennika firmy
 DocType: Company,Parent Company,Przedsiębiorstwo macierzyste
@@ -2056,6 +2061,7 @@
 ,IRS 1099,IRS 1099
 DocType: Salary Slip,Leave Without Pay,Urlop bezpłatny
 DocType: Payment Request,Outward,Zewnętrzny
+apps/erpnext/erpnext/setup/default_energy_point_rules.py,On {0} Creation,W dniu {0} Creation
 apps/erpnext/erpnext/regional/doctype/gstr_3b_report/gstr_3b_report.html,State/UT Tax,Podatek stanowy / UT
 ,Trial Balance for Party,Trial Balance for Party
 ,Gross and Net Profit Report,Raport zysku brutto i netto
@@ -2173,6 +2179,7 @@
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js,Make Stock Entry,Zrób wejście na giełdę
 DocType: Hotel Room Reservation,Hotel Reservation User,Użytkownik rezerwacji hotelu
 apps/erpnext/erpnext/projects/doctype/project/project.js,Set Status,Ustaw status
+apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py,Please setup numbering series for Attendance via Setup &gt; Numbering Series,Skonfiguruj serie numeracji dla frekwencji poprzez Ustawienia&gt; Serie numeracji
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py,Please select prefix first,Wybierz prefiks
 DocType: Contract,Fulfilment Deadline,Termin realizacji
 apps/erpnext/erpnext/public/js/hub/pages/Home.vue,Near you,Blisko Ciebie
@@ -2188,6 +2195,7 @@
 DocType: Announcement,All Students,Wszyscy uczniowie
 apps/erpnext/erpnext/assets/doctype/asset/asset.py,Item {0} must be a non-stock item,Element {0} musi być elementem non-stock
 apps/erpnext/erpnext/stock/doctype/batch/batch.js,View Ledger,Podgląd księgi
+DocType: Cost Center,Lft,lft
 DocType: Grading Scale,Intervals,przedziały
 DocType: Bank Statement Transaction Entry,Reconciled Transactions,Uzgodnione transakcje
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py,Earliest,Najwcześniejszy
@@ -2303,6 +2311,7 @@
 apps/erpnext/erpnext/hr/doctype/employee_benefit_application/employee_benefit_application.py,As per your assigned Salary Structure you cannot apply for benefits,Zgodnie z przypisaną Ci strukturą wynagrodzeń nie możesz ubiegać się o świadczenia
 apps/erpnext/erpnext/stock/doctype/item/item.py,Website Image should be a public file or website URL,Strona Obraz powinien być plik publiczny lub adres witryny
 DocType: Purchase Invoice Item,BOM,BOM
+apps/erpnext/erpnext/stock/doctype/item/item.py,Duplicate entry in Manufacturers table,Zduplikowany wpis w tabeli producentów
 apps/erpnext/erpnext/setup/doctype/item_group/item_group.js,This is a root item group and cannot be edited.,To jest grupa przedmiotów root i nie mogą być edytowane.
 apps/erpnext/erpnext/accounts/doctype/account/account.js,Merge,Łączyć
 DocType: Journal Entry Account,Purchase Order,Zamówienie
@@ -2449,7 +2458,6 @@
 DocType: Asset,Depreciation Schedules,Rozkłady amortyzacyjne
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.js,Create Sales Invoice,Utwórz fakturę sprzedaży
 apps/erpnext/erpnext/regional/doctype/gstr_3b_report/gstr_3b_report.html,Ineligible ITC,Niekwalifikowany ITC
-apps/erpnext/erpnext/erpnext_integrations/doctype/shopify_settings/shopify_settings.py,"Support for public app is deprecated. Please setup private app, for more details refer user manual","Obsługa aplikacji publicznej jest przestarzała. Proszę ustawić prywatną aplikację, aby uzyskać więcej informacji, zapoznaj się z instrukcją obsługi"
 DocType: Task,Dependent Tasks,Zadania zależne
 apps/erpnext/erpnext/regional/report/gstr_1/gstr_1.py,Following accounts might be selected in GST Settings:,W ustawieniach GST można wybrać następujące konta:
 apps/erpnext/erpnext/manufacturing/report/bom_stock_report/bom_stock_report.js,Quantity to Produce,Ilość do wyprodukowania
@@ -2702,6 +2710,7 @@
 DocType: Water Analysis,Container,Pojemnik
 apps/erpnext/erpnext/regional/report/gstr_1/gstr_1.py,Please set valid GSTIN No. in Company Address,Ustaw prawidłowy numer GSTIN w adresie firmy
 apps/erpnext/erpnext/education/utils.py,Student {0} - {1} appears Multiple times in row {2} & {3},Student {0} - {1} pojawia się wielokrotnie w wierszu {2} i {3}
+apps/erpnext/erpnext/selling/doctype/customer/customer.py,Following fields are mandatory to create address:,"Aby utworzyć adres, należy podać następujące pola:"
 DocType: Item Alternative,Two-way,Dwukierunkowy
 DocType: Item,Manufacturers,Producenci
 apps/erpnext/erpnext/accounts/deferred_revenue.py,Error while processing deferred accounting for {0},Błąd podczas przetwarzania odroczonego rozliczania dla {0}
@@ -2777,9 +2786,9 @@
 DocType: Employee,HR-EMP-,HR-EMP-
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py,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: Quality Meeting Minutes,Quality Meeting Minutes,Protokół spotkania jakości
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Supplier &gt; Supplier Type,Dostawca&gt; Rodzaj dostawcy
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py,Employee Referral,Referencje pracownika
 DocType: Student Group,Set 0 for no limit,Ustaw 0 oznacza brak limitu
+DocType: Cost Center,rgt,rgt
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py,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."
 DocType: Customer,Primary Address and Contact Detail,Główny adres i dane kontaktowe
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.js,Resend Payment Email,Wyślij ponownie płatności E-mail
@@ -2889,7 +2898,6 @@
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py,Against Supplier Invoice {0} dated {1},Przeciwko Dostawcę faktury {0} {1} dnia
 DocType: Customer,Default Price List,Domyślny cennik
 apps/erpnext/erpnext/assets/doctype/asset/asset.py,Asset Movement record {0} created,Rekord Ruch atutem {0} tworzone
-apps/erpnext/erpnext/utilities/page/leaderboard/leaderboard.js,No items found.,Nie znaleziono żadnych przedmiotów.
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py,You cannot delete Fiscal Year {0}. Fiscal Year {0} is set as default in Global Settings,Nie można usunąć Fiscal Year {0}. Rok fiskalny {0} jest ustawiona jako domyślna w Ustawienia globalne
 DocType: Share Transfer,Equity/Liability Account,Rachunek akcyjny / zobowiązanie
 apps/erpnext/erpnext/setup/doctype/customer_group/customer_group.py,A customer with the same name already exists,Klient o tej samej nazwie już istnieje
@@ -2905,6 +2913,7 @@
 apps/erpnext/erpnext/selling/doctype/customer/customer.py,Credit limit has been crossed for customer {0} ({1}/{2}),Limit kredytowy został przekroczony dla klienta {0} ({1} / {2})
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py,Customer required for 'Customerwise Discount',
 apps/erpnext/erpnext/config/accounting.py,Update bank payment dates with journals.,Aktualizacja terminów płatności banowych
+,Billed Qty,Rozliczona ilość
 apps/erpnext/erpnext/stock/doctype/item/item_dashboard.py,Pricing,Ustalanie cen
 DocType: Employee,Attendance Device ID (Biometric/RF tag ID),Identyfikator urządzenia obecności (identyfikator biometryczny / RF)
 DocType: Quotation,Term Details,Szczegóły warunków
@@ -2927,6 +2936,7 @@
 DocType: Share Transfer,Asset Account,Konto aktywów
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js,New release date should be in the future,Nowa data wydania powinna być w przyszłości
 DocType: Purchase Invoice,End date of current invoice's period,Data zakończenia okresu bieżącej faktury
+apps/erpnext/erpnext/hr/doctype/employee/employee.py,Please setup Employee Naming System in Human Resource &gt; HR Settings,Skonfiguruj system nazewnictwa pracowników w dziale Zasoby ludzkie&gt; Ustawienia HR
 DocType: Lab Test,Technician Name,Nazwa technika
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py,"Cannot ensure delivery by Serial No as \
 					Item {0} is added with and without Ensure Delivery by \
@@ -2934,6 +2944,7 @@
 DocType: Accounts Settings,Unlink Payment on Cancellation of Invoice,Odłączanie Przedpłata na Anulowanie faktury
 DocType: Bank Reconciliation,From Date,Od daty
 apps/erpnext/erpnext/hr/doctype/vehicle_log/vehicle_log.py,Current Odometer reading entered should be greater than initial Vehicle Odometer {0},Aktualny stan licznika kilometrów wszedł powinien być większy niż początkowy stan licznika kilometrów {0}
+,Purchase Order Items To Be Received or Billed,Zakup Zamów przedmioty do odebrania lub naliczenia
 DocType: Restaurant Reservation,No Show,Brak pokazu
 apps/erpnext/erpnext/regional/india/utils.py,You must be a registered supplier to generate e-Way Bill,"Musisz być zarejestrowanym dostawcą, aby wygenerować e-Way Bill"
 DocType: Shipping Rule Country,Shipping Rule Country,Zasada Wysyłka Kraj
@@ -2976,6 +2987,7 @@
 apps/erpnext/erpnext/templates/generators/item/item_add_to_cart.html,View in Cart,Zobacz Koszyk
 DocType: Employee Checkin,Shift Actual Start,Shift Actual Start
 DocType: Tally Migration,Is Day Book Data Imported,Importowane są dane dzienników
+,Purchase Order Items To Be Received or Billed1,"Zakup Zamów przedmioty, które zostaną odebrane lub naliczone 1"
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py,Marketing Expenses,Wydatki marketingowe
 apps/erpnext/erpnext/stock/doctype/pick_list/pick_list.py,{0} units of {1} is not available.,{0} jednostek {1} jest niedostępne.
 ,Item Shortage Report,Element Zgłoś Niedobór
@@ -3204,7 +3216,6 @@
 apps/erpnext/erpnext/public/js/call_popup/call_popup.js,View all issues from {0},Wyświetl wszystkie problemy z {0}
 DocType: Quality Inspection,MAT-QA-.YYYY.-,MAT-QA-.YYYY.-
 DocType: Quality Meeting Table,Quality Meeting Table,Tabela jakości spotkań
-apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,Ustaw Serie nazw dla {0} poprzez Ustawienia&gt; Ustawienia&gt; Serie nazw
 apps/erpnext/erpnext/templates/pages/help.html,Visit the forums,Odwiedź fora
 DocType: Student,Student Mobile Number,Student Mobile Number
 DocType: Item,Has Variants,Ma Warianty
@@ -3349,6 +3360,7 @@
 ,Campaign Efficiency,Skuteczność Kampanii
 ,Campaign Efficiency,Skuteczność Kampanii
 DocType: Discussion,Discussion,Dyskusja
+apps/erpnext/erpnext/setup/default_energy_point_rules.py,On Sales Order Submission,Przy składaniu zamówienia sprzedaży
 DocType: Bank Transaction,Transaction ID,Identyfikator transakcji
 DocType: Payroll Entry,Deduct Tax For Unsubmitted Tax Exemption Proof,Odliczanie podatku za nieprzedstawiony dowód zwolnienia podatkowego
 DocType: Volunteer,Anytime,W każdej chwili
@@ -3356,7 +3368,6 @@
 DocType: Employee Tax Exemption Proof Submission,Employee Tax Exemption Proof Submission,Świadectwo zwolnienia podatkowego dla pracowników
 DocType: Patient,Surgical History,Historia chirurgiczna
 DocType: Bank Statement Settings Item,Mapped Header,Mapowany nagłówek
-apps/erpnext/erpnext/hr/doctype/employee/employee.py,Please setup Employee Naming System in Human Resource &gt; HR Settings,Skonfiguruj system nazewnictwa pracowników w dziale Zasoby ludzkie&gt; Ustawienia HR
 DocType: Employee,Resignation Letter Date,Data wypowiedzenia
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Pricing Rules are further filtered based on quantity.,Zasady ustalania cen są dalej filtrowane na podstawie ilości.
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py,Please set the Date Of Joining for employee {0},Proszę ustawić datę dołączenia do pracownika {0}
@@ -3371,6 +3382,7 @@
 DocType: Bank Statement Settings,Mapped Items,Zmapowane elementy
 DocType: Amazon MWS Settings,IT,TO
 DocType: Chapter,Chapter,Rozdział
+,Fixed Asset Register,Naprawiono rejestr aktywów
 apps/erpnext/erpnext/utilities/user_progress.py,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,Select BOM and Qty for Production,Wybierz BOM i ilosc Produkcji
@@ -3506,7 +3518,6 @@
 apps/erpnext/erpnext/templates/emails/reorder_item.html,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
 apps/erpnext/erpnext/controllers/accounts_controller.py,Account {0} is invalid. Account Currency must be {1},Konto {0} jest nieprawidłowe. Walutą konta musi być {1}
 apps/erpnext/erpnext/hr/doctype/salary_structure_assignment/salary_structure_assignment.py,From Date {0} cannot be after employee's relieving Date {1},Od daty {0} nie może być po zwolnieniu pracownika Data {1}
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py,Debit Note {0} has been created automatically,Nota debetowa {0} została utworzona automatycznie
 apps/erpnext/erpnext/accounts/doctype/payment_order/payment_order.js,Create Payment Entries,Utwórz wpisy płatności
 DocType: Supplier,Is Internal Supplier,Dostawca wewnętrzny
 DocType: Employee,Create User Permission,Utwórz uprawnienia użytkownika
@@ -4070,7 +4081,6 @@
 DocType: Project User,Project Status,Status projektu
 DocType: UOM,Check this to disallow fractions. (for Nos),Zaznacz to by zakazać ułamków (dla liczby jednostek)
 DocType: Student Admission Program,Naming Series (for Student Applicant),Naming Series (dla Studenta Wnioskodawcy)
-apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.py,UOM Conversion factor ({0} -&gt; {1}) not found for item: {2},Nie znaleziono współczynnika konwersji UOM ({0} -&gt; {1}) dla elementu: {2}
 apps/erpnext/erpnext/hr/doctype/retention_bonus/retention_bonus.py,Bonus Payment Date cannot be a past date,Data płatności premii nie może być datą przeszłą
 DocType: Travel Request,Copy of Invitation/Announcement,Kopia zaproszenia / ogłoszenia
 DocType: Practitioner Service Unit Schedule,Practitioner Service Unit Schedule,Harmonogram jednostki służby zdrowia
@@ -4239,6 +4249,7 @@
 apps/erpnext/erpnext/utilities/user_progress.py,Setup Company,Konfiguracja firmy
 ,Lab Test Report,Raport z testów laboratoryjnych
 DocType: Employee Benefit Application,Employee Benefit Application,Świadczenie pracownicze
+apps/erpnext/erpnext/accounts/doctype/invoice_discounting/invoice_discounting.py,Row({0}): {1} is already discounted in {2},Wiersz ({0}): {1} jest już zdyskontowany w {2}
 apps/erpnext/erpnext/hr/doctype/additional_salary/additional_salary.py,Additional Salary Component Exists.,Istnieje dodatkowy składnik wynagrodzenia.
 DocType: Purchase Invoice,Unregistered,Niezarejestrowany
 DocType: Student Applicant,Application Date,Data złożenia wniosku
@@ -4318,7 +4329,6 @@
 DocType: Journal Entry,Accounting Entries,Zapisy księgowe
 DocType: Job Card Time Log,Job Card Time Log,Dziennik czasu pracy karty
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,"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;."
-apps/erpnext/erpnext/education/doctype/instructor/instructor.py,Please setup Instructor Naming System in Education &gt; Education Settings,Skonfiguruj system nazewnictwa instruktorów w sekcji Edukacja&gt; Ustawienia edukacji
 DocType: Journal Entry,Paid Loan,Płatna pożyczka
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py,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
@@ -4335,7 +4345,6 @@
 apps/erpnext/erpnext/templates/pages/projects.html,No time sheets,Brak karty czasu
 DocType: GoCardless Mandate,GoCardless Customer,Klient bez karty
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py,Leave Type {0} cannot be carry-forwarded,Typ Nieobecności {0} nie może zostać przeniesiony w przyszłość
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Item Code &gt; Item Group &gt; Brand,Kod pozycji&gt; Grupa produktów&gt; Marka
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py,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
 DocType: Leave Encashment,Payroll,Lista płac
@@ -4451,7 +4460,6 @@
 DocType: Stock Ledger Entry,Actual Qty After Transaction,Rzeczywista Ilość Po Transakcji
 ,Pending SO Items For Purchase Request,Oczekiwane elementy Zamówień Sprzedaży na Prośbę Zakupu
 apps/erpnext/erpnext/education/doctype/student_admission/student_admission.py,Student Admissions,Rekrutacja dla studentów
-apps/erpnext/erpnext/accounts/party.py,{0} {1} is disabled,{0} {1} jest wyłączony
 DocType: Supplier,Billing Currency,Waluta rozliczenia
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py,Extra Large,Bardzo Duży
 DocType: Loan,Loan Application,Podanie o pożyczkę
@@ -4528,7 +4536,6 @@
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py,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/accounts/doctype/accounting_dimension/accounting_dimension.py,Creating Dimensions...,Tworzenie wymiarów ...
 apps/erpnext/erpnext/education/doctype/student_group_creation_tool/student_group_creation_tool.py,Student Group Name is mandatory in row {0},Student Nazwa grupy jest obowiązkowe w wierszu {0}
-DocType: Customer Credit Limit,Bypass credit limit_check,Kontrola obejścia limitu kredytu
 DocType: Homepage,Products to be shown on website homepage,Produkty przeznaczone do pokazania na głównej stronie
 DocType: HR Settings,Password Policy,Polityka haseł
 apps/erpnext/erpnext/setup/doctype/customer_group/customer_group.js,This is a root customer group and cannot be edited.,To jest grupa klientów root i nie mogą być edytowane.
@@ -4834,6 +4841,7 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py,Row {0}: Advance against Customer must be credit,Wiersz {0}: Zaliczka  Klienta jest po stronie kredytowej
 DocType: Quality Meeting,Quality Meeting,Spotkanie jakościowe
 apps/erpnext/erpnext/accounts/doctype/account/account.js,Non-Group to Group,Dla grupy do grupy
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,Ustaw Serie nazw dla {0} poprzez Ustawienia&gt; Ustawienia&gt; Serie nazw
 DocType: Employee,ERPNext User,ERPNext Użytkownik
 apps/erpnext/erpnext/education/doctype/student_group_creation_tool/student_group_creation_tool.py,Batch is mandatory in row {0},Batch jest obowiązkowy w rzędzie {0}
 apps/erpnext/erpnext/education/doctype/student_group_creation_tool/student_group_creation_tool.py,Batch is mandatory in row {0},Batch jest obowiązkowy w rzędzie {0}
@@ -5133,6 +5141,7 @@
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py,No {0} found for Inter Company Transactions.,"Nie znaleziono rekordów ""{0}"" dla transakcji między spółkami."
 DocType: Travel Itinerary,Rented Car,Wynajęty samochód
 apps/erpnext/erpnext/public/js/hub/components/profile_dialog.js,About your Company,O twojej Firmie
+apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.js,Show Stock Ageing Data,Pokaż dane dotyczące starzenia się zapasów
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py,Credit To account must be a Balance Sheet account,Kredytowane konto powinno być kontem bilansowym
 DocType: Donor,Donor,Dawca
 DocType: Global Defaults,Disable In Words,Wyłącz w słowach
@@ -5147,8 +5156,10 @@
 DocType: Practitioner Schedule,Schedule Name,Nazwa harmonogramu
 apps/erpnext/erpnext/regional/doctype/gstr_3b_report/gstr_3b_report.py,Please enter GSTIN and state for the Company Address {0},Wprowadź GSTIN i podaj adres firmy {0}
 DocType: Currency Exchange,For Buying,Do kupienia
+apps/erpnext/erpnext/setup/default_energy_point_rules.py,On Purchase Order Submission,Po złożeniu zamówienia
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js,Add All Suppliers,Dodaj wszystkich dostawców
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py,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/accounts/doctype/pricing_rule/pricing_rule.js,Customer &gt; Customer Group &gt; Territory,Klient&gt; Grupa klientów&gt; Terytorium
 DocType: Tally Migration,Parties,Strony
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js,Browse BOM,Przeglądaj BOM
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py,Secured Loans,Kredyty Hipoteczne
@@ -5180,6 +5191,7 @@
 apps/erpnext/erpnext/stock/doctype/item_alternative/item_alternative.py,Not allow to set alternative item for the item {0},Nie zezwalaj na ustawienie pozycji alternatywnej dla pozycji {0}
 apps/erpnext/erpnext/hr/doctype/leave_block_list/leave_block_list.py,Date is repeated,Data jest powtórzona
 apps/erpnext/erpnext/accounts/print_format/payment_receipt_voucher/payment_receipt_voucher.html,Authorized Signatory,Upoważniony sygnatariusz
+apps/erpnext/erpnext/education/doctype/instructor/instructor.py,Please setup Instructor Naming System in Education &gt; Education Settings,Skonfiguruj system nazewnictwa instruktorów w sekcji Edukacja&gt; Ustawienia edukacji
 apps/erpnext/erpnext/regional/doctype/gstr_3b_report/gstr_3b_report.html,Net ITC Available(A) - (B),Net ITC Available (A) - (B)
 apps/erpnext/erpnext/education/doctype/fee_schedule/fee_schedule.js,Create Fees,Utwórz opłaty
 DocType: Project,Total Purchase Cost (via Purchase Invoice),Całkowity koszt zakupu (faktura zakupu za pośrednictwem)
@@ -5200,6 +5212,7 @@
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.js,Message Sent,Wiadomość wysłana
 apps/erpnext/erpnext/accounts/doctype/account/account.py,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/assets/report/fixed_asset_register/fixed_asset_register.py,Vendor Name,Nazwa dostawcy
 DocType: Quiz Result,Wrong,Źle
 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)
@@ -5444,6 +5457,7 @@
 DocType: Stock Settings,Auto Material Request,Zapytanie Auto Materiał
 DocType: Woocommerce Settings,API consumer secret,Tajny klucz klienta API
 DocType: Delivery Note Item,Available Batch Qty at From Warehouse,Ilosc w serii dostępne z magazynu
+,Received Qty Amount,Otrzymana ilość
 DocType: Salary Slip,Gross Pay - Total Deduction - Loan Repayment,Gross Pay - Razem Odliczenie - Spłata kredytu
 DocType: Bank Account,Last Integration Date,Ostatnia data integracji
 DocType: Expense Claim,Expense Taxes and Charges,Podatki i opłaty z tytułu kosztów
@@ -5908,6 +5922,8 @@
 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,Please select Qty against item {0},Wybierz Qty przeciwko pozycji {0}
+apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py,Latest Age,Późne stadium
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js,Transfer Material to Supplier,Przenieść materiał do dostawcy
 apps/erpnext/erpnext/hr/report/loan_repayment/loan_repayment.py,EMI,EMI
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py,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
@@ -5931,7 +5947,6 @@
 apps/erpnext/erpnext/hr/doctype/employee_benefit_application/employee_benefit_application.py,"An amount of {0} already claimed for the component {1},\
 						 set the amount equal or greater than {2}","Kwota {0} już zgłoszona dla komponentu {1}, \ ustaw kwotę równą lub większą niż {2}"
 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
 DocType: BOM Update Tool,The new BOM after replacement,Nowy BOM po wymianie
 ,Point of Sale,Punkt Sprzedaży (POS)
@@ -6053,7 +6068,6 @@
 DocType: Purchase Order Item,Blanket Order Rate,Ogólny koszt zamówienia
 ,Customer Ledger Summary,Podsumowanie księgi klienta
 apps/erpnext/erpnext/hooks.py,Certification,Orzecznictwo
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js,Are you sure you want to make debit note?,Czy na pewno chcesz dokonać noty obciążeniowej?
 DocType: Bank Guarantee,Clauses and Conditions,Klauzule i warunki
 DocType: Serial No,Creation Document Type,
 DocType: Amazon MWS Settings,ES,ES
@@ -6091,8 +6105,6 @@
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py,Financial Services,Usługi finansowe
 DocType: Student Sibling,Student ID,legitymacja studencka
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.js,For Quantity must be greater than zero,Dla ilości musi być większa niż zero
-apps/erpnext/erpnext/hr/doctype/employee_transfer/employee_transfer.py,"Please delete the Employee <a href=""#Form/Employee/{0}"">{0}</a>\
-					to cancel this document","Usuń pracownika <a href=""#Form/Employee/{0}"">{0}</a> \, aby anulować ten dokument"
 apps/erpnext/erpnext/config/projects.py,Types of activities for Time Logs,Rodzaje działalności za czas Logi
 DocType: Opening Invoice Creation Tool,Sales,Sprzedaż
 DocType: Stock Entry Detail,Basic Amount,Kwota podstawowa
@@ -6171,6 +6183,7 @@
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py,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,Send Supplier Emails,Wyślij e-maile Dostawca
+DocType: Asset Movement,ACC-ASM-.YYYY.-,ACC-ASM-.YYYY.-
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py,"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
 apps/erpnext/erpnext/hr/doctype/employee_onboarding/employee_onboarding.py,Submit this to create the Employee record,"Prześlij to, aby utworzyć rekord pracownika"
@@ -6251,7 +6264,6 @@
 DocType: Sales Team,Contact No.,Numer Kontaktu
 apps/erpnext/erpnext/templates/includes/cart/cart_address.html,Billing Address is same as Shipping Address,"Adres rozliczeniowy jest taki sam, jak adres wysyłki"
 DocType: Bank Reconciliation,Payment Entries,Wpisy płatności
-apps/erpnext/erpnext/erpnext_integrations/doctype/shopify_settings/shopify_settings.py,Access token or Shopify URL missing,Brak dostępu do tokena lub adresu Shopify URL
 DocType: Location,Latitude,Szerokość
 DocType: Work Order,Scrap Warehouse,złom Magazyn
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py,"Warehouse required at Row No {0}, please set default warehouse for the item {1} for the company {2}","Wymagany magazyn w Wiersz nr {0}, ustaw domyślny magazyn dla pozycji {1} dla firmy {2}"
@@ -6296,7 +6308,6 @@
 DocType: Job Offer Term,Value / Description,Wartość / Opis
 apps/erpnext/erpnext/controllers/accounts_controller.py,"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
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js,Are you sure you want to make credit note?,Czy na pewno chcesz wystawić notę kredytową?
 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,Debit and Credit not equal for {0} #{1}. Difference is {2}.,Debetowe i kredytowe nie równe dla {0} # {1}. Różnica jest {2}.
@@ -6421,6 +6432,7 @@
 DocType: Purchase Invoice,Taxes and Charges Added,Dodano podatki i opłaty
 apps/erpnext/erpnext/assets/doctype/asset/asset.py,Depreciation Row {0}: Next Depreciation Date cannot be before Available-for-use Date,Wiersz amortyzacji {0}: Data następnej amortyzacji nie może być wcześniejsza niż data przydatności do użycia
 ,Sales Funnel,Lejek Sprzedaży
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Item Code &gt; Item Group &gt; Brand,Kod pozycji&gt; Grupa produktów&gt; Marka
 apps/erpnext/erpnext/setup/doctype/company/company.py,Abbreviation is mandatory,Skrót jest obowiązkowy
 DocType: Project,Task Progress,Postęp wykonywania zadania
 apps/erpnext/erpnext/templates/includes/navbar/navbar_items.html,Cart,Koszyk
@@ -6667,6 +6679,7 @@
 DocType: Employee Grade,Employee Grade,Klasa pracownika
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py,Piecework,Praca akordowa
 DocType: GSTR 3B Report,June,czerwiec
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Supplier &gt; Supplier Type,Dostawca&gt; Rodzaj dostawcy
 DocType: Share Balance,From No,Od Nie
 DocType: Shift Type,Early Exit Grace Period,Wczesny okres wyjścia z inwestycji
 DocType: Task,Actual Time (in Hours),Rzeczywisty czas (w godzinach)
@@ -6953,6 +6966,7 @@
 DocType: Warehouse,Warehouse Name,Nazwa magazynu
 DocType: Naming Series,Select Transaction,Wybierz Transakcję
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py,Please enter Approving Role or Approving User,Proszę wprowadzić Rolę osoby zatwierdzającej dla użytkownika zatwierdzającego
+apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.py,UOM Conversion factor ({0} -&gt; {1}) not found for item: {2},Nie znaleziono współczynnika konwersji UOM ({0} -&gt; {1}) dla elementu: {2}
 apps/erpnext/erpnext/support/doctype/service_level_agreement/service_level_agreement.py,Service Level Agreement with Entity Type {0} and Entity {1} already exists.,Umowa o poziomie usług z typem podmiotu {0} i podmiotem {1} już istnieje.
 DocType: Journal Entry,Write Off Entry,Odpis
 DocType: BOM,Rate Of Materials Based On,Stawka Materiałów Wzorowana na
@@ -7144,6 +7158,7 @@
 DocType: Quality Inspection Reading,Quality Inspection Reading,Odczyt kontroli jakości
 apps/erpnext/erpnext/stock/doctype/stock_settings/stock_settings.py,`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/stock/report/stock_balance/stock_balance.py,Earliest Age,Najwcześniejszy wiek
 apps/erpnext/erpnext/utilities/user_progress.py,Set a sales goal you'd like to achieve for your company.,"Określ cel sprzedaży, jaki chcesz osiągnąć dla swojej firmy."
 DocType: Quality Goal,Revision,Rewizja
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js,Healthcare Services,Opieka zdrowotna
@@ -7187,6 +7202,7 @@
 apps/erpnext/erpnext/healthcare/doctype/patient_encounter/patient_encounter.js,Schedule Discharge,Zaplanuj rozładowanie
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py,Cheques and Deposits incorrectly cleared,Czeki i Depozyty nieprawidłowo rozliczone
 DocType: Homepage Section Card,Homepage Section Card,Strona główna Karta sekcji
+,Amount To Be Billed,Kwota do naliczenia
 apps/erpnext/erpnext/accounts/doctype/account/account.py,Account {0}: You can not assign itself as parent account,Konto {0}: Nie można przypisać siebie jako konta nadrzędnego
 DocType: Purchase Invoice Item,Price List Rate,Wartość w cenniku
 apps/erpnext/erpnext/utilities/activation.py,Create customer quotes,Tworzenie cytaty z klientami
@@ -7239,6 +7255,7 @@
 DocType: Supplier Scorecard Criteria,Supplier Scorecard Criteria,Kryteria oceny dostawcy Dostawcy
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py,Please select Start Date and End Date for Item {0},Wybierz Datę Startu i Zakończenia dla elementu {0}
 DocType: Maintenance Schedule,MAT-MSH-.YYYY.-,MAT-MSH-.YYYY.-
+,Amount to Receive,Kwota do otrzymania
 apps/erpnext/erpnext/education/doctype/student_group_creation_tool/student_group_creation_tool.py,Course is mandatory in row {0},Kurs jest obowiązkowy w wierszu {0}
 apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py,From date can not be greater than than To date,Od daty nie może być większa niż do tej pory
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py,To date cannot be before from date,"""Do daty"" nie może być terminem przed ""od daty"""
@@ -7490,7 +7507,6 @@
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js,BOM and Manufacturing Quantity are required,BOM i ilości są wymagane Manufacturing
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js,Ageing Range 2,Starzenie Zakres 2
 DocType: SG Creation Tool Course,Max Strength,Maksymalna siła
-apps/erpnext/erpnext/accounts/doctype/account/account.py,"Account {0} already exists in child company {1}. The following fields have different values, they should be same:<ul><li>{2}</li></ul>","Konto {0} już istnieje w firmie podrzędnej {1}. Następujące pola mają różne wartości, powinny być takie same: <ul><li> {2} </li></ul>"
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py,Installing presets,Instalowanie ustawień wstępnych
 DocType: Fee Schedule,EDU-FSH-.YYYY.-,EDU-FSH-.YYYY.-
 apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js,No Delivery Note selected for Customer {},Nie wybrano uwagi dostawy dla klienta {}
@@ -7702,6 +7718,7 @@
 DocType: Delivery Note,Print Without Amount,Drukuj bez wartości
 apps/erpnext/erpnext/accounts/report/asset_depreciation_ledger/asset_depreciation_ledger.py,Depreciation Date,amortyzacja Data
 ,Work Orders in Progress,Zlecenia robocze w toku
+DocType: Customer Credit Limit,Bypass Credit Limit Check,Obejdź kontrolę limitu kredytu
 DocType: Issue,Support Team,Support Team
 apps/erpnext/erpnext/stock/report/batch_item_expiry_status/batch_item_expiry_status.py,Expiry (In Days),Wygaśnięcie (w dniach)
 DocType: Appraisal,Total Score (Out of 5),Łączny wynik (w skali do 5)
@@ -7888,6 +7905,7 @@
 DocType: Sales Invoice,Customer GSTIN,Klient GSTIN
 DocType: Crop Cycle,List of diseases detected on the field. When selected it'll automatically add a list of tasks to deal with the disease ,Lista chorób wykrytych na polu. Po wybraniu automatycznie doda listę zadań do radzenia sobie z chorobą
 apps/erpnext/erpnext/manufacturing/page/bom_comparison_tool/bom_comparison_tool.js,BOM 1,LM 1
+apps/erpnext/erpnext/assets/report/fixed_asset_register/fixed_asset_register.py,Asset Id,Identyfikator zasobu
 apps/erpnext/erpnext/healthcare/doctype/healthcare_service_unit/healthcare_service_unit.js,This is a root healthcare service unit and cannot be edited.,To jest podstawowa jednostka opieki zdrowotnej i nie można jej edytować.
 DocType: Asset Repair,Repair Status,Status naprawy
 apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.js,"Requested Qty: Quantity requested for purchase, but not ordered.",
diff --git a/erpnext/translations/ps.csv b/erpnext/translations/ps.csv
index c5a003d..c86f926 100644
--- a/erpnext/translations/ps.csv
+++ b/erpnext/translations/ps.csv
@@ -282,7 +282,6 @@
 DocType: Loan,Repay Over Number of Periods,بيرته د د پړاوونه شمیره
 apps/erpnext/erpnext/manufacturing/report/bom_stock_report/bom_stock_report.py,Quantity to Produce can not be less than Zero,د تولید مقدار د صفر څخه کم نشي
 DocType: Stock Entry,Additional Costs,اضافي لګښتونو
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Customer &gt; Customer Group &gt; Territory,پیرودونکي&gt; د پیرودونکي ګروپ&gt; سیمه
 apps/erpnext/erpnext/accounts/doctype/account/account.py,Account with existing transaction can not be converted to group.,د موجوده د راکړې ورکړې حساب ته ډلې بدل نه شي.
 DocType: Lead,Product Enquiry,د محصول د ږنو
 DocType: Education Settings,Validate Batch for Students in Student Group,لپاره د زده کونکو د زده ګروپ دسته اعتباري
@@ -579,6 +578,7 @@
 DocType: Healthcare Settings,Create documents for sample collection,د نمونو راټولولو لپاره اسناد چمتو کړئ
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py,Payment against {0} {1} cannot be greater than Outstanding Amount {2},په وړاندې د پیسو {0} د {1} نه شي وتلي مقدار څخه ډيره وي {2}
 apps/erpnext/erpnext/patches/v11_0/add_healthcare_service_unit_tree_root.py,All Healthcare Service Units,د روغتیا ټولو خدماتو واحدونه
+apps/erpnext/erpnext/setup/default_energy_point_rules.py,On Converting Opportunity,د فرصت په بدلولو باندې
 DocType: Bank Account,Address HTML,پته د HTML
 DocType: Lead,Mobile No.,د موبايل په شمیره
 apps/erpnext/erpnext/selling/doctype/pos_closing_voucher/closing_voucher_details.html,Mode of Payments,د تادیاتو موډل
@@ -643,7 +643,6 @@
 DocType: Accounting Dimension,Dimension Name,ابعاد نوم
 apps/erpnext/erpnext/healthcare/setup.py,Resistant,مقاومت
 apps/erpnext/erpnext/hotels/doctype/hotel_room_reservation/hotel_room_reservation.py,Please set Hotel Room Rate on {},مهرباني وکړئ د هوټل روم شرح په {}
-apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py,Please setup numbering series for Attendance via Setup &gt; Numbering Series,مهرباني وکړئ د تنظیم کولو له لارې د شمیره ورکولو لړۍ له لارې د ګډون لپاره د شمېرنې لړۍ تنظیم کړئ
 DocType: Journal Entry,Multi Currency,څو د اسعارو
 DocType: Bank Statement Transaction Invoice Item,Invoice Type,صورتحساب ډول
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py,Valid from date must be less than valid upto date,د نیټې څخه اعتبار باید تر نیټې نیټې د اعتبار څخه لږ وي
@@ -758,6 +757,7 @@
 apps/erpnext/erpnext/accounts/page/pos/pos.js,Create a new Customer,یو نوی پيرودونکو جوړول
 apps/erpnext/erpnext/non_profit/report/expiring_memberships/expiring_memberships.py,Expiring On,د وخت تمه کول
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,"If multiple Pricing Rules continue to prevail, users are asked to set Priority manually to resolve conflict.",که څو د بیو د اصولو دوام پراخیدل، د کاروونکو څخه پوښتنه کيږي چي د لومړیتوب ټاکل لاسي د شخړې حل کړي.
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js,Purchase Return,رانيول Return
 apps/erpnext/erpnext/utilities/activation.py,Create Purchase Orders,رانيول امر جوړول
 ,Purchase Register,رانيول د نوم ثبتول
 apps/erpnext/erpnext/healthcare/doctype/patient/patient.py,Patient not found,ناروغ ندی موندلی
@@ -772,7 +772,6 @@
 DocType: Location,Area UOM,ساحه UOM
 apps/erpnext/erpnext/manufacturing/doctype/workstation/workstation.py,Workstation is closed on the following dates as per Holiday List: {0},Workstation په لاندې نېټو بند دی هر رخصتي بشپړفهرست په توګه: {0}
 apps/erpnext/erpnext/selling/page/sales_funnel/sales_funnel.py,Opportunities,فرصتونه
-apps/erpnext/erpnext/www/all-products/index.html,Clear filters,فلټرونه پاک کړئ
 DocType: Lab Test Template,Single,مجرد
 DocType: Compensatory Leave Request,Work From Date,د نېټې څخه کار
 DocType: Salary Slip,Total Loan Repayment,ټول پور بيرته ورکول
@@ -815,6 +814,7 @@
 apps/erpnext/erpnext/education/doctype/program_enrollment_tool/program_enrollment_tool.py,Mandatory field - Academic Year,اجباري ډګر - تعليمي کال د
 apps/erpnext/erpnext/education/doctype/program_enrollment_tool/program_enrollment_tool.py,Mandatory field - Academic Year,اجباري ډګر - تعليمي کال د
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py,{0} {1} is not associated with {2} {3},{0} {1} د {2} {3} سره تړاو نلري.
+DocType: Opportunity,Converted By,لخوا بدل شوی
 apps/erpnext/erpnext/public/js/hub/components/ReviewArea.vue,You need to login as a Marketplace User before you can add any reviews.,تاسو اړتیا لرئ مخکې لدې چې کوم بیاکتنې اضافه کړئ تاسو د بازار ځای کارونکي په توګه ننوتل ته اړتیا لرئ.
 apps/erpnext/erpnext/manufacturing/doctype/job_card/job_card.py,Row {0} : Operation is required against the raw material item {1},Row {0}: د خام توکي په وړاندې عملیات اړین دي {1}
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py,Please set default payable account for the company {0},مهرباني وکړئ د شرکت لپاره د تلوالیزه د تادیې وړ ګڼون جوړ {0}
@@ -840,6 +840,8 @@
 DocType: BOM,Work Order,د کار امر
 DocType: Sales Invoice,Total Qty,Total Qty
 apps/erpnext/erpnext/education/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py,Guardian2 Email ID,Guardian2 بريښناليک ID
+apps/erpnext/erpnext/hr/doctype/employee_transfer/employee_transfer.py,"Please delete the Employee <a href=""#Form/Employee/{0}"">{0}</a>\
+					to cancel this document","مهرباني وکړئ د دې سند لغوه کولو لپاره کارمند <a href=""#Form/Employee/{0}"">{0}</a> delete حذف کړئ"
 DocType: Item,Show in Website (Variant),په ویب پاڼه ښودل (متحول)
 DocType: Employee,Health Concerns,روغتیا اندیښنې
 DocType: Payroll Entry,Select Payroll Period,انتخاب د معاشاتو د دورې
@@ -896,7 +898,6 @@
 DocType: Codification Table,Codification Table,د کوډیزشن جدول
 DocType: Timesheet Detail,Hrs,بجو
 apps/erpnext/erpnext/manufacturing/page/bom_comparison_tool/bom_comparison_tool.js,Changes in {0},په {0} کې بدلونونه
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js,Please select Company,مهرباني وکړئ د شرکت وټاکئ
 DocType: Employee Skill,Employee Skill,د کارمندانو مهارت
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.js,Difference Account,توپير اکانټ
 DocType: Pricing Rule,Discount on Other Item,په نورو توکو کې تخفیف
@@ -963,6 +964,7 @@
 DocType: BOM,Operating Cost,عادي لګښت
 DocType: Crop,Produced Items,تولید شوي توکي
 DocType: Bank Statement Transaction Entry,Match Transaction to Invoices,د انوګانو لپاره راکړې ورکړه
+apps/erpnext/erpnext/erpnext_integrations/exotel_integration.py,Error in Exotel incoming call,په ایکسټیل راتلو کال کې غلطي
 DocType: Sales Order Item,Gross Profit,ټولټال ګټه
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js,Unblock Invoice,د انوون انډول
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py,Increment cannot be 0,بهرمن نه شي کولای 0 وي
@@ -1174,6 +1176,7 @@
 DocType: Activity Cost,Activity Type,فعالیت ډول
 DocType: Request for Quotation,For individual supplier,د انفرادي عرضه
 DocType: BOM Operation,Base Hour Rate(Company Currency),اډه قيامت کچه (د شرکت د اسعارو)
+,Qty To Be Billed,د مقدار بیل کول
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py,Delivered Amount,تحویلوونکی مقدار
 apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.js,Reserved Qty for Production: Raw materials quantity to make manufacturing items.,د تولید لپاره خوندي مقدار: د تولید توکو جوړولو لپاره د خامو موادو مقدار.
 DocType: Loyalty Point Entry Redemption,Redemption Date,د استملاک نېټه
@@ -1293,7 +1296,7 @@
 apps/erpnext/erpnext/education/doctype/student_group/student_group.py,Please select Program,مهرباني غوره پروګرام
 apps/erpnext/erpnext/education/doctype/student_group/student_group.py,Please select Program,مهرباني غوره پروګرام
 DocType: Project,Estimated Cost,اټکل شوی لګښت
-DocType: Request for Quotation,Link to material requests,مخونه چې د مادي غوښتنو
+DocType: Supplier Quotation,Link to material requests,مخونه چې د مادي غوښتنو
 apps/erpnext/erpnext/public/js/hub/pages/Publish.vue,Publish,خپرول
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py,Aerospace,فضایي
 ,Fichier des Ecritures Comptables [FEC],فیکیر des Ecritures لنډیزونه [FEC]
@@ -1306,6 +1309,7 @@
 apps/erpnext/erpnext/utilities/transaction_base.py,Invalid Posting Time,د پوستې ناسم وخت
 DocType: Salary Component,Condition and Formula,حالت او فورمول
 DocType: Lead,Campaign Name,د کمپاین نوم
+apps/erpnext/erpnext/setup/default_energy_point_rules.py,On Task Completion,د ټکی کام بشپړول
 apps/erpnext/erpnext/hr/doctype/compensatory_leave_request/compensatory_leave_request.py,There is no leave period in between {0} and {1},د {0} او {1} ترمنځ د وتلو موده نشته
 DocType: Fee Validity,Healthcare Practitioner,د روغتیا پاملرنه
 DocType: Hotel Room,Capacity,وړتیا
@@ -1647,7 +1651,6 @@
 DocType: Quality Feedback Template,Quality Feedback Template,د کیفیت فیډبیک ټیمپلیټ
 apps/erpnext/erpnext/config/education.py,LMS Activity,د LMS فعالیت
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py,Internet Publishing,د انټرنېټ Publishing
-DocType: Prescription Duration,Number,شمېره
 apps/erpnext/erpnext/accounts/doctype/opening_invoice_creation_tool/opening_invoice_creation_tool.js,Creating {0} Invoice,د {0} رسید جوړول
 DocType: Medical Code,Medical Code Standard,د طبی کوډ معیار
 DocType: Soil Texture,Clay Composition (%),د مڼې جوړښت (٪)
@@ -1722,6 +1725,7 @@
 DocType: Support Settings,Get Started Sections,د پیل برخې برخه واخلئ
 DocType: Lead,CRM-LEAD-.YYYY.-,CRM-LEAD -YYYY-
 DocType: Invoice Discounting,Sanctioned,تحریم
+,Base Amount,اساس رقم
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.js,Total Contribution Amount: {0},د ټولې مرستې مقدار: {0}
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py,Row #{0}: Please specify Serial No for Item {1},د کتارونو تر # {0}: مهرباني وکړئ سریال لپاره د قالب نه مشخص {1}
 DocType: Payroll Entry,Salary Slips Submitted,د معاش معاشونه وړاندې شوي
@@ -1940,6 +1944,7 @@
 DocType: Accounting Dimension,Dimension Defaults,د طلوع ټلواله
 apps/erpnext/erpnext/crm/report/prospects_engaged_but_not_converted/prospects_engaged_but_not_converted.js,Minimum Lead Age (Days),لږ تر لږه مشري عمر (ورځې)
 apps/erpnext/erpnext/crm/report/prospects_engaged_but_not_converted/prospects_engaged_but_not_converted.js,Minimum Lead Age (Days),لږ تر لږه مشري عمر (ورځې)
+apps/erpnext/erpnext/assets/report/fixed_asset_register/fixed_asset_register.py,Available For Use Date,د کاروونې نیټه شتون لري
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py,All BOMs,ټول BOMs
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js,Create Inter Company Journal Entry,د انټر شرکت ژورنال ننوتنه جوړه کړئ
 DocType: Company,Parent Company,د والدین شرکت
@@ -2002,6 +2007,7 @@
 ,IRS 1099,IRS 1099
 DocType: Salary Slip,Leave Without Pay,پرته له معاشونو څخه ووځي
 DocType: Payment Request,Outward,بهر
+apps/erpnext/erpnext/setup/default_energy_point_rules.py,On {0} Creation,په {0} جوړونه کې
 apps/erpnext/erpnext/regional/doctype/gstr_3b_report/gstr_3b_report.html,State/UT Tax,د دولت / UT مالیه
 ,Trial Balance for Party,د محاکمې بیلانس د ګوندونو
 ,Gross and Net Profit Report,د ناخالص او خالص ګټې راپور
@@ -2117,6 +2123,7 @@
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js,Make Stock Entry,د سټاک ننوتنه وکړئ
 DocType: Hotel Room Reservation,Hotel Reservation User,د هوټل رژیم کارن
 apps/erpnext/erpnext/projects/doctype/project/project.js,Set Status,وضعیت وټاکئ
+apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py,Please setup numbering series for Attendance via Setup &gt; Numbering Series,مهرباني وکړئ د تنظیم کولو له لارې د شمیره ورکولو لړۍ له لارې د ګډون لپاره د شمېرنې لړۍ تنظیم کړئ
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py,Please select prefix first,مهرباني وکړئ لومړی مختاړی وټاکئ
 DocType: Contract,Fulfilment Deadline,د پوره کولو وروستۍ نیټه
 apps/erpnext/erpnext/public/js/hub/pages/Home.vue,Near you,تاسره نږدې
@@ -2132,6 +2139,7 @@
 DocType: Announcement,All Students,ټول زده کوونکي
 apps/erpnext/erpnext/assets/doctype/asset/asset.py,Item {0} must be a non-stock item,{0} د قالب باید یو غیر سټاک وي
 apps/erpnext/erpnext/stock/doctype/batch/batch.js,View Ledger,محتویات پنډو
+DocType: Cost Center,Lft,من
 DocType: Grading Scale,Intervals,انټروال
 DocType: Bank Statement Transaction Entry,Reconciled Transactions,منل شوې لیږدونه
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py,Earliest,ژر
@@ -2247,6 +2255,7 @@
 apps/erpnext/erpnext/hr/doctype/employee_benefit_application/employee_benefit_application.py,As per your assigned Salary Structure you cannot apply for benefits,ستاسو د ټاکل شوې تنخواې جوړښت سره سم تاسو د ګټو لپاره درخواست نشو کولی
 apps/erpnext/erpnext/stock/doctype/item/item.py,Website Image should be a public file or website URL,وېب پاڼه د انځور بايد د عامه دوتنه يا ويب URL وي
 DocType: Purchase Invoice Item,BOM,هیښ
+apps/erpnext/erpnext/stock/doctype/item/item.py,Duplicate entry in Manufacturers table,د جوړونکو په جدول کې ورته ننوتل
 apps/erpnext/erpnext/setup/doctype/item_group/item_group.js,This is a root item group and cannot be edited.,دا یو د ريښي توکی ډلې او نه تصحيح شي.
 apps/erpnext/erpnext/accounts/doctype/account/account.js,Merge,ضميمه
 DocType: Journal Entry Account,Purchase Order,د اخستلو امر
@@ -2390,7 +2399,6 @@
 DocType: Asset,Depreciation Schedules,د استهالک ویش
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.js,Create Sales Invoice,د پلور انوائس جوړ کړئ
 apps/erpnext/erpnext/regional/doctype/gstr_3b_report/gstr_3b_report.html,Ineligible ITC,غیر معقول ITC
-apps/erpnext/erpnext/erpnext_integrations/doctype/shopify_settings/shopify_settings.py,"Support for public app is deprecated. Please setup private app, for more details refer user manual",د عامه اپوزیسیون ملاتړ خراب شوی دی. لطفا د خصوصي انستیتیوت جوړ کړئ، د لا زیاتو معلوماتو لپاره د کارن لارښود وګورئ
 DocType: Task,Dependent Tasks,انحصاري وظایف
 apps/erpnext/erpnext/regional/report/gstr_1/gstr_1.py,Following accounts might be selected in GST Settings:,لاندې حسابونه کیدای شي د GST په ترتیباتو کې وټاکل شي:
 apps/erpnext/erpnext/manufacturing/report/bom_stock_report/bom_stock_report.js,Quantity to Produce,د تولید مقدار
@@ -2639,6 +2647,7 @@
 DocType: Water Analysis,Container,کانټینر
 apps/erpnext/erpnext/regional/report/gstr_1/gstr_1.py,Please set valid GSTIN No. in Company Address,مهرباني وکړئ د شرکت پتې کې د درست جی ایس این ان شمیر وټاکئ
 apps/erpnext/erpnext/education/utils.py,Student {0} - {1} appears Multiple times in row {2} & {3},د زده کونکو د {0} - {1} په قطار څو ځله ښکاري {2} &amp; {3}
+apps/erpnext/erpnext/selling/doctype/customer/customer.py,Following fields are mandatory to create address:,لاندې ساحې د پته جوړولو لپاره لازمي دي:
 DocType: Item Alternative,Two-way,دوه اړخیزه
 DocType: Item,Manufacturers,جوړونکي
 ,Employee Billing Summary,د کارمند بلین لنډیز
@@ -2712,9 +2721,9 @@
 DocType: Employee,HR-EMP-,HR-EMP-
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py,User {0} doesn't have any default POS Profile. Check Default at Row {1} for this User.,کارن {0} نه لري د اصلي پی ایس پی پېژني. د دې کارن لپاره د {1} په صف کې اصلي ځای وګورئ.
 DocType: Quality Meeting Minutes,Quality Meeting Minutes,د کیفیت ناستې دقیقې
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Supplier &gt; Supplier Type,عرضه کونکي&gt; عرضه کونکي ډول
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py,Employee Referral,د کار ګمارل
 DocType: Student Group,Set 0 for no limit,جوړ 0 لپاره پرته، حدود نه
+DocType: Cost Center,rgt,rgt
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py,The day(s) on which you are applying for leave are holidays. You need not apply for leave.,په هغه ورځ (s) چې تاسو د رخصتۍ درخواست دي رخصتي. تاسو ته اړتيا نه لري د درخواست.
 DocType: Customer,Primary Address and Contact Detail,لومړني پته او د اړیکو تفصیل
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.js,Resend Payment Email,بیا ولېږې قطعا د ليک
@@ -2822,7 +2831,6 @@
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py,Against Supplier Invoice {0} dated {1},په وړاندې د عرضه صورتحساب {0} د میاشتې په {1}
 DocType: Customer,Default Price List,Default د بیې په لېست
 apps/erpnext/erpnext/assets/doctype/asset/asset.py,Asset Movement record {0} created,د شتمنیو د غورځنګ ریکارډ {0} جوړ
-apps/erpnext/erpnext/utilities/page/leaderboard/leaderboard.js,No items found.,کوم توکي ونه موندل شول.
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py,You cannot delete Fiscal Year {0}. Fiscal Year {0} is set as default in Global Settings,تاسې کولای شی نه ړنګول مالي کال {0}. مالي {0} کال په توګه په نړیوال امستنې default ټاکل
 DocType: Share Transfer,Equity/Liability Account,د مسؤلیت / مسؤلیت حساب
 apps/erpnext/erpnext/setup/doctype/customer_group/customer_group.py,A customer with the same name already exists,یو ورته پیرود چې ورته نوم یې شتون لري لا دمخه لا شتون لري
@@ -2838,6 +2846,7 @@
 apps/erpnext/erpnext/selling/doctype/customer/customer.py,Credit limit has been crossed for customer {0} ({1}/{2}),د پیرودونکي محدودې د پیرودونکو لپاره تیریږي. {0} ({1} / {2})
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py,Customer required for 'Customerwise Discount',لپاره د پیریدونکو د &#39;Customerwise کمښت&#39; ته اړتيا
 apps/erpnext/erpnext/config/accounting.py,Update bank payment dates with journals.,د بانک د پیسو سره ژورنالونو خرما د اوسمهالولو.
+,Billed Qty,بیل مقدار
 apps/erpnext/erpnext/stock/doctype/item/item_dashboard.py,Pricing,د بیې
 DocType: Employee,Attendance Device ID (Biometric/RF tag ID),د حاضری کولو آله ID (بایومیټریک / RF ټاګ ID)
 DocType: Quotation,Term Details,اصطلاح په بشپړه توګه کتل
@@ -2861,6 +2870,7 @@
 DocType: Share Transfer,Asset Account,د شتمنۍ حساب
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js,New release date should be in the future,د خوشې کولو نوي نیټه باید په راتلونکي کې وي
 DocType: Purchase Invoice,End date of current invoice's period,د روان صورتحساب د دورې د پای نیټه
+apps/erpnext/erpnext/hr/doctype/employee/employee.py,Please setup Employee Naming System in Human Resource &gt; HR Settings,مهرباني وکړئ د بشري سرچینو&gt; HR ترتیبات کې د کارمند نوم ورکولو سیسټم تنظیم کړئ
 DocType: Lab Test,Technician Name,د تخنیک نوم
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py,"Cannot ensure delivery by Serial No as \
 					Item {0} is added with and without Ensure Delivery by \
@@ -2868,6 +2878,7 @@
 DocType: Accounts Settings,Unlink Payment on Cancellation of Invoice,د صورتحساب د فسخ کولو د پیسو Unlink
 DocType: Bank Reconciliation,From Date,له نېټه
 apps/erpnext/erpnext/hr/doctype/vehicle_log/vehicle_log.py,Current Odometer reading entered should be greater than initial Vehicle Odometer {0},اوسني Odometer لوستلو ته ننوتل بايد لومړنۍ د موټرو Odometer څخه ډيره وي {0}
+,Purchase Order Items To Be Received or Billed,د اخیستلو یا بل کولو لپاره د پیرود امر توکي
 DocType: Restaurant Reservation,No Show,نه ښکاره ول
 apps/erpnext/erpnext/regional/india/utils.py,You must be a registered supplier to generate e-Way Bill,تاسو باید د ای - ویز بل تولید لپاره راجستر شوي عرضه کونکی اوسئ
 DocType: Shipping Rule Country,Shipping Rule Country,انتقال د حاکمیت د هېواد
@@ -2909,6 +2920,7 @@
 apps/erpnext/erpnext/templates/generators/item/item_add_to_cart.html,View in Cart,محتویات یی په ګاډۍ
 DocType: Employee Checkin,Shift Actual Start,د پیل پیل
 DocType: Tally Migration,Is Day Book Data Imported,د ورځ کتاب ډاټا وارد شوې
+,Purchase Order Items To Be Received or Billed1,د اخیستلو یا بل کولو لپاره د پیرود امر توکي
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py,Marketing Expenses,بازار موندنه داخراجاتو
 ,Item Shortage Report,د قالب په کمښت کې راپور
 DocType: Bank Transaction Payments,Bank Transaction Payments,د بانک د راکړې ورکړې تادیات
@@ -3273,6 +3285,7 @@
 ,Campaign Efficiency,د کمپاین موثريت
 ,Campaign Efficiency,د کمپاین موثريت
 DocType: Discussion,Discussion,د بحث
+apps/erpnext/erpnext/setup/default_energy_point_rules.py,On Sales Order Submission,د پلور امر سپارنې ته
 DocType: Bank Transaction,Transaction ID,د راکړې ورکړې ID
 DocType: Payroll Entry,Deduct Tax For Unsubmitted Tax Exemption Proof,د غیرقانوني مالیې معافیت ثبوت لپاره د محصول مالیه
 DocType: Volunteer,Anytime,هرکله
@@ -3280,7 +3293,6 @@
 DocType: Employee Tax Exemption Proof Submission,Employee Tax Exemption Proof Submission,د کارکونکو مالیې معافیت ثبوت وړاندې کول
 DocType: Patient,Surgical History,جراحي تاریخ
 DocType: Bank Statement Settings Item,Mapped Header,نقشه سرلیک
-apps/erpnext/erpnext/hr/doctype/employee/employee.py,Please setup Employee Naming System in Human Resource &gt; HR Settings,مهرباني وکړئ د بشري سرچینو&gt; HR ترتیبات کې د کارمند نوم ورکولو سیسټم تنظیم کړئ
 DocType: Employee,Resignation Letter Date,د استعفا ليک نېټه
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Pricing Rules are further filtered based on quantity.,د بیې اصول دي لا فلتر پر بنسټ اندازه.
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py,Please set the Date Of Joining for employee {0},لطفا د ټولګې لپاره د کارمند په یوځای کېدو د نېټه {0}
@@ -3295,6 +3307,7 @@
 DocType: Bank Statement Settings,Mapped Items,نقشه شوی توکي
 DocType: Amazon MWS Settings,IT,IT
 DocType: Chapter,Chapter,فصل
+,Fixed Asset Register,ثابت شتمني ثبت
 apps/erpnext/erpnext/utilities/user_progress.py,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,Select BOM and Qty for Production,د تولید لپاره د هیښ او Qty وټاکئ
@@ -3981,7 +3994,6 @@
 DocType: Project User,Project Status,د پروژې د حالت
 DocType: UOM,Check this to disallow fractions. (for Nos),وګورئ دا ښیی disallow. (د وځيري)
 DocType: Student Admission Program,Naming Series (for Student Applicant),نوم لړۍ (لپاره د زده کونکو د متقاضي)
-apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.py,UOM Conversion factor ({0} -&gt; {1}) not found for item: {2},د UOM د بدلون فاکتور ({0} -&gt; {1}) د توکي لپاره ونه موندل شو: {2}
 apps/erpnext/erpnext/hr/doctype/retention_bonus/retention_bonus.py,Bonus Payment Date cannot be a past date,د بونس تادیاتو نیټه د تیرې نیټې ندی
 DocType: Travel Request,Copy of Invitation/Announcement,د دعوت / اعلان نقل
 DocType: Practitioner Service Unit Schedule,Practitioner Service Unit Schedule,د عملیاتي خدماتو څانګې مهال ویش
@@ -4205,7 +4217,6 @@
 DocType: Journal Entry,Accounting Entries,د محاسبې توکي
 DocType: Job Card Time Log,Job Card Time Log,د دندې کارت وخت لاگ
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,"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; میدان کې لیږدول کیږي.
-apps/erpnext/erpnext/education/doctype/instructor/instructor.py,Please setup Instructor Naming System in Education &gt; Education Settings,مهرباني وکړئ د ښوونې او روزنې ترتیبات کې د ښوونکي نوم ورکولو سیسټم تنظیم کړئ
 DocType: Journal Entry,Paid Loan,پور ورکړ شوی پور
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py,Duplicate Entry. Please check Authorization Rule {0},انفاذ ړنګ کړئ. مهرباني وکړئ وګورئ د واک د حاکمیت د {0}
 DocType: Journal Entry Account,Reference Due Date,د ماخذ حواله نیټه
@@ -4222,7 +4233,6 @@
 apps/erpnext/erpnext/templates/pages/projects.html,No time sheets,هيڅ وخت پاڼې
 DocType: GoCardless Mandate,GoCardless Customer,د بې کفارو پیرودونکی
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py,Leave Type {0} cannot be carry-forwarded,ډول ووځي {0} شي ترسره-استولې نه
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Item Code &gt; Item Group &gt; Brand,د توکو کوډ&gt; د توکي ګروپ&gt; نښه
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py,Maintenance Schedule is not generated for all the items. Please click on 'Generate Schedule',د ساتنې او ویش لپاره د ټول سامان د تولید نه. مهرباني وکړی د &#39;تولید مهال ویش&#39; کیکاږۍ
 ,To Produce,توليدول
 DocType: Leave Encashment,Payroll,د معاشاتو
@@ -4336,7 +4346,6 @@
 DocType: Stock Ledger Entry,Actual Qty After Transaction,واقعي Qty د راکړې ورکړې وروسته
 ,Pending SO Items For Purchase Request,SO سامان د اخستلو غوښتنه په تمه
 apps/erpnext/erpnext/education/doctype/student_admission/student_admission.py,Student Admissions,د زده کوونکو د شمولیت
-apps/erpnext/erpnext/accounts/party.py,{0} {1} is disabled,{0} د {1} معلول دی
 DocType: Supplier,Billing Currency,د بیلونو د اسعارو
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py,Extra Large,ډېر لوی
 DocType: Loan,Loan Application,د پور غوښتنلیک
@@ -4413,7 +4422,6 @@
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py,Only Leave Applications with status 'Approved' and 'Rejected' can be submitted,يوازې سره حالت غوښتنلیکونه پرېږدئ &#39;تصویب&#39; او &#39;رد&#39; کولای وسپارل شي
 apps/erpnext/erpnext/accounts/doctype/accounting_dimension/accounting_dimension.py,Creating Dimensions...,ابعاد پیدا کول ...
 apps/erpnext/erpnext/education/doctype/student_group_creation_tool/student_group_creation_tool.py,Student Group Name is mandatory in row {0},د زده کونکو د ډلې نوم په قطار الزامی دی {0}
-DocType: Customer Credit Limit,Bypass credit limit_check,د پاسپورټ کریډیټ حد_چیک
 DocType: Homepage,Products to be shown on website homepage,توليدات په ويب پاڼه کې ښودل شي
 DocType: HR Settings,Password Policy,د شفر تګلاره
 apps/erpnext/erpnext/setup/doctype/customer_group/customer_group.js,This is a root customer group and cannot be edited.,دا یو د ريښي د مشتريانو د ډلې او نه تصحيح شي.
@@ -5000,6 +5008,7 @@
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py,No {0} found for Inter Company Transactions.,No {0} د انټرنیټ د راکړې ورکړې لپاره موندل شوی.
 DocType: Travel Itinerary,Rented Car,کرایټ کار
 apps/erpnext/erpnext/public/js/hub/components/profile_dialog.js,About your Company,ستاسو د شرکت په اړه
+apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.js,Show Stock Ageing Data,د سټاک زوړ ډیټا وښایاست
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py,Credit To account must be a Balance Sheet account,د حساب د پور باید د موازنې د پاڼه په پام کې وي
 DocType: Donor,Donor,بسپنه ورکوونکی
 DocType: Global Defaults,Disable In Words,نافعال په وييکي
@@ -5013,8 +5022,10 @@
 DocType: Patient,Patient ID,د ناروغ پېژندنه
 DocType: Practitioner Schedule,Schedule Name,د مهال ویش نوم
 DocType: Currency Exchange,For Buying,د پیرودلو لپاره
+apps/erpnext/erpnext/setup/default_energy_point_rules.py,On Purchase Order Submission,د پیرود امر سپارنې ته
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js,Add All Suppliers,ټول سپلولونه زیات کړئ
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py,Row #{0}: Allocated Amount cannot be greater than outstanding amount.,د کتارونو تر # {0}: ځانګړې شوې مقدار نه بيالنس اندازه په پرتله زیات وي.
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Customer &gt; Customer Group &gt; Territory,پیرودونکي&gt; د پیرودونکي ګروپ&gt; سیمه
 DocType: Tally Migration,Parties,ګوندونه
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js,Browse BOM,کتنه د هیښ
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py,Secured Loans,خوندي پور
@@ -5045,6 +5056,7 @@
 DocType: Subscription,Past Due Date,د تېر وخت نیټه
 apps/erpnext/erpnext/hr/doctype/leave_block_list/leave_block_list.py,Date is repeated,نېټه تکرار
 apps/erpnext/erpnext/accounts/print_format/payment_receipt_voucher/payment_receipt_voucher.html,Authorized Signatory,اجازه لاسليک
+apps/erpnext/erpnext/education/doctype/instructor/instructor.py,Please setup Instructor Naming System in Education &gt; Education Settings,مهرباني وکړئ د ښوونې او روزنې ترتیبات کې د ښوونکي نوم ورکولو سیسټم تنظیم کړئ
 apps/erpnext/erpnext/regional/doctype/gstr_3b_report/gstr_3b_report.html,Net ITC Available(A) - (B),د معلوماتي ټیکنالوژۍ شبکه موجوده ده (A) - (B)
 apps/erpnext/erpnext/education/doctype/fee_schedule/fee_schedule.js,Create Fees,فیسونه جوړ کړئ
 DocType: Project,Total Purchase Cost (via Purchase Invoice),Total رانيول لګښت (له لارې رانيول صورتحساب)
@@ -5065,6 +5077,7 @@
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.js,Message Sent,پيغام ته وليږدول شوه
 apps/erpnext/erpnext/accounts/doctype/account/account.py,Account with child nodes cannot be set as ledger,سره د ماشومانو د غوټو حساب نه په توګه د پنډو جوړ شي
 DocType: C-Form,II,II
+apps/erpnext/erpnext/assets/report/fixed_asset_register/fixed_asset_register.py,Vendor Name,د پلورونکي نوم
 DocType: Quiz Result,Wrong,غلط
 DocType: Sales Invoice,Rate at which Price list currency is converted to customer's base currency,په ميزان کي د بیو د لست د اسعارو ده چې د مشتريانو د اډې اسعارو بدل
 DocType: Purchase Invoice Item,Net Amount (Company Currency),خالص مقدار (شرکت د اسعارو)
@@ -5305,6 +5318,7 @@
 DocType: Stock Settings,Auto Material Request,د موټرونو د موادو غوښتنه
 DocType: Woocommerce Settings,API consumer secret,د API مصرف راز
 DocType: Delivery Note Item,Available Batch Qty at From Warehouse,په له ګدام موجود دسته Qty
+,Received Qty Amount,ترلاسه شوې مقدار مقدار
 DocType: Salary Slip,Gross Pay - Total Deduction - Loan Repayment,ناخالص معاشونو - ټول Deduction - پور بيرته ورکول
 DocType: Bank Account,Last Integration Date,د ادغام وروستی نیټه
 DocType: Expense Claim,Expense Taxes and Charges,د لګښت مالیه او لګښتونه
@@ -5764,6 +5778,8 @@
 DocType: Drug Prescription,Hour,ساعت
 DocType: Restaurant Order Entry,Last Sales Invoice,د پلورنې وروستنی تیلیفون
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py,Please select Qty against item {0},مهرباني وکړئ د مقدار په مقابل کښی مقدار انتخاب کړئ {0}
+apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py,Latest Age,وروستی عمر
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js,Transfer Material to Supplier,عرضه کونکي ته توکي لیږدول
 apps/erpnext/erpnext/hr/report/loan_repayment/loan_repayment.py,EMI,EMI
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py,New Serial No cannot have Warehouse. Warehouse must be set by Stock Entry or Purchase Receipt,نوی شعبه نه شي ګدام لري. ګدام باید د سټاک انفاذ يا رانيول رسيد جوړ شي
 DocType: Lead,Lead Type,سرب د ډول
@@ -5785,7 +5801,6 @@
 apps/erpnext/erpnext/buying/doctype/supplier_scorecard/supplier_scorecard_list.js,Unknown,نامعلوم
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js,Work Order not created,د کار امر ندی جوړ شوی
 DocType: Shipping Rule,Shipping Rule Conditions,انتقال حاکمیت شرايط
-DocType: Purchase Invoice,Export Type,د صادرولو ډول
 DocType: Salary Slip Loan,Salary Slip Loan,د معاش لپ ټاپ
 DocType: BOM Update Tool,The new BOM after replacement,د ځای ناستی وروسته د نوي هیښ
 ,Point of Sale,د دخرسون ټکی
@@ -5905,7 +5920,6 @@
 DocType: Purchase Order Item,Blanket Order Rate,د بالقوه امر اندازه
 ,Customer Ledger Summary,د پیرودونکي لیجر لنډیز
 apps/erpnext/erpnext/hooks.py,Certification,تصدیق
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js,Are you sure you want to make debit note?,ایا تاسو باوري یاست چې د ډیبټ نوټ جوړول غواړئ؟
 DocType: Bank Guarantee,Clauses and Conditions,بندیزونه او شرایط
 DocType: Serial No,Creation Document Type,د خلقت د سند ډول
 DocType: Amazon MWS Settings,ES,ES
@@ -5943,8 +5957,6 @@
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py,Financial Services,مالي خدمتونه
 DocType: Student Sibling,Student ID,زده کوونکي د پیژندنې
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.js,For Quantity must be greater than zero,د مقدار لپاره باید د صفر څخه ډیر وي
-apps/erpnext/erpnext/hr/doctype/employee_transfer/employee_transfer.py,"Please delete the Employee <a href=""#Form/Employee/{0}"">{0}</a>\
-					to cancel this document","مهرباني وکړئ د دې سند لغوه کولو لپاره کارمند <a href=""#Form/Employee/{0}"">{0}</a> delete حذف کړئ"
 apps/erpnext/erpnext/config/projects.py,Types of activities for Time Logs,لپاره د وخت کندي د فعالیتونو ډولونه
 DocType: Opening Invoice Creation Tool,Sales,خرڅلاو
 DocType: Stock Entry Detail,Basic Amount,اساسي مقدار
@@ -6023,6 +6035,7 @@
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py,Print and Stationery,چاپ او قرطاسيه
 DocType: Stock Settings,Show Barcode Field,انکړپټه ښودل Barcode ساحوي
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js,Send Supplier Emails,عرضه برېښناليک وليږئ
+DocType: Asset Movement,ACC-ASM-.YYYY.-,ACC-ASM-.YYYY.-
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py,"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,اتوم جوړ شوی
 apps/erpnext/erpnext/hr/doctype/employee_onboarding/employee_onboarding.py,Submit this to create the Employee record,د کارکونکي ریکارډ د جوړولو لپاره دا وسپاري
@@ -6101,7 +6114,6 @@
 DocType: Sales Team,Contact No.,د تماس شمیره
 apps/erpnext/erpnext/templates/includes/cart/cart_address.html,Billing Address is same as Shipping Address,د بلینګ پته د بار وړلو پته ورته ده
 DocType: Bank Reconciliation,Payment Entries,د پیسو توکي
-apps/erpnext/erpnext/erpnext_integrations/doctype/shopify_settings/shopify_settings.py,Access token or Shopify URL missing,د ایل پی ایل لاسرسی یا دوتنې تایید کول
 DocType: Location,Latitude,عرضه
 DocType: Work Order,Scrap Warehouse,د اوسپنې ګدام
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py,"Warehouse required at Row No {0}, please set default warehouse for the item {1} for the company {2}",د رین نمبر په {0} کې ګودام ته اړتیا ده، مهرباني وکړئ د شرکت لپاره {1} د مودې لپاره د ڈیفالډ ګودام تعین کړئ {2}
@@ -6145,7 +6157,6 @@
 DocType: Job Offer Term,Value / Description,د ارزښت / Description
 apps/erpnext/erpnext/controllers/accounts_controller.py,"Row #{0}: Asset {1} cannot be submitted, it is already {2}",د کتارونو تر # {0}: د شتمنیو د {1} نه شي وړاندې شي، دا لا دی {2}
 DocType: Tax Rule,Billing Country,د بیلونو د هېواد
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js,Are you sure you want to make credit note?,ایا تاسو ډاډه یاست چې د کریډټ نوټ رامینځته کول غواړئ؟
 DocType: Purchase Order Item,Expected Delivery Date,د تمی د سپارلو نېټه
 DocType: Restaurant Order Entry,Restaurant Order Entry,د رستورانت امر
 apps/erpnext/erpnext/accounts/general_ledger.py,Debit and Credit not equal for {0} #{1}. Difference is {2}.,ډیبیټ او اعتبار د {0} # مساوي نه {1}. توپير دی {2}.
@@ -6268,6 +6279,7 @@
 DocType: Purchase Invoice,Taxes and Charges Added,مالیه او په تور د ورزیاتولو
 apps/erpnext/erpnext/assets/doctype/asset/asset.py,Depreciation Row {0}: Next Depreciation Date cannot be before Available-for-use Date,د استهالک صف {0}: د استملاک نیټه د لاسرسي لپاره د لاس رسی نیولو څخه وړاندې نشي
 ,Sales Funnel,خرڅلاو کیږدئ
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Item Code &gt; Item Group &gt; Brand,د توکو کوډ&gt; د توکي ګروپ&gt; نښه
 apps/erpnext/erpnext/setup/doctype/company/company.py,Abbreviation is mandatory,Abbreviation الزامی دی
 DocType: Project,Task Progress,کاري پرمختګ
 apps/erpnext/erpnext/templates/includes/navbar/navbar_items.html,Cart,کراچۍ
@@ -6511,6 +6523,7 @@
 DocType: Employee Grade,Employee Grade,د کارموندنې درجه
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py,Piecework,Piecework
 DocType: GSTR 3B Report,June,جون
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Supplier &gt; Supplier Type,عرضه کونکي&gt; عرضه کونکي ډول
 DocType: Share Balance,From No,له
 DocType: Shift Type,Early Exit Grace Period,د ژر وتلو فضل ګړندی دوره
 DocType: Task,Actual Time (in Hours),واقعي وخت (په ساعتونه)
@@ -6793,6 +6806,7 @@
 DocType: Warehouse,Warehouse Name,ګدام نوم
 DocType: Naming Series,Select Transaction,انتخاب معامالتو
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py,Please enter Approving Role or Approving User,لطفا رول تصويب يا تصويب کارن
+apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.py,UOM Conversion factor ({0} -&gt; {1}) not found for item: {2},د UOM د بدلون فاکتور ({0} -&gt; {1}) د توکي لپاره ونه موندل شو: {2}
 apps/erpnext/erpnext/support/doctype/service_level_agreement/service_level_agreement.py,Service Level Agreement with Entity Type {0} and Entity {1} already exists.,د شرکت ډول {0} او شرکت {1} سره د خدماتي کچې تړون لا دمخه موجود دی.
 DocType: Journal Entry,Write Off Entry,ولیکئ پړاو په انفاذ
 DocType: BOM,Rate Of Materials Based On,کچه د موادو پر بنسټ
@@ -6982,6 +6996,7 @@
 DocType: Quality Inspection Reading,Quality Inspection Reading,د کیفیت د تفتیش د لوستلو
 apps/erpnext/erpnext/stock/doctype/stock_settings/stock_settings.py,`Freeze Stocks Older Than` should be smaller than %d days.,`د يخبندان په ډیپو کې د زړو Than` بايد٪ d ورځو په پرتله کوچنی وي.
 DocType: Tax Rule,Purchase Tax Template,پیري د مالياتو د کينډۍ
+apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py,Earliest Age,لومړنی عمر
 apps/erpnext/erpnext/utilities/user_progress.py,Set a sales goal you'd like to achieve for your company.,د پلور موخې وټاکئ چې تاسو غواړئ د خپل شرکت لپاره ترلاسه کړئ.
 DocType: Quality Goal,Revision,بیاکتنه
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js,Healthcare Services,روغتیایی خدمتونه
@@ -7025,6 +7040,7 @@
 apps/erpnext/erpnext/healthcare/doctype/patient_encounter/patient_encounter.js,Schedule Discharge,د ویجاړ مهال ویش
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py,Cheques and Deposits incorrectly cleared,Cheques او سپما په ناسم ډول پاکه
 DocType: Homepage Section Card,Homepage Section Card,د کور پا Sectionې برخې کارت
+,Amount To Be Billed,بیلونه پیسی
 apps/erpnext/erpnext/accounts/doctype/account/account.py,Account {0}: You can not assign itself as parent account,ګڼون {0}: تاسو نه شي کولاي ځان د مور او پلار په پام کې وګماری
 DocType: Purchase Invoice Item,Price List Rate,د بیې په لېست Rate
 apps/erpnext/erpnext/utilities/activation.py,Create customer quotes,د پېرېدونکو يادي جوړول
@@ -7077,6 +7093,7 @@
 DocType: Supplier Scorecard Criteria,Supplier Scorecard Criteria,د سپلویزیون د کارډ معیارونه
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py,Please select Start Date and End Date for Item {0},مهرباني غوره لپاره د قالب د پیل نیټه او پای نیټه {0}
 DocType: Maintenance Schedule,MAT-MSH-.YYYY.-,MAT-MSH -YYYY-
+,Amount to Receive,د ترلاسه کولو مقدار
 apps/erpnext/erpnext/education/doctype/student_group_creation_tool/student_group_creation_tool.py,Course is mandatory in row {0},د کورس په قطار الزامی دی {0}
 apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py,From date can not be greater than than To date,له نیټې څخه نیټې تر نیټې نیولې نشي
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py,To date cannot be before from date,تر اوسه پورې ونه شي کولای له نېټې څخه مخکې وي
@@ -7530,6 +7547,7 @@
 DocType: Delivery Note,Print Without Amount,پرته مقدار دچاپ
 apps/erpnext/erpnext/accounts/report/asset_depreciation_ledger/asset_depreciation_ledger.py,Depreciation Date,د استهالک نېټه
 ,Work Orders in Progress,په پرمختګ کې کاري امر
+DocType: Customer Credit Limit,Bypass Credit Limit Check,د بای پاس کریډیټ محدودیت چیک
 DocType: Issue,Support Team,د ملاتړ ټيم
 apps/erpnext/erpnext/stock/report/batch_item_expiry_status/batch_item_expiry_status.py,Expiry (In Days),د انقضاء (ورځو)
 DocType: Appraisal,Total Score (Out of 5),ټولې نمرې (د 5 څخه)
@@ -7714,6 +7732,7 @@
 DocType: Sales Invoice,Customer GSTIN,پيرودونکو GSTIN
 DocType: Crop Cycle,List of diseases detected on the field. When selected it'll automatically add a list of tasks to deal with the disease ,په ساحه کې د ناروغیو لیست. کله چې دا غوره کړه نو په اتومات ډول به د دندو لیست اضافه کړئ چې د ناروغۍ سره معامله وکړي
 apps/erpnext/erpnext/manufacturing/page/bom_comparison_tool/bom_comparison_tool.js,BOM 1,BOM 1
+apps/erpnext/erpnext/assets/report/fixed_asset_register/fixed_asset_register.py,Asset Id,د پانګوونې شمیره
 apps/erpnext/erpnext/healthcare/doctype/healthcare_service_unit/healthcare_service_unit.js,This is a root healthcare service unit and cannot be edited.,دا د صحي خدماتو ريښه ده او نشي کولی چې سمبال شي.
 DocType: Asset Repair,Repair Status,د ترمیم حالت
 apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.js,"Requested Qty: Quantity requested for purchase, but not ordered.",غوښتنه شوې مقدار: مقدار د پیرود لپاره غوښتنه کړې ، مګر امر یې نه دی شوی.
diff --git a/erpnext/translations/pt.csv b/erpnext/translations/pt.csv
index ac67694..b060aba 100644
--- a/erpnext/translations/pt.csv
+++ b/erpnext/translations/pt.csv
@@ -289,7 +289,6 @@
 DocType: Loan,Repay Over Number of Periods,Reembolsar Ao longo Número de Períodos
 apps/erpnext/erpnext/manufacturing/report/bom_stock_report/bom_stock_report.py,Quantity to Produce can not be less than Zero,Quantidade para produzir não pode ser menor que zero
 DocType: Stock Entry,Additional Costs,Custos Adicionais
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Customer &gt; Customer Group &gt; Territory,Cliente&gt; Grupo de clientes&gt; Território
 apps/erpnext/erpnext/accounts/doctype/account/account.py,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
@@ -587,6 +586,7 @@
 DocType: Healthcare Settings,Create documents for sample collection,Criar documentos para recolha de amostras
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py,Payment against {0} {1} cannot be greater than Outstanding Amount {2},O pagamento de {0} {1} não pode ser superior ao Montante em Dívida {2}
 apps/erpnext/erpnext/patches/v11_0/add_healthcare_service_unit_tree_root.py,All Healthcare Service Units,Todas as Unidades de Serviço de Saúde
+apps/erpnext/erpnext/setup/default_energy_point_rules.py,On Converting Opportunity,Sobre a conversão de oportunidades
 DocType: Bank Account,Address HTML,Endereço HTML
 DocType: Lead,Mobile No.,N.º de Telemóvel
 apps/erpnext/erpnext/selling/doctype/pos_closing_voucher/closing_voucher_details.html,Mode of Payments,Modo de pagamento
@@ -651,7 +651,6 @@
 DocType: Accounting Dimension,Dimension Name,Nome da Dimensão
 apps/erpnext/erpnext/healthcare/setup.py,Resistant,Resistente
 apps/erpnext/erpnext/hotels/doctype/hotel_room_reservation/hotel_room_reservation.py,Please set Hotel Room Rate on {},Defina a tarifa do quarto do hotel em {}
-apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py,Please setup numbering series for Attendance via Setup &gt; Numbering Series,Configure séries de numeração para Presença em Configuração&gt; Série de numeração
 DocType: Journal Entry,Multi Currency,Múltiplas Moedas
 DocType: Bank Statement Transaction Invoice Item,Invoice Type,Tipo de Fatura
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py,Valid from date must be less than valid upto date,Válido a partir da data deve ser inferior a data de validade
@@ -769,6 +768,7 @@
 apps/erpnext/erpnext/accounts/page/pos/pos.js,Create a new Customer,Criar um novo cliente
 apps/erpnext/erpnext/non_profit/report/expiring_memberships/expiring_memberships.py,Expiring On,Expirando em
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,"If multiple Pricing Rules continue to prevail, users are asked to set Priority manually to resolve conflict.","Se várias Regras de Fixação de Preços continuarem a prevalecer, será pedido aos utilizadores que definam a Prioridade manualmente para que este conflito seja resolvido."
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js,Purchase Return,Devolução de Compra
 apps/erpnext/erpnext/utilities/activation.py,Create Purchase Orders,Criar ordens de compra
 ,Purchase Register,Registo de Compra
 apps/erpnext/erpnext/healthcare/doctype/patient/patient.py,Patient not found,Paciente não encontrado
@@ -784,7 +784,6 @@
 DocType: Location,Area UOM,UOM da área
 apps/erpnext/erpnext/manufacturing/doctype/workstation/workstation.py,Workstation is closed on the following dates as per Holiday List: {0},"O Posto de Trabalho está encerrado nas seguintes datas, conforme a Lista de Feriados: {0}"
 apps/erpnext/erpnext/selling/page/sales_funnel/sales_funnel.py,Opportunities,Oportunidades
-apps/erpnext/erpnext/www/all-products/index.html,Clear filters,Limpar filtros
 DocType: Lab Test Template,Single,Solteiro/a
 DocType: Compensatory Leave Request,Work From Date,Trabalho a partir da data
 DocType: Salary Slip,Total Loan Repayment,O reembolso total do empréstimo
@@ -828,6 +827,7 @@
 apps/erpnext/erpnext/education/doctype/program_enrollment_tool/program_enrollment_tool.py,Mandatory field - Academic Year,Campo obrigatório - Ano Acadêmico
 apps/erpnext/erpnext/education/doctype/program_enrollment_tool/program_enrollment_tool.py,Mandatory field - Academic Year,Campo obrigatório - Ano Acadêmico
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py,{0} {1} is not associated with {2} {3},{0} {1} não está associado a {2} {3}
+DocType: Opportunity,Converted By,Convertido por
 apps/erpnext/erpnext/public/js/hub/components/ReviewArea.vue,You need to login as a Marketplace User before you can add any reviews.,Você precisa fazer login como usuário do Marketplace antes de poder adicionar comentários.
 apps/erpnext/erpnext/manufacturing/doctype/job_card/job_card.py,Row {0} : Operation is required against the raw material item {1},Linha {0}: A operação é necessária em relação ao item de matéria-prima {1}
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py,Please set default payable account for the company {0},Defina a conta pagável padrão da empresa {0}
@@ -854,6 +854,8 @@
 DocType: Sales Invoice,Total Qty,Qtd Total
 apps/erpnext/erpnext/education/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py,Guardian2 Email ID,ID de e-mail do Guardian2
 apps/erpnext/erpnext/education/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py,Guardian2 Email ID,ID de e-mail do Guardian2
+apps/erpnext/erpnext/hr/doctype/employee_transfer/employee_transfer.py,"Please delete the Employee <a href=""#Form/Employee/{0}"">{0}</a>\
+					to cancel this document","Por favor, exclua o funcionário <a href=""#Form/Employee/{0}"">{0}</a> \ para cancelar este documento"
 DocType: Item,Show in Website (Variant),Show em site (Variant)
 DocType: Employee,Health Concerns,Problemas Médicos
 DocType: Payroll Entry,Select Payroll Period,Selecione o Período de Pagamento
@@ -914,7 +916,6 @@
 DocType: Codification Table,Codification Table,Tabela de codificação
 DocType: Timesheet Detail,Hrs,Hrs
 apps/erpnext/erpnext/manufacturing/page/bom_comparison_tool/bom_comparison_tool.js,Changes in {0},Alterações em {0}
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js,Please select Company,"Por favor, selecione a Empresa"
 DocType: Employee Skill,Employee Skill,Habilidade dos Funcionários
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.js,Difference Account,Conta de Diferenças
 DocType: Pricing Rule,Discount on Other Item,Desconto no outro item
@@ -983,6 +984,7 @@
 DocType: BOM,Operating Cost,Custo de Funcionamento
 DocType: Crop,Produced Items,Artigos produzidos
 DocType: Bank Statement Transaction Entry,Match Transaction to Invoices,Corresponder transação a faturas
+apps/erpnext/erpnext/erpnext_integrations/exotel_integration.py,Error in Exotel incoming call,Erro na chamada recebida do Exotel
 DocType: Sales Order Item,Gross Profit,Lucro Bruto
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js,Unblock Invoice,Desbloquear fatura
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py,Increment cannot be 0,O Aumento não pode ser 0
@@ -1196,6 +1198,7 @@
 DocType: Activity Cost,Activity Type,Tipo de Atividade
 DocType: Request for Quotation,For individual supplier,Para cada fornecedor
 DocType: BOM Operation,Base Hour Rate(Company Currency),Preço Base por Hora (Moeda da Empresa)
+,Qty To Be Billed,Quantidade a ser faturada
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py,Delivered Amount,Montante Entregue
 apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.js,Reserved Qty for Production: Raw materials quantity to make manufacturing items.,Quantidade reservada para produção: quantidade de matérias-primas para fabricar itens de produção.
 DocType: Loyalty Point Entry Redemption,Redemption Date,Data de resgate
@@ -1314,7 +1317,7 @@
 DocType: Sales Invoice,Commission Rate (%),Taxa de Comissão (%)
 apps/erpnext/erpnext/education/doctype/student_group/student_group.py,Please select Program,Selecione o programa
 DocType: Project,Estimated Cost,Custo Estimado
-DocType: Request for Quotation,Link to material requests,Link para pedidos de material
+DocType: Supplier Quotation,Link to material requests,Link para pedidos de material
 apps/erpnext/erpnext/public/js/hub/pages/Publish.vue,Publish,Publicar
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py,Aerospace,Espaço Aéreo
 ,Fichier des Ecritures Comptables [FEC],Fichier des Ecritures Comptables [FEC]
@@ -1327,6 +1330,7 @@
 apps/erpnext/erpnext/utilities/transaction_base.py,Invalid Posting Time,Tempo de lançamento inválido
 DocType: Salary Component,Condition and Formula,Condição e Fórmula
 DocType: Lead,Campaign Name,Nome da Campanha
+apps/erpnext/erpnext/setup/default_energy_point_rules.py,On Task Completion,Na conclusão da tarefa
 apps/erpnext/erpnext/hr/doctype/compensatory_leave_request/compensatory_leave_request.py,There is no leave period in between {0} and {1},Não há período de licença entre {0} e {1}
 DocType: Fee Validity,Healthcare Practitioner,Praticante de Saúde
 DocType: Hotel Room,Capacity,Capacidade
@@ -1690,7 +1694,6 @@
 DocType: Quality Feedback Template,Quality Feedback Template,Modelo de Feedback de Qualidade
 apps/erpnext/erpnext/config/education.py,LMS Activity,Atividade LMS
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py,Internet Publishing,Publicações na Internet
-DocType: Prescription Duration,Number,Número
 apps/erpnext/erpnext/accounts/doctype/opening_invoice_creation_tool/opening_invoice_creation_tool.js,Creating {0} Invoice,Criando {0} Fatura
 DocType: Medical Code,Medical Code Standard,Padrão do Código Médico
 DocType: Soil Texture,Clay Composition (%),Composição da argila (%)
@@ -1765,6 +1768,7 @@
 DocType: Support Settings,Get Started Sections,Seções iniciais
 DocType: Lead,CRM-LEAD-.YYYY.-,CRM-LEAD-.YYYY.-
 DocType: Invoice Discounting,Sanctioned,sancionada
+,Base Amount,Valor base
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.js,Total Contribution Amount: {0},Valor total da contribuição: {0}
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py,Row #{0}: Please specify Serial No for Item {1},"Linha #{0}: Por favor, especifique o Nr. de Série para o Item {1}"
 DocType: Payroll Entry,Salary Slips Submitted,Slips Salariais enviados
@@ -1987,6 +1991,7 @@
 DocType: Accounting Dimension,Dimension Defaults,Padrões de Dimensão
 apps/erpnext/erpnext/crm/report/prospects_engaged_but_not_converted/prospects_engaged_but_not_converted.js,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,Minimum Lead Age (Days),Idade mínima de entrega (dias)
+apps/erpnext/erpnext/assets/report/fixed_asset_register/fixed_asset_register.py,Available For Use Date,Data de uso disponível
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py,All BOMs,Todos os BOMs
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js,Create Inter Company Journal Entry,Criar entrada de diário entre empresas
 DocType: Company,Parent Company,Empresa-mãe
@@ -2051,6 +2056,7 @@
 ,IRS 1099,IRS 1099
 DocType: Salary Slip,Leave Without Pay,Licença Sem Vencimento
 DocType: Payment Request,Outward,Para fora
+apps/erpnext/erpnext/setup/default_energy_point_rules.py,On {0} Creation,Na criação de {0}
 apps/erpnext/erpnext/regional/doctype/gstr_3b_report/gstr_3b_report.html,State/UT Tax,Imposto do Estado / UT
 ,Trial Balance for Party,Balancete para a Parte
 ,Gross and Net Profit Report,Relatório de Lucro Bruto e Líquido
@@ -2166,6 +2172,7 @@
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js,Make Stock Entry,Fazer entrada de estoque
 DocType: Hotel Room Reservation,Hotel Reservation User,Usuário de reserva de hotel
 apps/erpnext/erpnext/projects/doctype/project/project.js,Set Status,Definir status
+apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py,Please setup numbering series for Attendance via Setup &gt; Numbering Series,Configure séries de numeração para Presença em Configuração&gt; Série de numeração
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py,Please select prefix first,"Por favor, seleccione o prefixo primeiro"
 DocType: Contract,Fulfilment Deadline,Prazo de Cumprimento
 apps/erpnext/erpnext/public/js/hub/pages/Home.vue,Near you,Perto de você
@@ -2181,6 +2188,7 @@
 DocType: Announcement,All Students,Todos os Alunos
 apps/erpnext/erpnext/assets/doctype/asset/asset.py,Item {0} must be a non-stock item,O Item {0} deve ser um item não inventariado
 apps/erpnext/erpnext/stock/doctype/batch/batch.js,View Ledger,Ver Livro
+DocType: Cost Center,Lft,Esq
 DocType: Grading Scale,Intervals,intervalos
 DocType: Bank Statement Transaction Entry,Reconciled Transactions,Transações reconciliadas
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py,Earliest,Mais Cedo
@@ -2296,6 +2304,7 @@
 apps/erpnext/erpnext/hr/doctype/employee_benefit_application/employee_benefit_application.py,As per your assigned Salary Structure you cannot apply for benefits,"De acordo com a estrutura salarial atribuída, você não pode solicitar benefícios"
 apps/erpnext/erpnext/stock/doctype/item/item.py,Website Image should be a public file or website URL,O Website de Imagem deve ser um ficheiro público ou um URL de website
 DocType: Purchase Invoice Item,BOM,LDM
+apps/erpnext/erpnext/stock/doctype/item/item.py,Duplicate entry in Manufacturers table,Entrada duplicada na tabela Fabricantes
 apps/erpnext/erpnext/setup/doctype/item_group/item_group.js,This is a root item group and cannot be edited.,Este é um item principal e não pode ser editado.
 apps/erpnext/erpnext/accounts/doctype/account/account.js,Merge,Mesclar
 DocType: Journal Entry Account,Purchase Order,Ordem de Compra
@@ -2441,7 +2450,6 @@
 DocType: Asset,Depreciation Schedules,Cronogramas de Depreciação
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.js,Create Sales Invoice,Criar fatura de vendas
 apps/erpnext/erpnext/regional/doctype/gstr_3b_report/gstr_3b_report.html,Ineligible ITC,ITC não elegível
-apps/erpnext/erpnext/erpnext_integrations/doctype/shopify_settings/shopify_settings.py,"Support for public app is deprecated. Please setup private app, for more details refer user manual","O suporte para o aplicativo público está obsoleto. Por favor, instale aplicativo privado, para mais detalhes consulte o manual do usuário"
 DocType: Task,Dependent Tasks,Tarefas Dependentes
 apps/erpnext/erpnext/regional/report/gstr_1/gstr_1.py,Following accounts might be selected in GST Settings:,As seguintes contas podem ser selecionadas nas Configurações de GST:
 apps/erpnext/erpnext/manufacturing/report/bom_stock_report/bom_stock_report.js,Quantity to Produce,Quantidade para produzir
@@ -2694,6 +2702,7 @@
 DocType: Water Analysis,Container,Recipiente
 apps/erpnext/erpnext/regional/report/gstr_1/gstr_1.py,Please set valid GSTIN No. in Company Address,Defina o número GSTIN válido no endereço da empresa
 apps/erpnext/erpnext/education/utils.py,Student {0} - {1} appears Multiple times in row {2} & {3},O aluno {0} - {1} aparece Diversas vezes na linha {2} e {3}
+apps/erpnext/erpnext/selling/doctype/customer/customer.py,Following fields are mandatory to create address:,Os campos a seguir são obrigatórios para criar um endereço:
 DocType: Item Alternative,Two-way,Em dois sentidos
 DocType: Item,Manufacturers,Fabricantes
 apps/erpnext/erpnext/accounts/deferred_revenue.py,Error while processing deferred accounting for {0},Erro ao processar contabilização diferida para {0}
@@ -2769,9 +2778,9 @@
 DocType: Employee,HR-EMP-,HR-EMP-
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py,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: Quality Meeting Minutes,Quality Meeting Minutes,Minutos da Reunião de Qualidade
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Supplier &gt; Supplier Type,Fornecedor&gt; Tipo de fornecedor
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py,Employee Referral,Referência de funcionário
 DocType: Student Group,Set 0 for no limit,Defina 0 para sem limite
+DocType: Cost Center,rgt,rgt
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py,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.
 DocType: Customer,Primary Address and Contact Detail,Endereço principal e detalhes de contato
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.js,Resend Payment Email,Reenviar Email de Pagamento
@@ -2881,7 +2890,6 @@
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py,Against Supplier Invoice {0} dated {1},Na Fatura de Fornecedor {0} datada de {1}
 DocType: Customer,Default Price List,Lista de Preços Padrão
 apps/erpnext/erpnext/assets/doctype/asset/asset.py,Asset Movement record {0} created,Foi criado o registo do Movimento do Ativo {0}
-apps/erpnext/erpnext/utilities/page/leaderboard/leaderboard.js,No items found.,Nenhum item encontrado.
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py,You cannot delete Fiscal Year {0}. Fiscal Year {0} is set as default in Global Settings,Não pode eliminar o Ano Fiscal de {0}. O Ano Fiscal de {0} está definido como padrão nas Definições Gerais
 DocType: Share Transfer,Equity/Liability Account,Conta de patrimônio / responsabilidade
 apps/erpnext/erpnext/setup/doctype/customer_group/customer_group.py,A customer with the same name already exists,Um cliente com o mesmo nome já existe
@@ -2897,6 +2905,7 @@
 apps/erpnext/erpnext/selling/doctype/customer/customer.py,Credit limit has been crossed for customer {0} ({1}/{2}),O limite de crédito foi cruzado para o cliente {0} ({1} / {2})
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py,Customer required for 'Customerwise Discount',"É necessário colocar o Cliente para o""'Desconto de Cliente"""
 apps/erpnext/erpnext/config/accounting.py,Update bank payment dates with journals.,Atualização de pagamento bancário com data do diário.
+,Billed Qty,Quantidade faturada
 apps/erpnext/erpnext/stock/doctype/item/item_dashboard.py,Pricing,Fix. de Preços
 DocType: Employee,Attendance Device ID (Biometric/RF tag ID),ID do dispositivo de atendimento (ID de tag biométrico / RF)
 DocType: Quotation,Term Details,Dados de Término
@@ -2920,6 +2929,7 @@
 DocType: Share Transfer,Asset Account,Conta de Ativo
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js,New release date should be in the future,A nova data de lançamento deve estar no futuro
 DocType: Purchase Invoice,End date of current invoice's period,A data de término do período de fatura atual
+apps/erpnext/erpnext/hr/doctype/employee/employee.py,Please setup Employee Naming System in Human Resource &gt; HR Settings,Configure o sistema de nomeação de funcionários em Recursos humanos&gt; Configurações de RH
 DocType: Lab Test,Technician Name,Nome do Técnico
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py,"Cannot ensure delivery by Serial No as \
 					Item {0} is added with and without Ensure Delivery by \
@@ -2927,6 +2937,7 @@
 DocType: Accounts Settings,Unlink Payment on Cancellation of Invoice,Desvincular Pagamento no Cancelamento da Fatura
 DocType: Bank Reconciliation,From Date,Data De
 apps/erpnext/erpnext/hr/doctype/vehicle_log/vehicle_log.py,Current Odometer reading entered should be greater than initial Vehicle Odometer {0},A leitura do Conta-quilómetros atual deve ser superior à leitura inicial do Conta-quilómetros {0}
+,Purchase Order Items To Be Received or Billed,Itens do pedido a serem recebidos ou faturados
 DocType: Restaurant Reservation,No Show,No Show
 apps/erpnext/erpnext/regional/india/utils.py,You must be a registered supplier to generate e-Way Bill,Você deve ser um fornecedor registrado para gerar e-Way Bill
 DocType: Shipping Rule Country,Shipping Rule Country,País de Regra de Envio
@@ -2969,6 +2980,7 @@
 apps/erpnext/erpnext/templates/generators/item/item_add_to_cart.html,View in Cart,Ver Carrinho
 DocType: Employee Checkin,Shift Actual Start,Mudança de Partida Real
 DocType: Tally Migration,Is Day Book Data Imported,Os dados do livro diário são importados
+,Purchase Order Items To Be Received or Billed1,Itens do pedido a serem recebidos ou faturados1
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py,Marketing Expenses,Despesas de Marketing
 apps/erpnext/erpnext/stock/doctype/pick_list/pick_list.py,{0} units of {1} is not available.,{0} unidades de {1} não estão disponíveis.
 ,Item Shortage Report,Comunicação de Falta de Item
@@ -3197,7 +3209,6 @@
 apps/erpnext/erpnext/public/js/call_popup/call_popup.js,View all issues from {0},Ver todas as edições de {0}
 DocType: Quality Inspection,MAT-QA-.YYYY.-,MAT-QA-.YYYY.-
 DocType: Quality Meeting Table,Quality Meeting Table,Mesa de reunião de qualidade
-apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,Defina Naming Series como {0} em Configuração&gt; Configurações&gt; Naming Series
 apps/erpnext/erpnext/templates/pages/help.html,Visit the forums,Visite os fóruns
 DocType: Student,Student Mobile Number,Número de telemóvel do Estudante
 DocType: Item,Has Variants,Tem Variantes
@@ -3342,6 +3353,7 @@
 ,Campaign Efficiency,Eficiência da Campanha
 ,Campaign Efficiency,Eficiência da Campanha
 DocType: Discussion,Discussion,Discussão
+apps/erpnext/erpnext/setup/default_energy_point_rules.py,On Sales Order Submission,No envio da ordem do cliente
 DocType: Bank Transaction,Transaction ID,ID da Transação
 DocType: Payroll Entry,Deduct Tax For Unsubmitted Tax Exemption Proof,Imposto de dedução para comprovação de isenção fiscal não enviada
 DocType: Volunteer,Anytime,A qualquer momento
@@ -3349,7 +3361,6 @@
 DocType: Employee Tax Exemption Proof Submission,Employee Tax Exemption Proof Submission,Submissão de prova de isenção de imposto de empregado
 DocType: Patient,Surgical History,História cirúrgica
 DocType: Bank Statement Settings Item,Mapped Header,Cabeçalho Mapeado
-apps/erpnext/erpnext/hr/doctype/employee/employee.py,Please setup Employee Naming System in Human Resource &gt; HR Settings,Configure o sistema de nomeação de funcionários em Recursos humanos&gt; Configurações de RH
 DocType: Employee,Resignation Letter Date,Data de Carta de Demissão
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Pricing Rules are further filtered based on quantity.,As Regras de Fixação de Preços são filtradas adicionalmente com base na quantidade.
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py,Please set the Date Of Joining for employee {0},Defina a data de início da sessão para o empregado {0}
@@ -3364,6 +3375,7 @@
 DocType: Bank Statement Settings,Mapped Items,Itens Mapeados
 DocType: Amazon MWS Settings,IT,ISTO
 DocType: Chapter,Chapter,Capítulo
+,Fixed Asset Register,Registro de Ativo Fixo
 apps/erpnext/erpnext/utilities/user_progress.py,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,Select BOM and Qty for Production,Selecione BOM e Qtde de Produção
@@ -3499,7 +3511,6 @@
 apps/erpnext/erpnext/templates/emails/reorder_item.html,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
 apps/erpnext/erpnext/controllers/accounts_controller.py,Account {0} is invalid. Account Currency must be {1},A conta {0} é inválida. A Moeda da Conta deve ser {1}
 apps/erpnext/erpnext/hr/doctype/salary_structure_assignment/salary_structure_assignment.py,From Date {0} cannot be after employee's relieving Date {1},A partir da data {0} não pode ser após a data de alívio do empregado {1}
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py,Debit Note {0} has been created automatically,A nota de débito {0} foi criada automaticamente
 apps/erpnext/erpnext/accounts/doctype/payment_order/payment_order.js,Create Payment Entries,Criar entradas de pagamento
 DocType: Supplier,Is Internal Supplier,É fornecedor interno
 DocType: Employee,Create User Permission,Criar permissão de usuário
@@ -4062,7 +4073,6 @@
 DocType: Project User,Project Status,Estado do Projeto
 DocType: UOM,Check this to disallow fractions. (for Nos),Selecione esta opção para não permitir frações. (Para Nrs.)
 DocType: Student Admission Program,Naming Series (for Student Applicant),Séries de Atribuição de Nomes (para Estudantes Candidatos)
-apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.py,UOM Conversion factor ({0} -&gt; {1}) not found for item: {2},Fator de conversão de UOM ({0} -&gt; {1}) não encontrado para o item: {2}
 apps/erpnext/erpnext/hr/doctype/retention_bonus/retention_bonus.py,Bonus Payment Date cannot be a past date,Data de pagamento do bônus não pode ser uma data passada
 DocType: Travel Request,Copy of Invitation/Announcement,Cópia do convite / anúncio
 DocType: Practitioner Service Unit Schedule,Practitioner Service Unit Schedule,Programa de Unidade de Serviço do Praticante
@@ -4231,6 +4241,7 @@
 apps/erpnext/erpnext/utilities/user_progress.py,Setup Company,Empresa de Configuração
 ,Lab Test Report,Relatório de teste de laboratório
 DocType: Employee Benefit Application,Employee Benefit Application,Aplicação de benefício do empregado
+apps/erpnext/erpnext/accounts/doctype/invoice_discounting/invoice_discounting.py,Row({0}): {1} is already discounted in {2},Linha ({0}): {1} já está com desconto em {2}
 apps/erpnext/erpnext/hr/doctype/additional_salary/additional_salary.py,Additional Salary Component Exists.,Componente salarial adicional existente.
 DocType: Purchase Invoice,Unregistered,Não registrado
 DocType: Student Applicant,Application Date,Data de Candidatura
@@ -4310,7 +4321,6 @@
 DocType: Journal Entry,Accounting Entries,Registos Contabilísticos
 DocType: Job Card Time Log,Job Card Time Log,Registro de tempo do cartão de trabalho
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,"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;."
-apps/erpnext/erpnext/education/doctype/instructor/instructor.py,Please setup Instructor Naming System in Education &gt; Education Settings,Configure o Sistema de Nomenclatura do Instrutor em Educação&gt; Configurações de educação
 DocType: Journal Entry,Paid Loan,Empréstimo pago
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py,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
@@ -4327,7 +4337,6 @@
 apps/erpnext/erpnext/templates/pages/projects.html,No time sheets,Não há folhas de tempo
 DocType: GoCardless Mandate,GoCardless Customer,Cliente GoCardless
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py,Leave Type {0} cannot be carry-forwarded,O Tipo de  Licença {0} não pode ser do tipo avançar
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Item Code &gt; Item Group &gt; Brand,Código do item&gt; Grupo de itens&gt; Marca
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py,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
 DocType: Leave Encashment,Payroll,Folha de Pagamento
@@ -4443,7 +4452,6 @@
 DocType: Stock Ledger Entry,Actual Qty After Transaction,Qtd Efetiva Após Transação
 ,Pending SO Items For Purchase Request,Itens Pendentes PV para Solicitação de Compra
 apps/erpnext/erpnext/education/doctype/student_admission/student_admission.py,Student Admissions,Admissão de Estudantes
-apps/erpnext/erpnext/accounts/party.py,{0} {1} is disabled,{0} {1} está desativado
 DocType: Supplier,Billing Currency,Moeda de Faturação
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py,Extra Large,Extra-Grande
 DocType: Loan,Loan Application,Pedido de Empréstimo
@@ -4520,7 +4528,6 @@
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py,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/accounts/doctype/accounting_dimension/accounting_dimension.py,Creating Dimensions...,Criando Dimensões ...
 apps/erpnext/erpnext/education/doctype/student_group_creation_tool/student_group_creation_tool.py,Student Group Name is mandatory in row {0},É obrigatório colocar o Nome do Grupo de Estudantes na linha {0}
-DocType: Customer Credit Limit,Bypass credit limit_check,Ignorar limite de crédito_check
 DocType: Homepage,Products to be shown on website homepage,Os produtos a serem mostrados na página inicial do website
 DocType: HR Settings,Password Policy,Política de Senha
 apps/erpnext/erpnext/setup/doctype/customer_group/customer_group.js,This is a root customer group and cannot be edited.,Este é um cliente principal e não pode ser editado.
@@ -4826,6 +4833,7 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py,Row {0}: Advance against Customer must be credit,Linha {0}: O Avanço do Cliente deve ser creditado
 DocType: Quality Meeting,Quality Meeting,Encontro de Qualidade
 apps/erpnext/erpnext/accounts/doctype/account/account.js,Non-Group to Group,De Fora do Grupo a Grupo
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,Defina Naming Series como {0} em Configuração&gt; Configurações&gt; Naming Series
 DocType: Employee,ERPNext User,Usuário do ERPNext
 apps/erpnext/erpnext/education/doctype/student_group_creation_tool/student_group_creation_tool.py,Batch is mandatory in row {0},O lote é obrigatório na linha {0}
 apps/erpnext/erpnext/education/doctype/student_group_creation_tool/student_group_creation_tool.py,Batch is mandatory in row {0},O lote é obrigatório na linha {0}
@@ -5124,6 +5132,7 @@
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py,No {0} found for Inter Company Transactions.,Nenhum {0} encontrado para transações entre empresas.
 DocType: Travel Itinerary,Rented Car,Carro alugado
 apps/erpnext/erpnext/public/js/hub/components/profile_dialog.js,About your Company,Sobre a sua empresa
+apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.js,Show Stock Ageing Data,Mostrar dados de estoque
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py,Credit To account must be a Balance Sheet account,A conta de Crédito Para deve ser uma conta de Balanço
 DocType: Donor,Donor,Doador
 DocType: Global Defaults,Disable In Words,Desativar Por Extenso
@@ -5138,8 +5147,10 @@
 DocType: Practitioner Schedule,Schedule Name,Nome da programação
 apps/erpnext/erpnext/regional/doctype/gstr_3b_report/gstr_3b_report.py,Please enter GSTIN and state for the Company Address {0},"Por favor, digite GSTIN e informe o endereço da empresa {0}"
 DocType: Currency Exchange,For Buying,Para comprar
+apps/erpnext/erpnext/setup/default_energy_point_rules.py,On Purchase Order Submission,No envio do pedido
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js,Add All Suppliers,Adicionar todos os fornecedores
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py,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/accounts/doctype/pricing_rule/pricing_rule.js,Customer &gt; Customer Group &gt; Territory,Cliente&gt; Grupo de clientes&gt; Território
 DocType: Tally Migration,Parties,Festas
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js,Browse BOM,Pesquisar na LDM
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py,Secured Loans,Empréstimos Garantidos
@@ -5171,6 +5182,7 @@
 apps/erpnext/erpnext/stock/doctype/item_alternative/item_alternative.py,Not allow to set alternative item for the item {0},Não permite definir item alternativo para o item {0}
 apps/erpnext/erpnext/hr/doctype/leave_block_list/leave_block_list.py,Date is repeated,A data está repetida
 apps/erpnext/erpnext/accounts/print_format/payment_receipt_voucher/payment_receipt_voucher.html,Authorized Signatory,Signatário Autorizado
+apps/erpnext/erpnext/education/doctype/instructor/instructor.py,Please setup Instructor Naming System in Education &gt; Education Settings,Configure o Sistema de Nomenclatura do Instrutor em Educação&gt; Configurações de educação
 apps/erpnext/erpnext/regional/doctype/gstr_3b_report/gstr_3b_report.html,Net ITC Available(A) - (B),ITC líquido disponível (A) - (B)
 apps/erpnext/erpnext/education/doctype/fee_schedule/fee_schedule.js,Create Fees,Criar Taxas
 DocType: Project,Total Purchase Cost (via Purchase Invoice),Custo total de compra (através da Fatura de Compra)
@@ -5191,6 +5203,7 @@
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.js,Message Sent,Mensagem Enviada
 apps/erpnext/erpnext/accounts/doctype/account/account.py,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/assets/report/fixed_asset_register/fixed_asset_register.py,Vendor Name,Nome do vendedor
 DocType: Quiz Result,Wrong,Errado
 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)
@@ -5436,6 +5449,7 @@
 DocType: Stock Settings,Auto Material Request,Solitição de Material Automática
 DocType: Woocommerce Settings,API consumer secret,Segredo do consumidor da API
 DocType: Delivery Note Item,Available Batch Qty at From Warehouse,Qtd de Lote Disponível em Do Armazém
+,Received Qty Amount,Quantidade de quantidade recebida
 DocType: Salary Slip,Gross Pay - Total Deduction - Loan Repayment,Pagamento Bruto - Dedução Total - reembolso do empréstimo
 DocType: Bank Account,Last Integration Date,Última data de integração
 DocType: Expense Claim,Expense Taxes and Charges,Impostos e Taxas de Despesas
@@ -5900,6 +5914,8 @@
 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,Please select Qty against item {0},Selecione Qtd. Contra o item {0}
+apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py,Latest Age,Idade mais recente
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js,Transfer Material to Supplier,Transferência de material para Fornecedor
 apps/erpnext/erpnext/hr/report/loan_repayment/loan_repayment.py,EMI,EMI
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py,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
@@ -5923,7 +5939,6 @@
 apps/erpnext/erpnext/hr/doctype/employee_benefit_application/employee_benefit_application.py,"An amount of {0} already claimed for the component {1},\
 						 set the amount equal or greater than {2}","Uma quantia de {0} já reivindicada para o componente {1}, \ configure o valor igual ou maior que {2}"
 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
 DocType: BOM Update Tool,The new BOM after replacement,A LDM nova após substituição
 ,Point of Sale,Ponto de Venda
@@ -6044,7 +6059,6 @@
 DocType: Purchase Order Item,Blanket Order Rate,Taxa de ordem de cobertura
 ,Customer Ledger Summary,Resumo do ledger de clientes
 apps/erpnext/erpnext/hooks.py,Certification,Certificação
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js,Are you sure you want to make debit note?,Tem certeza de que deseja fazer uma nota de débito?
 DocType: Bank Guarantee,Clauses and Conditions,Cláusulas e Condições
 DocType: Serial No,Creation Document Type,Tipo de Criação de Documento
 DocType: Amazon MWS Settings,ES,ES
@@ -6082,8 +6096,6 @@
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py,Financial Services,Serviços Financeiros
 DocType: Student Sibling,Student ID,Identidade estudantil
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.js,For Quantity must be greater than zero,Para Quantidade deve ser maior que zero
-apps/erpnext/erpnext/hr/doctype/employee_transfer/employee_transfer.py,"Please delete the Employee <a href=""#Form/Employee/{0}"">{0}</a>\
-					to cancel this document","Por favor, exclua o funcionário <a href=""#Form/Employee/{0}"">{0}</a> \ para cancelar este documento"
 apps/erpnext/erpnext/config/projects.py,Types of activities for Time Logs,Tipos de atividades para Registos de Tempo
 DocType: Opening Invoice Creation Tool,Sales,Vendas
 DocType: Stock Entry Detail,Basic Amount,Montante de Base
@@ -6162,6 +6174,7 @@
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py,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,Send Supplier Emails,Enviar Emails de Fornecedores
+DocType: Asset Movement,ACC-ASM-.YYYY.-,ACC-ASM-.AAA.-
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py,"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
 apps/erpnext/erpnext/hr/doctype/employee_onboarding/employee_onboarding.py,Submit this to create the Employee record,Envie isto para criar o registro do funcionário
@@ -6242,7 +6255,6 @@
 DocType: Sales Team,Contact No.,Nr. de Contacto
 apps/erpnext/erpnext/templates/includes/cart/cart_address.html,Billing Address is same as Shipping Address,O endereço de cobrança é o mesmo do endereço de entrega
 DocType: Bank Reconciliation,Payment Entries,Registos de Pagamento
-apps/erpnext/erpnext/erpnext_integrations/doctype/shopify_settings/shopify_settings.py,Access token or Shopify URL missing,Token de acesso ou URL do Shopify ausente
 DocType: Location,Latitude,Latitude
 DocType: Work Order,Scrap Warehouse,Armazém de Sucata
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py,"Warehouse required at Row No {0}, please set default warehouse for the item {1} for the company {2}","Armazém requerido na Linha Não {0}, por favor, defina armazém padrão para o item {1} para a empresa {2}"
@@ -6287,7 +6299,6 @@
 DocType: Job Offer Term,Value / Description,Valor / Descrição
 apps/erpnext/erpnext/controllers/accounts_controller.py,"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
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js,Are you sure you want to make credit note?,Tem certeza de que deseja fazer uma nota de crédito?
 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,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}.
@@ -6412,6 +6423,7 @@
 DocType: Purchase Invoice,Taxes and Charges Added,Impostos e Encargos Adicionados
 apps/erpnext/erpnext/assets/doctype/asset/asset.py,Depreciation Row {0}: Next Depreciation Date cannot be before Available-for-use Date,Linha de depreciação {0}: a próxima data de depreciação não pode ser anterior à data disponível para uso
 ,Sales Funnel,Canal de Vendas
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Item Code &gt; Item Group &gt; Brand,Código do item&gt; Grupo de itens&gt; Marca
 apps/erpnext/erpnext/setup/doctype/company/company.py,Abbreviation is mandatory,É obrigatório colocar uma abreviatura
 DocType: Project,Task Progress,Progresso da Tarefa
 apps/erpnext/erpnext/templates/includes/navbar/navbar_items.html,Cart,Carrinho
@@ -6658,6 +6670,7 @@
 DocType: Employee Grade,Employee Grade,Employee Grade
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py,Piecework,Trabalho à Peça
 DocType: GSTR 3B Report,June,Junho
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Supplier &gt; Supplier Type,Fornecedor&gt; Tipo de fornecedor
 DocType: Share Balance,From No,De não
 DocType: Shift Type,Early Exit Grace Period,Período de Carência da Saída Antecipada
 DocType: Task,Actual Time (in Hours),Tempo Real (em Horas)
@@ -6950,6 +6963,7 @@
 DocType: Warehouse,Warehouse Name,Nome dp Armazém
 DocType: Naming Series,Select Transaction,Selecionar Transação
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py,Please enter Approving Role or Approving User,"Por favor, insira a Função Aprovadora ou o Utilizador Aprovador"
+apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.py,UOM Conversion factor ({0} -&gt; {1}) not found for item: {2},Fator de conversão de UOM ({0} -&gt; {1}) não encontrado para o item: {2}
 apps/erpnext/erpnext/support/doctype/service_level_agreement/service_level_agreement.py,Service Level Agreement with Entity Type {0} and Entity {1} already exists.,O Acordo de Nível de Serviço com o Tipo de Entidade {0} e a Entidade {1} já existe.
 DocType: Journal Entry,Write Off Entry,Registo de Liquidação
 DocType: BOM,Rate Of Materials Based On,Taxa de Materiais Baseada Em
@@ -7141,6 +7155,7 @@
 DocType: Quality Inspection Reading,Quality Inspection Reading,Leitura de Inspeção de Qualidade
 apps/erpnext/erpnext/stock/doctype/stock_settings/stock_settings.py,`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/stock/report/stock_balance/stock_balance.py,Earliest Age,Idade mais antiga
 apps/erpnext/erpnext/utilities/user_progress.py,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.
 DocType: Quality Goal,Revision,Revisão
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js,Healthcare Services,Serviços de Saúde
@@ -7184,6 +7199,7 @@
 apps/erpnext/erpnext/healthcare/doctype/patient_encounter/patient_encounter.js,Schedule Discharge,Descarga Horária
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py,Cheques and Deposits incorrectly cleared,Os Cheques e Depósitos foram apagados incorretamente
 DocType: Homepage Section Card,Homepage Section Card,Cartão de Seção da Página Inicial
+,Amount To Be Billed,Valor a Faturar
 apps/erpnext/erpnext/accounts/doctype/account/account.py,Account {0}: You can not assign itself as parent account,Conta {0}: Não pode atribuí-la como conta principal
 DocType: Purchase Invoice Item,Price List Rate,PReço na Lista de Preços
 apps/erpnext/erpnext/utilities/activation.py,Create customer quotes,Criar cotações de clientes
@@ -7236,6 +7252,7 @@
 DocType: Supplier Scorecard Criteria,Supplier Scorecard Criteria,Critérios do Scorecard do Fornecedor
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py,Please select Start Date and End Date for Item {0},"Por favor, seleccione a Data de Início e a Data de Término do Item {0}"
 DocType: Maintenance Schedule,MAT-MSH-.YYYY.-,MAT-MSH-.YYYY.-
+,Amount to Receive,Valor a Receber
 apps/erpnext/erpnext/education/doctype/student_group_creation_tool/student_group_creation_tool.py,Course is mandatory in row {0},O Curso é obrigatório na linha {0}
 apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py,From date can not be greater than than To date,A partir da data não pode ser maior que do que Até à data
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py,To date cannot be before from date,A data a não pode ser anterior à data de
@@ -7486,7 +7503,6 @@
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js,BOM and Manufacturing Quantity are required,São necessárias a LDM e a Quantidade de Fabrico
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js,Ageing Range 2,Faixa Etária 2
 DocType: SG Creation Tool Course,Max Strength,Força Máx.
-apps/erpnext/erpnext/accounts/doctype/account/account.py,"Account {0} already exists in child company {1}. The following fields have different values, they should be same:<ul><li>{2}</li></ul>","A conta {0} já existe na empresa filha {1}. Os seguintes campos têm valores diferentes, eles devem ser os mesmos: <ul><li> {2} </li></ul>"
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py,Installing presets,Instalando predefinições
 DocType: Fee Schedule,EDU-FSH-.YYYY.-,EDU-FSH-.YYYY.-
 apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js,No Delivery Note selected for Customer {},Nenhuma nota de entrega selecionada para o cliente {}
@@ -7698,6 +7714,7 @@
 DocType: Delivery Note,Print Without Amount,Imprimir Sem o Montante
 apps/erpnext/erpnext/accounts/report/asset_depreciation_ledger/asset_depreciation_ledger.py,Depreciation Date,Data de Depreciação
 ,Work Orders in Progress,Ordens de serviço em andamento
+DocType: Customer Credit Limit,Bypass Credit Limit Check,Ignorar verificação de limite de crédito
 DocType: Issue,Support Team,Equipa de Apoio
 apps/erpnext/erpnext/stock/report/batch_item_expiry_status/batch_item_expiry_status.py,Expiry (In Days),Validade (em dias)
 DocType: Appraisal,Total Score (Out of 5),Classificação Total (em 5)
@@ -7882,6 +7899,7 @@
 DocType: Sales Invoice,Customer GSTIN,Cliente GSTIN
 DocType: Crop Cycle,List of diseases detected on the field. When selected it'll automatically add a list of tasks to deal with the disease ,"Lista de doenças detectadas no campo. Quando selecionado, ele adicionará automaticamente uma lista de tarefas para lidar com a doença"
 apps/erpnext/erpnext/manufacturing/page/bom_comparison_tool/bom_comparison_tool.js,BOM 1,BOM 1
+apps/erpnext/erpnext/assets/report/fixed_asset_register/fixed_asset_register.py,Asset Id,ID do recurso
 apps/erpnext/erpnext/healthcare/doctype/healthcare_service_unit/healthcare_service_unit.js,This is a root healthcare service unit and cannot be edited.,Esta é uma unidade de serviço de saúde raiz e não pode ser editada.
 DocType: Asset Repair,Repair Status,Status do reparo
 apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.js,"Requested Qty: Quantity requested for purchase, but not ordered.","Aangevraagd Aantal : Aantal op aankoop, maar niet besteld."
diff --git a/erpnext/translations/pt_br.csv b/erpnext/translations/pt_br.csv
index 142fc94..9d5c191 100644
--- a/erpnext/translations/pt_br.csv
+++ b/erpnext/translations/pt_br.csv
@@ -1528,7 +1528,6 @@
 DocType: Fiscal Year,Year Start Date,Data do início do ano
 DocType: Item Attribute,From Range,Da Faixa
 DocType: Bank Reconciliation,Get Payment Entries,Obter Lançamentos de Pagamentos
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js,Please select Company,"Por favor, selecione Empresa"
 DocType: Purchase Invoice,Unpaid,A Pagar
 DocType: Account,Income Account,Conta de Receitas
 DocType: Company,Default Income Account,Conta Padrão de Recebimento
@@ -2209,6 +2208,7 @@
 DocType: GL Entry,Credit Amount,Total de Crédito
 apps/erpnext/erpnext/education/doctype/course_schedule/course_schedule.js,Attendance,Comparecimento
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py,Reserved Qty,Qtde Reservada
+DocType: Cost Center,Lft,LFT
 DocType: Customer Group,Only leaf nodes are allowed in transaction,Somente nós-folha são permitidos em transações
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py,Delay in payment (Days),Atraso no Pagamento (Dias)
 apps/erpnext/erpnext/config/healthcare.py,Record Patient Vitals,Gravar Sinais Vitais do Paciente
diff --git a/erpnext/translations/ro.csv b/erpnext/translations/ro.csv
index 6018f7b..b76120d 100644
--- a/erpnext/translations/ro.csv
+++ b/erpnext/translations/ro.csv
@@ -289,7 +289,6 @@
 DocType: Loan,Repay Over Number of Periods,Rambursa Peste Număr de Perioade
 apps/erpnext/erpnext/manufacturing/report/bom_stock_report/bom_stock_report.py,Quantity to Produce can not be less than Zero,Cantitatea de produs nu poate fi mai mică decât Zero
 DocType: Stock Entry,Additional Costs,Costuri suplimentare
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Customer &gt; Customer Group &gt; Territory,Client&gt; Grup de clienți&gt; Teritoriul
 apps/erpnext/erpnext/accounts/doctype/account/account.py,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
@@ -587,6 +586,7 @@
 DocType: Healthcare Settings,Create documents for sample collection,Creați documente pentru colectarea de mostre
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py,Payment against {0} {1} cannot be greater than Outstanding Amount {2},Plata împotriva {0} {1} nu poate fi mai mare decât Impresionant Suma {2}
 apps/erpnext/erpnext/patches/v11_0/add_healthcare_service_unit_tree_root.py,All Healthcare Service Units,Toate unitățile de servicii medicale
+apps/erpnext/erpnext/setup/default_energy_point_rules.py,On Converting Opportunity,La convertirea oportunității
 DocType: Bank Account,Address HTML,Adresă HTML
 DocType: Lead,Mobile No.,Numar de mobil
 apps/erpnext/erpnext/selling/doctype/pos_closing_voucher/closing_voucher_details.html,Mode of Payments,Modul de plată
@@ -651,7 +651,6 @@
 DocType: Accounting Dimension,Dimension Name,Numele dimensiunii
 apps/erpnext/erpnext/healthcare/setup.py,Resistant,Rezistent
 apps/erpnext/erpnext/hotels/doctype/hotel_room_reservation/hotel_room_reservation.py,Please set Hotel Room Rate on {},Vă rugăm să stabiliți tariful camerei la {}
-apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py,Please setup numbering series for Attendance via Setup &gt; Numbering Series,Vă rugăm să configurați seria de numerotare pentru prezență prin Setare&gt; Numerotare
 DocType: Journal Entry,Multi Currency,Multi valutar
 DocType: Bank Statement Transaction Invoice Item,Invoice Type,Tip Factura
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py,Valid from date must be less than valid upto date,Valabil de la data trebuie să fie mai mic decât valabil până la data actuală
@@ -769,6 +768,7 @@
 apps/erpnext/erpnext/accounts/page/pos/pos.js,Create a new Customer,Creați un nou client
 apps/erpnext/erpnext/non_profit/report/expiring_memberships/expiring_memberships.py,Expiring On,Expirând On
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,"If multiple Pricing Rules continue to prevail, users are asked to set Priority manually to resolve conflict.","În cazul în care mai multe reguli de stabilire a prețurilor continuă să prevaleze, utilizatorii sunt rugați să setați manual prioritate pentru a rezolva conflictul."
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js,Purchase Return,Înapoi cumpărare
 apps/erpnext/erpnext/utilities/activation.py,Create Purchase Orders,Creare comenzi de aprovizionare
 ,Purchase Register,Cumpărare Inregistrare
 apps/erpnext/erpnext/healthcare/doctype/patient/patient.py,Patient not found,Pacientul nu a fost găsit
@@ -784,7 +784,6 @@
 DocType: Location,Area UOM,Zona UOM
 apps/erpnext/erpnext/manufacturing/doctype/workstation/workstation.py,Workstation is closed on the following dates as per Holiday List: {0},Workstation este închis la următoarele date ca pe lista de vacanta: {0}
 apps/erpnext/erpnext/selling/page/sales_funnel/sales_funnel.py,Opportunities,Oportunitati
-apps/erpnext/erpnext/www/all-products/index.html,Clear filters,Șterge filtrele
 DocType: Lab Test Template,Single,Celibatar
 DocType: Compensatory Leave Request,Work From Date,Lucrul de la data
 DocType: Salary Slip,Total Loan Repayment,Rambursarea totală a creditului
@@ -828,6 +827,7 @@
 apps/erpnext/erpnext/education/doctype/program_enrollment_tool/program_enrollment_tool.py,Mandatory field - Academic Year,Domeniu obligatoriu - An universitar
 apps/erpnext/erpnext/education/doctype/program_enrollment_tool/program_enrollment_tool.py,Mandatory field - Academic Year,Domeniu obligatoriu - An universitar
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py,{0} {1} is not associated with {2} {3},{0} {1} nu este asociat cu {2} {3}
+DocType: Opportunity,Converted By,Convertit de
 apps/erpnext/erpnext/public/js/hub/components/ReviewArea.vue,You need to login as a Marketplace User before you can add any reviews.,Trebuie să vă autentificați ca utilizator de piață înainte de a putea adăuga recenzii.
 apps/erpnext/erpnext/manufacturing/doctype/job_card/job_card.py,Row {0} : Operation is required against the raw material item {1},Rândul {0}: operația este necesară împotriva elementului de materie primă {1}
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py,Please set default payable account for the company {0},Ați setat contul de plată implicit pentru compania {0}
@@ -854,6 +854,8 @@
 DocType: Sales Invoice,Total Qty,Raport Cantitate
 apps/erpnext/erpnext/education/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py,Guardian2 Email ID,Codul de e-mail Guardian2
 apps/erpnext/erpnext/education/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py,Guardian2 Email ID,Codul de e-mail Guardian2
+apps/erpnext/erpnext/hr/doctype/employee_transfer/employee_transfer.py,"Please delete the Employee <a href=""#Form/Employee/{0}"">{0}</a>\
+					to cancel this document","Vă rugăm să ștergeți Angajatul <a href=""#Form/Employee/{0}"">{0}</a> \ pentru a anula acest document"
 DocType: Item,Show in Website (Variant),Afișați în site-ul (Variant)
 DocType: Employee,Health Concerns,Probleme de Sanatate
 DocType: Payroll Entry,Select Payroll Period,Perioada de selectare Salarizare
@@ -914,7 +916,6 @@
 DocType: Codification Table,Codification Table,Tabelul de codificare
 DocType: Timesheet Detail,Hrs,ore
 apps/erpnext/erpnext/manufacturing/page/bom_comparison_tool/bom_comparison_tool.js,Changes in {0},Modificări în {0}
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js,Please select Company,Vă rugăm să selectați Company
 DocType: Employee Skill,Employee Skill,Indemanarea angajatilor
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.js,Difference Account,Diferența de Cont
 DocType: Pricing Rule,Discount on Other Item,Reducere la alt articol
@@ -983,6 +984,7 @@
 DocType: BOM,Operating Cost,Costul de operare
 DocType: Crop,Produced Items,Articole produse
 DocType: Bank Statement Transaction Entry,Match Transaction to Invoices,Tranzacționați tranzacția la facturi
+apps/erpnext/erpnext/erpnext_integrations/exotel_integration.py,Error in Exotel incoming call,Eroare în apelul primit la Exotel
 DocType: Sales Order Item,Gross Profit,Profit brut
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js,Unblock Invoice,Deblocați factura
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py,Increment cannot be 0,Creștere nu poate fi 0
@@ -1198,6 +1200,7 @@
 DocType: Activity Cost,Activity Type,Tip Activitate
 DocType: Request for Quotation,For individual supplier,Pentru furnizor individual
 DocType: BOM Operation,Base Hour Rate(Company Currency),Rata de bază ore (companie Moneda)
+,Qty To Be Billed,Cantitate de a fi plătită
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py,Delivered Amount,Suma Pronunțată
 apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.js,Reserved Qty for Production: Raw materials quantity to make manufacturing items.,Cantitate rezervată pentru producție: cantitate de materii prime pentru fabricarea articolelor de fabricație.
 DocType: Loyalty Point Entry Redemption,Redemption Date,Data de răscumpărare
@@ -1318,7 +1321,7 @@
 DocType: Sales Invoice,Commission Rate (%),Rata de Comision (%)
 apps/erpnext/erpnext/education/doctype/student_group/student_group.py,Please select Program,Selectați Program
 DocType: Project,Estimated Cost,Cost estimat
-DocType: Request for Quotation,Link to material requests,Link la cererile de materiale
+DocType: Supplier Quotation,Link to material requests,Link la cererile de materiale
 apps/erpnext/erpnext/public/js/hub/pages/Publish.vue,Publish,Publica
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py,Aerospace,Spaţiul aerian
 ,Fichier des Ecritures Comptables [FEC],Fichier des Ecritures Comptabile [FEC]
@@ -1331,6 +1334,7 @@
 apps/erpnext/erpnext/utilities/transaction_base.py,Invalid Posting Time,Ora nevalidă a postării
 DocType: Salary Component,Condition and Formula,Condiție și formulă
 DocType: Lead,Campaign Name,Denumire campanie
+apps/erpnext/erpnext/setup/default_energy_point_rules.py,On Task Completion,La finalizarea sarcinii
 apps/erpnext/erpnext/hr/doctype/compensatory_leave_request/compensatory_leave_request.py,There is no leave period in between {0} and {1},Nu există o perioadă de concediu între {0} și {1}
 DocType: Fee Validity,Healthcare Practitioner,Medicul de îngrijire medicală
 DocType: Hotel Room,Capacity,Capacitate
@@ -1695,7 +1699,6 @@
 DocType: Quality Feedback Template,Quality Feedback Template,Șablon de feedback de calitate
 apps/erpnext/erpnext/config/education.py,LMS Activity,Activitate LMS
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py,Internet Publishing,Editura Internet
-DocType: Prescription Duration,Number,Număr
 apps/erpnext/erpnext/accounts/doctype/opening_invoice_creation_tool/opening_invoice_creation_tool.js,Creating {0} Invoice,Crearea facturii {0}
 DocType: Medical Code,Medical Code Standard,Codul medical standard
 DocType: Soil Texture,Clay Composition (%),Compoziția de lut (%)
@@ -1770,6 +1773,7 @@
 DocType: Support Settings,Get Started Sections,Începeți secțiunile
 DocType: Lead,CRM-LEAD-.YYYY.-,CRM-LEAD-.YYYY.-
 DocType: Invoice Discounting,Sanctioned,consacrat
+,Base Amount,Suma de bază
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.js,Total Contribution Amount: {0},Suma totală a contribuției: {0}
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py,Row #{0}: Please specify Serial No for Item {1},Rând # {0}: Vă rugăm să specificați Nu serial pentru postul {1}
 DocType: Payroll Entry,Salary Slips Submitted,Salariile trimise
@@ -1991,6 +1995,7 @@
 apps/erpnext/erpnext/utilities/user_progress.py,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.
 DocType: Accounting Dimension,Dimension Defaults,Valorile implicite ale dimensiunii
 apps/erpnext/erpnext/crm/report/prospects_engaged_but_not_converted/prospects_engaged_but_not_converted.js,Minimum Lead Age (Days),Vârsta minimă de plumb (zile)
+apps/erpnext/erpnext/assets/report/fixed_asset_register/fixed_asset_register.py,Available For Use Date,Disponibil pentru data de utilizare
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py,All BOMs,toate BOM
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js,Create Inter Company Journal Entry,Creați jurnalul companiei Inter
 DocType: Company,Parent Company,Compania mamă
@@ -2055,6 +2060,7 @@
 ,IRS 1099,IRS 1099
 DocType: Salary Slip,Leave Without Pay,Concediu Fără Plată
 DocType: Payment Request,Outward,Exterior
+apps/erpnext/erpnext/setup/default_energy_point_rules.py,On {0} Creation,La {0} Creație
 apps/erpnext/erpnext/regional/doctype/gstr_3b_report/gstr_3b_report.html,State/UT Tax,Impozitul de stat / UT
 ,Trial Balance for Party,Trial Balance pentru Party
 ,Gross and Net Profit Report,Raport de profit brut și net
@@ -2172,6 +2178,7 @@
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js,Make Stock Entry,Faceți intrarea în stoc
 DocType: Hotel Room Reservation,Hotel Reservation User,Utilizator rezervare hotel
 apps/erpnext/erpnext/projects/doctype/project/project.js,Set Status,Setați starea
+apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py,Please setup numbering series for Attendance via Setup &gt; Numbering Series,Vă rugăm să configurați seria de numerotare pentru prezență prin Setare&gt; Numerotare
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py,Please select prefix first,Vă rugăm să selectați prefix întâi
 DocType: Contract,Fulfilment Deadline,Termenul de îndeplinire
 apps/erpnext/erpnext/public/js/hub/pages/Home.vue,Near you,Lângă tine
@@ -2187,6 +2194,7 @@
 DocType: Announcement,All Students,toţi elevii
 apps/erpnext/erpnext/assets/doctype/asset/asset.py,Item {0} must be a non-stock item,Postul {0} trebuie să fie un element de bază non-stoc
 apps/erpnext/erpnext/stock/doctype/batch/batch.js,View Ledger,Vezi Registru Contabil
+DocType: Cost Center,Lft,LFT
 DocType: Grading Scale,Intervals,intervale
 DocType: Bank Statement Transaction Entry,Reconciled Transactions,Tranzacții Reconciliate
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py,Earliest,Cel mai devreme
@@ -2304,6 +2312,7 @@
 apps/erpnext/erpnext/hr/doctype/employee_benefit_application/employee_benefit_application.py,As per your assigned Salary Structure you cannot apply for benefits,"În conformitate cu structura salarială atribuită, nu puteți aplica pentru beneficii"
 apps/erpnext/erpnext/stock/doctype/item/item.py,Website Image should be a public file or website URL,Site-ul Image ar trebui să fie un fișier public sau site-ul URL-ul
 DocType: Purchase Invoice Item,BOM,BOM
+apps/erpnext/erpnext/stock/doctype/item/item.py,Duplicate entry in Manufacturers table,Introducerea duplicată în tabelul Producătorilor
 apps/erpnext/erpnext/setup/doctype/item_group/item_group.js,This is a root item group and cannot be edited.,Acesta este un grup element rădăcină și nu pot fi editate.
 apps/erpnext/erpnext/accounts/doctype/account/account.js,Merge,contopi
 DocType: Journal Entry Account,Purchase Order,Comandă de aprovizionare
@@ -2449,7 +2458,6 @@
 DocType: Asset,Depreciation Schedules,Orarele de amortizare
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.js,Create Sales Invoice,Creați factură de vânzări
 apps/erpnext/erpnext/regional/doctype/gstr_3b_report/gstr_3b_report.html,Ineligible ITC,ITC neeligibil
-apps/erpnext/erpnext/erpnext_integrations/doctype/shopify_settings/shopify_settings.py,"Support for public app is deprecated. Please setup private app, for more details refer user manual","Suportul pentru aplicația publică este depreciat. Configurați aplicația privată, pentru mai multe detalii consultați manualul de utilizare"
 DocType: Task,Dependent Tasks,Sarcini dependente
 apps/erpnext/erpnext/regional/report/gstr_1/gstr_1.py,Following accounts might be selected in GST Settings:,Următoarele conturi ar putea fi selectate în Setări GST:
 apps/erpnext/erpnext/manufacturing/report/bom_stock_report/bom_stock_report.js,Quantity to Produce,Cantitate de produs
@@ -2702,6 +2710,7 @@
 DocType: Water Analysis,Container,recipient
 apps/erpnext/erpnext/regional/report/gstr_1/gstr_1.py,Please set valid GSTIN No. in Company Address,Vă rugăm să setați numărul GSTIN valid în adresa companiei
 apps/erpnext/erpnext/education/utils.py,Student {0} - {1} appears Multiple times in row {2} & {3},Elev {0} - {1} apare ori multiple în rândul {2} &amp; {3}
+apps/erpnext/erpnext/selling/doctype/customer/customer.py,Following fields are mandatory to create address:,Următoarele câmpuri sunt obligatorii pentru a crea adresa:
 DocType: Item Alternative,Two-way,Două căi
 DocType: Item,Manufacturers,Producători
 apps/erpnext/erpnext/accounts/deferred_revenue.py,Error while processing deferred accounting for {0},Eroare la procesarea contabilității amânate pentru {0}
@@ -2778,9 +2787,9 @@
 DocType: Employee,HR-EMP-,HR-vorba sunt
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py,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: Quality Meeting Minutes,Quality Meeting Minutes,Proces-verbal de calitate al întâlnirii
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Supplier &gt; Supplier Type,Furnizor&gt; Tip furnizor
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py,Employee Referral,Referirea angajaților
 DocType: Student Group,Set 0 for no limit,0 pentru a seta nici o limită
+DocType: Cost Center,rgt,RGT
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py,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.
 DocType: Customer,Primary Address and Contact Detail,Adresa principală și detaliile de contact
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.js,Resend Payment Email,Retrimiteți e-mail-ul de plată
@@ -2890,7 +2899,6 @@
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py,Against Supplier Invoice {0} dated {1},Contra facturii furnizorului {0} din data {1}
 DocType: Customer,Default Price List,Lista de Prețuri Implicita
 apps/erpnext/erpnext/assets/doctype/asset/asset.py,Asset Movement record {0} created,Mișcarea de înregistrare a activelor {0} creat
-apps/erpnext/erpnext/utilities/page/leaderboard/leaderboard.js,No items found.,Nu au fost gasite articolele.
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py,You cannot delete Fiscal Year {0}. Fiscal Year {0} is set as default in Global Settings,Nu puteți șterge Anul fiscal {0}. Anul fiscal {0} este setat ca implicit în Setări globale
 DocType: Share Transfer,Equity/Liability Account,Contul de capitaluri proprii
 apps/erpnext/erpnext/setup/doctype/customer_group/customer_group.py,A customer with the same name already exists,Un client cu același nume există deja
@@ -2906,6 +2914,7 @@
 apps/erpnext/erpnext/selling/doctype/customer/customer.py,Credit limit has been crossed for customer {0} ({1}/{2}),Limita de credit a fost depășită pentru clientul {0} ({1} / {2})
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py,Customer required for 'Customerwise Discount',Client necesar pentru 'Reducere Client'
 apps/erpnext/erpnext/config/accounting.py,Update bank payment dates with journals.,Actualizați datele de plată bancar cu reviste.
+,Billed Qty,Qty facturat
 apps/erpnext/erpnext/stock/doctype/item/item_dashboard.py,Pricing,Stabilirea pretului
 DocType: Employee,Attendance Device ID (Biometric/RF tag ID),Prezentarea dispozitivului de identificare (biometric / RF tag tag)
 DocType: Quotation,Term Details,Detalii pe termen
@@ -2929,6 +2938,7 @@
 DocType: Share Transfer,Asset Account,Cont de active
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js,New release date should be in the future,Noua dată a lansării ar trebui să fie în viitor
 DocType: Purchase Invoice,End date of current invoice's period,Data de încheiere a perioadei facturii curente
+apps/erpnext/erpnext/hr/doctype/employee/employee.py,Please setup Employee Naming System in Human Resource &gt; HR Settings,Vă rugăm să configurați sistemul de numire a angajaților în resurse umane&gt; Setări HR
 DocType: Lab Test,Technician Name,Numele tehnicianului
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py,"Cannot ensure delivery by Serial No as \
 					Item {0} is added with and without Ensure Delivery by \
@@ -2936,6 +2946,7 @@
 DocType: Accounts Settings,Unlink Payment on Cancellation of Invoice,Plata unlink privind anularea facturii
 DocType: Bank Reconciliation,From Date,Din data
 apps/erpnext/erpnext/hr/doctype/vehicle_log/vehicle_log.py,Current Odometer reading entered should be greater than initial Vehicle Odometer {0},Kilometrajul curentă introdusă trebuie să fie mai mare decât inițială a vehiculului odometru {0}
+,Purchase Order Items To Be Received or Billed,Cumpărați obiecte de comandă care trebuie primite sau plătite
 DocType: Restaurant Reservation,No Show,Neprezentare
 apps/erpnext/erpnext/regional/india/utils.py,You must be a registered supplier to generate e-Way Bill,Pentru a genera Bill e-Way trebuie să fiți un furnizor înregistrat
 DocType: Shipping Rule Country,Shipping Rule Country,Regula de transport maritim Tara
@@ -2978,6 +2989,7 @@
 apps/erpnext/erpnext/templates/generators/item/item_add_to_cart.html,View in Cart,Vizualizare Coș
 DocType: Employee Checkin,Shift Actual Start,Shift Start inițial
 DocType: Tally Migration,Is Day Book Data Imported,Sunt importate datele despre cartea de zi
+,Purchase Order Items To Be Received or Billed1,Cumpărați obiecte de comandă care trebuie primite sau plătite1
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py,Marketing Expenses,Cheltuieli de marketing
 apps/erpnext/erpnext/stock/doctype/pick_list/pick_list.py,{0} units of {1} is not available.,{0} unități de {1} nu sunt disponibile.
 ,Item Shortage Report,Raport Articole Lipsa
@@ -3206,7 +3218,6 @@
 apps/erpnext/erpnext/public/js/call_popup/call_popup.js,View all issues from {0},Vedeți toate problemele din {0}
 DocType: Quality Inspection,MAT-QA-.YYYY.-,MAT-QA-.YYYY.-
 DocType: Quality Meeting Table,Quality Meeting Table,Masa de întâlnire de calitate
-apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,Vă rugăm să setați Naming Series pentru {0} prin Setare&gt; Setări&gt; Serie pentru denumire
 apps/erpnext/erpnext/templates/pages/help.html,Visit the forums,Vizitați forumurile
 DocType: Student,Student Mobile Number,Elev Număr mobil
 DocType: Item,Has Variants,Are variante
@@ -3350,6 +3361,7 @@
 ,Campaign Efficiency,Eficiența campaniei
 ,Campaign Efficiency,Eficiența campaniei
 DocType: Discussion,Discussion,Discuţie
+apps/erpnext/erpnext/setup/default_energy_point_rules.py,On Sales Order Submission,La trimiterea comenzii de vânzare
 DocType: Bank Transaction,Transaction ID,ID-ul de tranzacție
 DocType: Payroll Entry,Deduct Tax For Unsubmitted Tax Exemption Proof,Deducerea impozitului pentru dovada scutirii fiscale neimpozitate
 DocType: Volunteer,Anytime,Oricând
@@ -3357,7 +3369,6 @@
 DocType: Employee Tax Exemption Proof Submission,Employee Tax Exemption Proof Submission,Sustine gratuitatea acestui serviciu si acceseaza
 DocType: Patient,Surgical History,Istorie chirurgicală
 DocType: Bank Statement Settings Item,Mapped Header,Antet Cartografiat
-apps/erpnext/erpnext/hr/doctype/employee/employee.py,Please setup Employee Naming System in Human Resource &gt; HR Settings,Vă rugăm să configurați sistemul de numire a angajaților în resurse umane&gt; Setări HR
 DocType: Employee,Resignation Letter Date,Dată Scrisoare de Demisie
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Pricing Rules are further filtered based on quantity.,Regulile de stabilire a prețurilor sunt filtrate în continuare în funcție de cantitate.
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py,Please set the Date Of Joining for employee {0},Vă rugăm să setați data de îmbarcare pentru angajat {0}
@@ -3372,6 +3383,7 @@
 DocType: Bank Statement Settings,Mapped Items,Elemente cartografiate
 DocType: Amazon MWS Settings,IT,ACEASTA
 DocType: Chapter,Chapter,Capitol
+,Fixed Asset Register,Registrul activelor fixe
 apps/erpnext/erpnext/utilities/user_progress.py,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,Select BOM and Qty for Production,Selectați BOM și Cant pentru producție
@@ -3507,7 +3519,6 @@
 apps/erpnext/erpnext/templates/emails/reorder_item.html,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
 apps/erpnext/erpnext/controllers/accounts_controller.py,Account {0} is invalid. Account Currency must be {1},Contul {0} nu este valid. Valuta contului trebuie să fie {1}
 apps/erpnext/erpnext/hr/doctype/salary_structure_assignment/salary_structure_assignment.py,From Date {0} cannot be after employee's relieving Date {1},De la data {0} nu poate fi după data eliberării angajatului {1}
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py,Debit Note {0} has been created automatically,Nota de debit {0} a fost creată automat
 apps/erpnext/erpnext/accounts/doctype/payment_order/payment_order.js,Create Payment Entries,Creați intrări de plată
 DocType: Supplier,Is Internal Supplier,Este furnizor intern
 DocType: Employee,Create User Permission,Creați permisiunea utilizatorului
@@ -4069,7 +4080,6 @@
 DocType: Project User,Project Status,Status Proiect
 DocType: UOM,Check this to disallow fractions. (for Nos),Bifati pentru a nu permite fracțiuni. (Pentru Nos)
 DocType: Student Admission Program,Naming Series (for Student Applicant),Seria de denumire (pentru Student Solicitant)
-apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.py,UOM Conversion factor ({0} -&gt; {1}) not found for item: {2},Factorul de conversie UOM ({0} -&gt; {1}) nu a fost găsit pentru articol: {2}
 apps/erpnext/erpnext/hr/doctype/retention_bonus/retention_bonus.py,Bonus Payment Date cannot be a past date,Data de plată Bonus nu poate fi o dată trecută
 DocType: Travel Request,Copy of Invitation/Announcement,Copia invitatiei / anuntului
 DocType: Practitioner Service Unit Schedule,Practitioner Service Unit Schedule,Unitatea Serviciului de Practician
@@ -4237,6 +4247,7 @@
 apps/erpnext/erpnext/utilities/user_progress.py,Setup Company,Configurare Companie
 ,Lab Test Report,Raport de testare în laborator
 DocType: Employee Benefit Application,Employee Benefit Application,Aplicația pentru beneficiile angajaților
+apps/erpnext/erpnext/accounts/doctype/invoice_discounting/invoice_discounting.py,Row({0}): {1} is already discounted in {2},Rândul ({0}): {1} este deja actualizat în {2}
 apps/erpnext/erpnext/hr/doctype/additional_salary/additional_salary.py,Additional Salary Component Exists.,Există o componentă suplimentară a salariului.
 DocType: Purchase Invoice,Unregistered,neînregistrat
 DocType: Student Applicant,Application Date,Data aplicării
@@ -4316,7 +4327,6 @@
 DocType: Journal Entry,Accounting Entries,Înregistrări contabile
 DocType: Job Card Time Log,Job Card Time Log,Jurnalul de timp al cărții de lucru
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,"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;."
-apps/erpnext/erpnext/education/doctype/instructor/instructor.py,Please setup Instructor Naming System in Education &gt; Education Settings,Vă rugăm să configurați sistemul de numire a instructorului în educație&gt; Setări educație
 DocType: Journal Entry,Paid Loan,Imprumut platit
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py,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ță
@@ -4333,7 +4343,6 @@
 apps/erpnext/erpnext/templates/pages/projects.html,No time sheets,Nu există nicio foaie de timp
 DocType: GoCardless Mandate,GoCardless Customer,Clientul GoCardless
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py,Leave Type {0} cannot be carry-forwarded,Lasă Tipul {0} nu poate fi transporta-transmise
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Item Code &gt; Item Group &gt; Brand,Cod articol&gt; Grup de articole&gt; Marcă
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py,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
 DocType: Leave Encashment,Payroll,stat de plată
@@ -4449,7 +4458,6 @@
 DocType: Stock Ledger Entry,Actual Qty After Transaction,Cant. efectivă după tranzacție
 ,Pending SO Items For Purchase Request,Până la SO articole pentru cerere de oferta
 apps/erpnext/erpnext/education/doctype/student_admission/student_admission.py,Student Admissions,Admitere Student
-apps/erpnext/erpnext/accounts/party.py,{0} {1} is disabled,{0} {1} este dezactivat
 DocType: Supplier,Billing Currency,Moneda de facturare
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py,Extra Large,Extra mare
 DocType: Loan,Loan Application,Cerere de împrumut
@@ -4526,7 +4534,6 @@
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py,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/accounts/doctype/accounting_dimension/accounting_dimension.py,Creating Dimensions...,Crearea dimensiunilor ...
 apps/erpnext/erpnext/education/doctype/student_group_creation_tool/student_group_creation_tool.py,Student Group Name is mandatory in row {0},Grupul studențesc Nume este obligatoriu în rândul {0}
-DocType: Customer Credit Limit,Bypass credit limit_check,Bypass limita de credit_check
 DocType: Homepage,Products to be shown on website homepage,Produsele care urmează să fie afișate pe pagina de pornire site
 DocType: HR Settings,Password Policy,Politica de parolă
 apps/erpnext/erpnext/setup/doctype/customer_group/customer_group.js,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.
@@ -4831,6 +4838,7 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py,Row {0}: Advance against Customer must be credit,Row {0}: avans Clientul trebuie să fie de credit
 DocType: Quality Meeting,Quality Meeting,Întâlnire de calitate
 apps/erpnext/erpnext/accounts/doctype/account/account.js,Non-Group to Group,Non-Grup la Grup
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,Vă rugăm să setați Naming Series pentru {0} prin Setare&gt; Setări&gt; Serie pentru denumire
 DocType: Employee,ERPNext User,Utilizator ERPNext
 apps/erpnext/erpnext/education/doctype/student_group_creation_tool/student_group_creation_tool.py,Batch is mandatory in row {0},Lotul este obligatoriu în rândul {0}
 apps/erpnext/erpnext/education/doctype/student_group_creation_tool/student_group_creation_tool.py,Batch is mandatory in row {0},Lotul este obligatoriu în rândul {0}
@@ -5129,6 +5137,7 @@
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py,No {0} found for Inter Company Transactions.,Nu a fost găsit {0} pentru tranzacțiile Intercompanie.
 DocType: Travel Itinerary,Rented Car,Mașină închiriată
 apps/erpnext/erpnext/public/js/hub/components/profile_dialog.js,About your Company,Despre Compania ta
+apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.js,Show Stock Ageing Data,Afișează date de îmbătrânire a stocurilor
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py,Credit To account must be a Balance Sheet account,Credit în contul trebuie să fie un cont de bilanț
 DocType: Donor,Donor,Donator
 DocType: Global Defaults,Disable In Words,Nu fi de acord în cuvinte
@@ -5143,8 +5152,10 @@
 DocType: Practitioner Schedule,Schedule Name,Numele programului
 apps/erpnext/erpnext/regional/doctype/gstr_3b_report/gstr_3b_report.py,Please enter GSTIN and state for the Company Address {0},Vă rugăm să introduceți GSTIN și să indicați adresa companiei {0}
 DocType: Currency Exchange,For Buying,Pentru cumparare
+apps/erpnext/erpnext/setup/default_energy_point_rules.py,On Purchase Order Submission,La trimiterea comenzii de cumpărare
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js,Add All Suppliers,Adăugați toți furnizorii
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py,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/accounts/doctype/pricing_rule/pricing_rule.js,Customer &gt; Customer Group &gt; Territory,Client&gt; Grup de clienți&gt; Teritoriul
 DocType: Tally Migration,Parties,Petreceri
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js,Browse BOM,Navigare BOM
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py,Secured Loans,Împrumuturi garantate
@@ -5176,6 +5187,7 @@
 apps/erpnext/erpnext/stock/doctype/item_alternative/item_alternative.py,Not allow to set alternative item for the item {0},Nu permiteți setarea unui element alternativ pentru articolul {0}
 apps/erpnext/erpnext/hr/doctype/leave_block_list/leave_block_list.py,Date is repeated,Data se repetă
 apps/erpnext/erpnext/accounts/print_format/payment_receipt_voucher/payment_receipt_voucher.html,Authorized Signatory,Semnatar autorizat
+apps/erpnext/erpnext/education/doctype/instructor/instructor.py,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ție
 apps/erpnext/erpnext/regional/doctype/gstr_3b_report/gstr_3b_report.html,Net ITC Available(A) - (B),ITC net disponibil (A) - (B)
 apps/erpnext/erpnext/education/doctype/fee_schedule/fee_schedule.js,Create Fees,Creați taxe
 DocType: Project,Total Purchase Cost (via Purchase Invoice),Cost total de achiziție (prin cumparare factură)
@@ -5196,6 +5208,7 @@
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.js,Message Sent,Mesajul a fost trimis
 apps/erpnext/erpnext/accounts/doctype/account/account.py,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/assets/report/fixed_asset_register/fixed_asset_register.py,Vendor Name,Numele vânzătorului
 DocType: Quiz Result,Wrong,Gresit
 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)
@@ -5441,6 +5454,7 @@
 DocType: Stock Settings,Auto Material Request,Cerere automată de material
 DocType: Woocommerce Settings,API consumer secret,Secretul consumatorului API
 DocType: Delivery Note Item,Available Batch Qty at From Warehouse,Disponibil lot Cantitate puțin din Warehouse
+,Received Qty Amount,Suma de cantitate primită
 DocType: Salary Slip,Gross Pay - Total Deduction - Loan Repayment,Plata brută - Deducerea totală - rambursare a creditului
 DocType: Bank Account,Last Integration Date,Ultima dată de integrare
 DocType: Expense Claim,Expense Taxes and Charges,Cheltuiește impozite și taxe
@@ -5904,6 +5918,8 @@
 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,Please select Qty against item {0},Selectați Cantitate pentru elementul {0}
+apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py,Latest Age,Etapă tarzie
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js,Transfer Material to Supplier,Transfer de material la furnizor
 apps/erpnext/erpnext/hr/report/loan_repayment/loan_repayment.py,EMI,EMI
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py,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 Pistă
@@ -5927,7 +5943,6 @@
 apps/erpnext/erpnext/hr/doctype/employee_benefit_application/employee_benefit_application.py,"An amount of {0} already claimed for the component {1},\
 						 set the amount equal or greater than {2}","O sumă de {0} deja revendicată pentru componenta {1}, \ a stabilit suma egală sau mai mare decât {2}"
 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
 DocType: BOM Update Tool,The new BOM after replacement,Noul BOM după înlocuirea
 ,Point of Sale,Point of Sale
@@ -6049,7 +6064,6 @@
 DocType: Purchase Order Item,Blanket Order Rate,Rata de comandă a plicului
 ,Customer Ledger Summary,Rezumatul evidenței clienților
 apps/erpnext/erpnext/hooks.py,Certification,Certificare
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js,Are you sure you want to make debit note?,Ești sigur că vrei să faci notă de debit?
 DocType: Bank Guarantee,Clauses and Conditions,Clauze și Condiții
 DocType: Serial No,Creation Document Type,Tip de document creație
 DocType: Amazon MWS Settings,ES,ES
@@ -6087,8 +6101,6 @@
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py,Financial Services,Servicii financiare
 DocType: Student Sibling,Student ID,Carnet de student
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.js,For Quantity must be greater than zero,Pentru Cantitatea trebuie să fie mai mare de zero
-apps/erpnext/erpnext/hr/doctype/employee_transfer/employee_transfer.py,"Please delete the Employee <a href=""#Form/Employee/{0}"">{0}</a>\
-					to cancel this document","Vă rugăm să ștergeți Angajatul <a href=""#Form/Employee/{0}"">{0}</a> \ pentru a anula acest document"
 apps/erpnext/erpnext/config/projects.py,Types of activities for Time Logs,Tipuri de activități pentru busteni Timp
 DocType: Opening Invoice Creation Tool,Sales,Vânzări
 DocType: Stock Entry Detail,Basic Amount,Suma de bază
@@ -6167,6 +6179,7 @@
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py,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,Send Supplier Emails,Trimite email-uri Furnizor
+DocType: Asset Movement,ACC-ASM-.YYYY.-,ACC-ASM-.YYYY.-
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py,"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ă
 apps/erpnext/erpnext/hr/doctype/employee_onboarding/employee_onboarding.py,Submit this to create the Employee record,Trimiteți acest lucru pentru a crea înregistrarea angajatului
@@ -6247,7 +6260,6 @@
 DocType: Sales Team,Contact No.,Nr. Persoana de Contact
 apps/erpnext/erpnext/templates/includes/cart/cart_address.html,Billing Address is same as Shipping Address,Adresa de facturare este aceeași cu adresa de expediere
 DocType: Bank Reconciliation,Payment Entries,Intrările de plată
-apps/erpnext/erpnext/erpnext_integrations/doctype/shopify_settings/shopify_settings.py,Access token or Shopify URL missing,Accesul la jetonul de acces sau lipsa adresei Shopify
 DocType: Location,Latitude,Latitudine
 DocType: Work Order,Scrap Warehouse,Depozit fier vechi
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py,"Warehouse required at Row No {0}, please set default warehouse for the item {1} for the company {2}","Depozitul necesar la rândul nr. {0}, vă rugăm să setați un depozit implicit pentru elementul {1} pentru companie {2}"
@@ -6292,7 +6304,6 @@
 DocType: Job Offer Term,Value / Description,Valoare / Descriere
 apps/erpnext/erpnext/controllers/accounts_controller.py,"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
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js,Are you sure you want to make credit note?,Ești sigur că vrei să faci notă de credit?
 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,Debit and Credit not equal for {0} #{1}. Difference is {2}.,Debit și credit nu este egal pentru {0} # {1}. Diferența este {2}.
@@ -6417,6 +6428,7 @@
 DocType: Purchase Invoice,Taxes and Charges Added,Impozite și Taxe Added
 apps/erpnext/erpnext/assets/doctype/asset/asset.py,Depreciation Row {0}: Next Depreciation Date cannot be before Available-for-use Date,Rândul de amortizare {0}: Data următoarei amortizări nu poate fi înaintea datei disponibile pentru utilizare
 ,Sales Funnel,Pâlnie Vânzări
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Item Code &gt; Item Group &gt; Brand,Cod articol&gt; Grup de articole&gt; Marcă
 apps/erpnext/erpnext/setup/doctype/company/company.py,Abbreviation is mandatory,Abreviere este obligatorie
 DocType: Project,Task Progress,Progresul sarcină
 apps/erpnext/erpnext/templates/includes/navbar/navbar_items.html,Cart,Coș
@@ -6663,6 +6675,7 @@
 DocType: Employee Grade,Employee Grade,Clasa angajaților
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py,Piecework,Muncă în acord
 DocType: GSTR 3B Report,June,iunie
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Supplier &gt; Supplier Type,Furnizor&gt; Tip furnizor
 DocType: Share Balance,From No,De la nr
 DocType: Shift Type,Early Exit Grace Period,Perioada de grație de ieșire timpurie
 DocType: Task,Actual Time (in Hours),Timpul efectiv (în ore)
@@ -6948,6 +6961,7 @@
 DocType: Warehouse,Warehouse Name,Denumire Depozit
 DocType: Naming Series,Select Transaction,Selectați Transaction
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py,Please enter Approving Role or Approving User,Vă rugăm să introduceți Aprobarea Rolul sau aprobarea de utilizare
+apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.py,UOM Conversion factor ({0} -&gt; {1}) not found for item: {2},Factorul de conversie UOM ({0} -&gt; {1}) nu a fost găsit pentru articol: {2}
 apps/erpnext/erpnext/support/doctype/service_level_agreement/service_level_agreement.py,Service Level Agreement with Entity Type {0} and Entity {1} already exists.,Acordul privind nivelul serviciului cu tipul de entitate {0} și entitatea {1} există deja.
 DocType: Journal Entry,Write Off Entry,Amortizare intrare
 DocType: BOM,Rate Of Materials Based On,Rate de materiale bazate pe
@@ -7139,6 +7153,7 @@
 DocType: Quality Inspection Reading,Quality Inspection Reading,Inspecție de calitate Reading
 apps/erpnext/erpnext/stock/doctype/stock_settings/stock_settings.py,`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/stock/report/stock_balance/stock_balance.py,Earliest Age,Cea mai timpurie vârstă
 apps/erpnext/erpnext/utilities/user_progress.py,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.
 DocType: Quality Goal,Revision,Revizuire
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js,Healthcare Services,Servicii pentru sanatate
@@ -7182,6 +7197,7 @@
 apps/erpnext/erpnext/healthcare/doctype/patient_encounter/patient_encounter.js,Schedule Discharge,Programați descărcarea
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py,Cheques and Deposits incorrectly cleared,Cecuri și Depozite respingă incorect
 DocType: Homepage Section Card,Homepage Section Card,Pagina de secțiune Card de secțiune
+,Amount To Be Billed,Suma care trebuie plătită
 apps/erpnext/erpnext/accounts/doctype/account/account.py,Account {0}: You can not assign itself as parent account,Contul {0}: nu puteți atribui contului în sine calitatea de cont părinte
 DocType: Purchase Invoice Item,Price List Rate,Lista de prețuri Rate
 apps/erpnext/erpnext/utilities/activation.py,Create customer quotes,Creați citate client
@@ -7234,6 +7250,7 @@
 DocType: Supplier Scorecard Criteria,Supplier Scorecard Criteria,Criteriile Scorecard pentru furnizori
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py,Please select Start Date and End Date for Item {0},Vă rugăm să selectați data de început și Data de final pentru postul {0}
 DocType: Maintenance Schedule,MAT-MSH-.YYYY.-,MAT-MSH-.YYYY.-
+,Amount to Receive,Suma de primit
 apps/erpnext/erpnext/education/doctype/student_group_creation_tool/student_group_creation_tool.py,Course is mandatory in row {0},"Desigur, este obligatorie în rândul {0}"
 apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py,From date can not be greater than than To date,De la data nu poate fi mai mare decât până în prezent
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py,To date cannot be before from date,Până în prezent nu poate fi înainte de data
@@ -7485,7 +7502,6 @@
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js,BOM and Manufacturing Quantity are required,BOM și cantitatea de producție sunt necesare
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js,Ageing Range 2,Clasă de uzură 2
 DocType: SG Creation Tool Course,Max Strength,Putere max
-apps/erpnext/erpnext/accounts/doctype/account/account.py,"Account {0} already exists in child company {1}. The following fields have different values, they should be same:<ul><li>{2}</li></ul>","Contul {0} există deja în compania copil {1}. Următoarele câmpuri au valori diferite, ar trebui să fie aceleași: <ul><li> {2} </li></ul>"
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py,Installing presets,Instalarea presetărilor
 DocType: Fee Schedule,EDU-FSH-.YYYY.-,EDU-FSH-.YYYY.-
 apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js,No Delivery Note selected for Customer {},Nu este selectată nicio notificare de livrare pentru client {}
@@ -7696,6 +7712,7 @@
 DocType: Delivery Note,Print Without Amount,Imprima Fără Suma
 apps/erpnext/erpnext/accounts/report/asset_depreciation_ledger/asset_depreciation_ledger.py,Depreciation Date,Data de amortizare
 ,Work Orders in Progress,Ordine de lucru în curs
+DocType: Customer Credit Limit,Bypass Credit Limit Check,Verificare limită de credit ocolire
 DocType: Issue,Support Team,Echipa de Suport
 apps/erpnext/erpnext/stock/report/batch_item_expiry_status/batch_item_expiry_status.py,Expiry (In Days),Expirării (în zile)
 DocType: Appraisal,Total Score (Out of 5),Scor total (din 5)
@@ -7881,6 +7898,7 @@
 DocType: Sales Invoice,Customer GSTIN,Client GSTIN
 DocType: Crop Cycle,List of diseases detected on the field. When selected it'll automatically add a list of tasks to deal with the disease ,"Lista bolilor detectate pe teren. Când este selectată, va adăuga automat o listă de sarcini pentru a face față bolii"
 apps/erpnext/erpnext/manufacturing/page/bom_comparison_tool/bom_comparison_tool.js,BOM 1,BOM 1
+apps/erpnext/erpnext/assets/report/fixed_asset_register/fixed_asset_register.py,Asset Id,ID material
 apps/erpnext/erpnext/healthcare/doctype/healthcare_service_unit/healthcare_service_unit.js,This is a root healthcare service unit and cannot be edited.,Aceasta este o unitate de asistență medicală rădăcină și nu poate fi editată.
 DocType: Asset Repair,Repair Status,Stare de reparare
 apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.js,"Requested Qty: Quantity requested for purchase, but not ordered.","A solicitat Cantitate: Cantitatea solicitate pentru achiziții, dar nu a ordonat."
diff --git a/erpnext/translations/ru.csv b/erpnext/translations/ru.csv
index ca91dc4..981d9ff 100644
--- a/erpnext/translations/ru.csv
+++ b/erpnext/translations/ru.csv
@@ -289,7 +289,6 @@
 DocType: Loan,Repay Over Number of Periods,Погашать Over Количество периодов
 apps/erpnext/erpnext/manufacturing/report/bom_stock_report/bom_stock_report.py,Quantity to Produce can not be less than Zero,Количество в продукции не может быть меньше нуля
 DocType: Stock Entry,Additional Costs,Дополнительные расходы
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Customer &gt; Customer Group &gt; Territory,Клиент&gt; Группа клиентов&gt; Территория
 apps/erpnext/erpnext/accounts/doctype/account/account.py,Account with existing transaction can not be converted to group.,Счет существующей проводки не может быть преобразован в группу.
 DocType: Lead,Product Enquiry,Запрос на продукт
 DocType: Education Settings,Validate Batch for Students in Student Group,Проверка партии для студентов в студенческой группе
@@ -587,6 +586,7 @@
 DocType: Healthcare Settings,Create documents for sample collection,Создание документов для сбора проб
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py,Payment against {0} {1} cannot be greater than Outstanding Amount {2},"Оплата с {0} {1} не может быть больше, чем суммы задолженности {2}"
 apps/erpnext/erpnext/patches/v11_0/add_healthcare_service_unit_tree_root.py,All Healthcare Service Units,Все подразделения здравоохранения
+apps/erpnext/erpnext/setup/default_energy_point_rules.py,On Converting Opportunity,О возможности конвертации
 DocType: Bank Account,Address HTML,Адрес HTML
 DocType: Lead,Mobile No.,Мобильный
 apps/erpnext/erpnext/selling/doctype/pos_closing_voucher/closing_voucher_details.html,Mode of Payments,Способ оплаты
@@ -651,7 +651,6 @@
 DocType: Accounting Dimension,Dimension Name,Имя измерения
 apps/erpnext/erpnext/healthcare/setup.py,Resistant,резистентный
 apps/erpnext/erpnext/hotels/doctype/hotel_room_reservation/hotel_room_reservation.py,Please set Hotel Room Rate on {},"Пожалуйста, установите рейтинг номера в отеле {}"
-apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py,Please setup numbering series for Attendance via Setup &gt; Numbering Series,"Пожалуйста, настройте серию нумерации для Посещаемости через Настройка&gt; Серия нумерации"
 DocType: Journal Entry,Multi Currency,Мультивалютность
 DocType: Bank Statement Transaction Invoice Item,Invoice Type,Тип счета
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py,Valid from date must be less than valid upto date,Срок действия с даты должен быть меньше срока действия до даты
@@ -769,6 +768,7 @@
 apps/erpnext/erpnext/accounts/page/pos/pos.js,Create a new Customer,Создать нового клиента
 apps/erpnext/erpnext/non_profit/report/expiring_memberships/expiring_memberships.py,Expiring On,Срок действия
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,"If multiple Pricing Rules continue to prevail, users are asked to set Priority manually to resolve conflict.","Если превалируют несколько правил ценообразования, пользователям предлагается установить приоритет вручную для разрешения конфликта."
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js,Purchase Return,Покупка Вернуться
 apps/erpnext/erpnext/utilities/activation.py,Create Purchase Orders,Создание заказов на поставку
 ,Purchase Register,Покупка Становиться на учет
 apps/erpnext/erpnext/healthcare/doctype/patient/patient.py,Patient not found,Пациент не найден
@@ -784,7 +784,6 @@
 DocType: Location,Area UOM,Область UOM
 apps/erpnext/erpnext/manufacturing/doctype/workstation/workstation.py,Workstation is closed on the following dates as per Holiday List: {0},Рабочая станция закрыта в следующие сроки согласно Список праздников: {0}
 apps/erpnext/erpnext/selling/page/sales_funnel/sales_funnel.py,Opportunities,Выявления
-apps/erpnext/erpnext/www/all-products/index.html,Clear filters,Очистить фильтры
 DocType: Lab Test Template,Single,Единственный
 DocType: Compensatory Leave Request,Work From Date,Работа с даты
 DocType: Salary Slip,Total Loan Repayment,Общая сумма погашения кредита
@@ -828,6 +827,7 @@
 apps/erpnext/erpnext/education/doctype/program_enrollment_tool/program_enrollment_tool.py,Mandatory field - Academic Year,Обязательное поле — академический год
 apps/erpnext/erpnext/education/doctype/program_enrollment_tool/program_enrollment_tool.py,Mandatory field - Academic Year,Обязательное поле — академический год
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py,{0} {1} is not associated with {2} {3},{0} {1} не связано с {2} {3}
+DocType: Opportunity,Converted By,Преобразовано
 apps/erpnext/erpnext/public/js/hub/components/ReviewArea.vue,You need to login as a Marketplace User before you can add any reviews.,"Вам необходимо войти в систему как пользователь Marketplace, чтобы добавить какие-либо отзывы."
 apps/erpnext/erpnext/manufacturing/doctype/job_card/job_card.py,Row {0} : Operation is required against the raw material item {1},Строка {0}: требуется операция против элемента исходного материала {1}
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py,Please set default payable account for the company {0},"Пожалуйста, задайте кредитную карту по умолчанию для компании {0}"
@@ -854,6 +854,8 @@
 DocType: Sales Invoice,Total Qty,Всего Кол-во
 apps/erpnext/erpnext/education/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py,Guardian2 Email ID,Идентификатор электронной почты Guardian2
 apps/erpnext/erpnext/education/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py,Guardian2 Email ID,Идентификатор электронной почты Guardian2
+apps/erpnext/erpnext/hr/doctype/employee_transfer/employee_transfer.py,"Please delete the Employee <a href=""#Form/Employee/{0}"">{0}</a>\
+					to cancel this document","Пожалуйста, удалите Сотрудника <a href=""#Form/Employee/{0}"">{0}</a> \, чтобы отменить этот документ"
 DocType: Item,Show in Website (Variant),Показать в веб-сайт (вариант)
 DocType: Employee,Health Concerns,Проблемы здоровья
 DocType: Payroll Entry,Select Payroll Period,Выберите Период начисления заработной платы
@@ -914,7 +916,6 @@
 DocType: Codification Table,Codification Table,Таблица кодирования
 DocType: Timesheet Detail,Hrs,часов
 apps/erpnext/erpnext/manufacturing/page/bom_comparison_tool/bom_comparison_tool.js,Changes in {0},Изменения в {0}
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js,Please select Company,"Пожалуйста, выберите компанию"
 DocType: Employee Skill,Employee Skill,Навыки сотрудников
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.js,Difference Account,Учетная запись
 DocType: Pricing Rule,Discount on Other Item,Скидка на другой товар
@@ -983,6 +984,7 @@
 DocType: BOM,Operating Cost,Эксплуатационные затраты
 DocType: Crop,Produced Items,Производимые товары
 DocType: Bank Statement Transaction Entry,Match Transaction to Invoices,Сопоставление транзакций с счетами-фактурами
+apps/erpnext/erpnext/erpnext_integrations/exotel_integration.py,Error in Exotel incoming call,Ошибка в входящем звонке Exotel
 DocType: Sales Order Item,Gross Profit,Валовая прибыль
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js,Unblock Invoice,Разблокировать счет-фактуру
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py,Increment cannot be 0,Прирост не может быть 0
@@ -1198,6 +1200,7 @@
 DocType: Activity Cost,Activity Type,Тип активности
 DocType: Request for Quotation,For individual supplier,Для индивидуального поставщика
 DocType: BOM Operation,Base Hour Rate(Company Currency),Базовый час Rate (Компания Валюта)
+,Qty To Be Billed,Кол-во будет выставлено
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py,Delivered Amount,Поставляется Сумма
 apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.js,Reserved Qty for Production: Raw materials quantity to make manufacturing items.,Зарезервированный кол-во для производства: количество сырья для изготовления изделий.
 DocType: Loyalty Point Entry Redemption,Redemption Date,Дата погашения
@@ -1318,7 +1321,7 @@
 apps/erpnext/erpnext/education/doctype/student_group/student_group.py,Please select Program,Выберите программу
 apps/erpnext/erpnext/education/doctype/student_group/student_group.py,Please select Program,Выберите программу
 DocType: Project,Estimated Cost,Ориентировочная стоимость
-DocType: Request for Quotation,Link to material requests,Ссылка на заявки на материалы
+DocType: Supplier Quotation,Link to material requests,Ссылка на заявки на материалы
 apps/erpnext/erpnext/public/js/hub/pages/Publish.vue,Publish,Публиковать
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py,Aerospace,Авиационно-космический
 ,Fichier des Ecritures Comptables [FEC],Fichier des Ecritures Comptables [FEC]
@@ -1331,6 +1334,7 @@
 apps/erpnext/erpnext/utilities/transaction_base.py,Invalid Posting Time,Недопустимое время проводки
 DocType: Salary Component,Condition and Formula,Состояние и формула
 DocType: Lead,Campaign Name,Название кампании
+apps/erpnext/erpnext/setup/default_energy_point_rules.py,On Task Completion,По завершении задачи
 apps/erpnext/erpnext/hr/doctype/compensatory_leave_request/compensatory_leave_request.py,There is no leave period in between {0} and {1},"Между периодами {0} и {1} нет периода отпуска,"
 DocType: Fee Validity,Healthcare Practitioner,Практикующий
 DocType: Hotel Room,Capacity,Вместимость
@@ -1695,7 +1699,6 @@
 DocType: Quality Feedback Template,Quality Feedback Template,Шаблон обратной связи по качеству
 apps/erpnext/erpnext/config/education.py,LMS Activity,Деятельность LMS
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py,Internet Publishing,Интернет издания
-DocType: Prescription Duration,Number,Число
 apps/erpnext/erpnext/accounts/doctype/opening_invoice_creation_tool/opening_invoice_creation_tool.js,Creating {0} Invoice,Создание {0} счета-фактуры
 DocType: Medical Code,Medical Code Standard,Стандарт медицинского кода
 DocType: Soil Texture,Clay Composition (%),Состав глины (%)
@@ -1770,6 +1773,7 @@
 DocType: Support Settings,Get Started Sections,Начать разделы
 DocType: Lead,CRM-LEAD-.YYYY.-,CRM-LEAD-.YYYY.-
 DocType: Invoice Discounting,Sanctioned,санкционированные
+,Base Amount,Базовая сумма
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.js,Total Contribution Amount: {0},Общая сумма вклада: {0}
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py,Row #{0}: Please specify Serial No for Item {1},"Ряд # {0}: Пожалуйста, сформулируйте Серийный номер для Пункт {1}"
 DocType: Payroll Entry,Salary Slips Submitted,Заявки на зарплату
@@ -1990,6 +1994,7 @@
 apps/erpnext/erpnext/utilities/user_progress.py,List a few of your suppliers. They could be organizations or individuals.,Список несколько ваших поставщиков. Они могут быть организациями или частными лицами.
 DocType: Accounting Dimension,Dimension Defaults,Размер по умолчанию
 apps/erpnext/erpnext/crm/report/prospects_engaged_but_not_converted/prospects_engaged_but_not_converted.js,Minimum Lead Age (Days),Минимальный срок Обращения (в днях)
+apps/erpnext/erpnext/assets/report/fixed_asset_register/fixed_asset_register.py,Available For Use Date,Дата использования
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py,All BOMs,Все ВОМ
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js,Create Inter Company Journal Entry,Создать межфирменный журнал
 DocType: Company,Parent Company,Родительская компания
@@ -2054,6 +2059,7 @@
 ,IRS 1099,IRS 1099
 DocType: Salary Slip,Leave Without Pay,Отпуск без сохранения содержания
 DocType: Payment Request,Outward,внешний
+apps/erpnext/erpnext/setup/default_energy_point_rules.py,On {0} Creation,На {0} создании
 apps/erpnext/erpnext/regional/doctype/gstr_3b_report/gstr_3b_report.html,State/UT Tax,Государственный / UT налог
 ,Trial Balance for Party,Пробный баланс для партии
 ,Gross and Net Profit Report,Отчет о валовой и чистой прибыли
@@ -2170,6 +2176,7 @@
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js,Make Stock Entry,Сделать складской запас
 DocType: Hotel Room Reservation,Hotel Reservation User,Бронирование отеля
 apps/erpnext/erpnext/projects/doctype/project/project.js,Set Status,Установить статус
+apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py,Please setup numbering series for Attendance via Setup &gt; Numbering Series,"Пожалуйста, настройте серию нумерации для Посещаемости через Настройка&gt; Серия нумерации"
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py,Please select prefix first,"Пожалуйста, выберите префикс первым"
 DocType: Contract,Fulfilment Deadline,Срок выполнения
 apps/erpnext/erpnext/public/js/hub/pages/Home.vue,Near you,Возле тебя
@@ -2185,6 +2192,7 @@
 DocType: Announcement,All Students,Все студенты
 apps/erpnext/erpnext/assets/doctype/asset/asset.py,Item {0} must be a non-stock item,Продукт {0} должен отсутствовать на складе
 apps/erpnext/erpnext/stock/doctype/batch/batch.js,View Ledger,Посмотреть Леджер
+DocType: Cost Center,Lft,LFT
 DocType: Grading Scale,Intervals,Интервалы
 DocType: Bank Statement Transaction Entry,Reconciled Transactions,Согласованные транзакции
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py,Earliest,Старейшие
@@ -2300,6 +2308,7 @@
 apps/erpnext/erpnext/hr/doctype/employee_benefit_application/employee_benefit_application.py,As per your assigned Salary Structure you cannot apply for benefits,В соответствии с вашей установленной структурой заработной платы вы не можете подать заявку на получение пособий
 apps/erpnext/erpnext/stock/doctype/item/item.py,Website Image should be a public file or website URL,Сайт изображение должно быть общественное файл или адрес веб-сайта
 DocType: Purchase Invoice Item,BOM,ВМ
+apps/erpnext/erpnext/stock/doctype/item/item.py,Duplicate entry in Manufacturers table,Повторяющаяся запись в таблице производителей
 apps/erpnext/erpnext/setup/doctype/item_group/item_group.js,This is a root item group and cannot be edited.,Это корень группу товаров и не могут быть изменены.
 apps/erpnext/erpnext/accounts/doctype/account/account.js,Merge,сливаться
 DocType: Journal Entry Account,Purchase Order,Заказ на покупку
@@ -2446,7 +2455,6 @@
 DocType: Asset,Depreciation Schedules,Амортизационные Расписания
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.js,Create Sales Invoice,Создать счет на продажу
 apps/erpnext/erpnext/regional/doctype/gstr_3b_report/gstr_3b_report.html,Ineligible ITC,Неподходящий ITC
-apps/erpnext/erpnext/erpnext_integrations/doctype/shopify_settings/shopify_settings.py,"Support for public app is deprecated. Please setup private app, for more details refer user manual","Поддержка публичного приложения устарела. Пожалуйста, настройте личное приложение, для получения более подробной информации обратитесь к руководству пользователя."
 DocType: Task,Dependent Tasks,Зависимые задачи
 apps/erpnext/erpnext/regional/report/gstr_1/gstr_1.py,Following accounts might be selected in GST Settings:,В настройках GST можно выбрать следующие учетные записи:
 apps/erpnext/erpnext/manufacturing/report/bom_stock_report/bom_stock_report.js,Quantity to Produce,Количество для производства
@@ -2699,6 +2707,7 @@
 DocType: Water Analysis,Container,Контейнер
 apps/erpnext/erpnext/regional/report/gstr_1/gstr_1.py,Please set valid GSTIN No. in Company Address,"Пожалуйста, укажите действительный номер GSTIN в адресе компании"
 apps/erpnext/erpnext/education/utils.py,Student {0} - {1} appears Multiple times in row {2} & {3},Student {0} - {1} несколько раз появляется в строке {2} и {3}
+apps/erpnext/erpnext/selling/doctype/customer/customer.py,Following fields are mandatory to create address:,Следующие поля обязательны для создания адреса:
 DocType: Item Alternative,Two-way,Двусторонний
 DocType: Item,Manufacturers,Производители
 apps/erpnext/erpnext/accounts/deferred_revenue.py,Error while processing deferred accounting for {0},Ошибка при обработке отложенного учета {0}
@@ -2773,9 +2782,9 @@
 DocType: Employee,HR-EMP-,HR-EMP-
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py,User {0} doesn't have any default POS Profile. Check Default at Row {1} for this User.,Пользователь {0} не имеет профиля по умолчанию POS. Проверьте значение по умолчанию для строки {1} для этого пользователя.
 DocType: Quality Meeting Minutes,Quality Meeting Minutes,Протокол встречи качества
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Supplier &gt; Supplier Type,Поставщик&gt; Тип поставщика
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py,Employee Referral,Перечень сотрудников
 DocType: Student Group,Set 0 for no limit,Чтобы снять ограничение установите 0
+DocType: Cost Center,rgt,РТГ
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py,The day(s) on which you are applying for leave are holidays. You need not apply for leave.,"На следующий день (с), на которой вы подаете заявление на отпуск праздники. Вам не нужно обратиться за разрешением."
 DocType: Customer,Primary Address and Contact Detail,Первичный адрес и контактная информация
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.js,Resend Payment Email,Отправить Платеж по электронной почте
@@ -2885,7 +2894,6 @@
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py,Against Supplier Invoice {0} dated {1},Против поставщика счет-фактура {0} от {1}
 DocType: Customer,Default Price List,По умолчанию Прайс-лист
 apps/erpnext/erpnext/assets/doctype/asset/asset.py,Asset Movement record {0} created,запись Движение активов {0} создано
-apps/erpnext/erpnext/utilities/page/leaderboard/leaderboard.js,No items found.,Ничего не найдено.
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py,You cannot delete Fiscal Year {0}. Fiscal Year {0} is set as default in Global Settings,Нельзя удалить {0} финансовый год. Финансовый год {0} установлен  основным в глобальных параметрах
 DocType: Share Transfer,Equity/Liability Account,Акционерный / Обязательный счет
 apps/erpnext/erpnext/setup/doctype/customer_group/customer_group.py,A customer with the same name already exists,Клиент с тем же именем уже существует
@@ -2901,6 +2909,7 @@
 apps/erpnext/erpnext/selling/doctype/customer/customer.py,Credit limit has been crossed for customer {0} ({1}/{2}),Кредитный лимит был скрещен для клиента {0} ({1} / {2})
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py,Customer required for 'Customerwise Discount',"Клиент требуется для ""Customerwise Скидка"""
 apps/erpnext/erpnext/config/accounting.py,Update bank payment dates with journals.,Обновление банк платежные даты с журналов.
+,Billed Qty,Кол-во
 apps/erpnext/erpnext/stock/doctype/item/item_dashboard.py,Pricing,Ценообразование
 DocType: Employee,Attendance Device ID (Biometric/RF tag ID),Идентификатор устройства посещаемости (биометрический идентификатор / идентификатор радиочастотной метки)
 DocType: Quotation,Term Details,Срочные Подробнее
@@ -2924,6 +2933,7 @@
 DocType: Share Transfer,Asset Account,Аккаунт активов
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js,New release date should be in the future,Дата нового релиза должна быть в будущем
 DocType: Purchase Invoice,End date of current invoice's period,Дата и время окончания периода текущего счета-фактуры в
+apps/erpnext/erpnext/hr/doctype/employee/employee.py,Please setup Employee Naming System in Human Resource &gt; HR Settings,"Пожалуйста, настройте систему имен сотрудников в разделе «Управление персоналом»&gt; «Настройки HR»"
 DocType: Lab Test,Technician Name,Имя техника
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py,"Cannot ensure delivery by Serial No as \
 					Item {0} is added with and without Ensure Delivery by \
@@ -2931,6 +2941,7 @@
 DocType: Accounts Settings,Unlink Payment on Cancellation of Invoice,Unlink Оплата об аннулировании счета-фактуры
 DocType: Bank Reconciliation,From Date,С
 apps/erpnext/erpnext/hr/doctype/vehicle_log/vehicle_log.py,Current Odometer reading entered should be greater than initial Vehicle Odometer {0},"Текущее показание одометра вошли должно быть больше, чем начальный одометр автомобиля {0}"
+,Purchase Order Items To Be Received or Billed,"Пункты заказа на покупку, которые будут получены или выставлены"
 DocType: Restaurant Reservation,No Show,Нет шоу
 apps/erpnext/erpnext/regional/india/utils.py,You must be a registered supplier to generate e-Way Bill,Вы должны быть зарегистрированным поставщиком для создания электронного билля
 DocType: Shipping Rule Country,Shipping Rule Country,Правило Доставка Страна
@@ -2973,6 +2984,7 @@
 apps/erpnext/erpnext/templates/generators/item/item_add_to_cart.html,View in Cart,Смотрите в корзину
 DocType: Employee Checkin,Shift Actual Start,Сдвиг фактического начала
 DocType: Tally Migration,Is Day Book Data Imported,Импортированы ли данные дневника
+,Purchase Order Items To Be Received or Billed1,"Позиции заказа на покупку, которые будут получены или выставлены"
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py,Marketing Expenses,Маркетинговые расходы
 apps/erpnext/erpnext/stock/doctype/pick_list/pick_list.py,{0} units of {1} is not available.,{0} единиц {1} недоступно.
 ,Item Shortage Report,Отчет о нехватке продуктов
@@ -3201,7 +3213,6 @@
 apps/erpnext/erpnext/public/js/call_popup/call_popup.js,View all issues from {0},Просмотреть все проблемы от {0}
 DocType: Quality Inspection,MAT-QA-.YYYY.-,MAT-QA-.YYYY.-
 DocType: Quality Meeting Table,Quality Meeting Table,Стол для совещаний по качеству
-apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,"Пожалуйста, установите серию имен для {0} через Настройка&gt; Настройки&gt; Серия имен"
 apps/erpnext/erpnext/templates/pages/help.html,Visit the forums,Посетите форумы
 DocType: Student,Student Mobile Number,Студент Мобильный телефон
 DocType: Item,Has Variants,Имеет варианты
@@ -3346,6 +3357,7 @@
 ,Campaign Efficiency,Эффективность кампании
 ,Campaign Efficiency,Эффективность кампании
 DocType: Discussion,Discussion,обсуждение
+apps/erpnext/erpnext/setup/default_energy_point_rules.py,On Sales Order Submission,На подаче заказа клиента
 DocType: Bank Transaction,Transaction ID,ID транзакции
 DocType: Payroll Entry,Deduct Tax For Unsubmitted Tax Exemption Proof,Доход от вычета налога за отказ в освобождении от налогов
 DocType: Volunteer,Anytime,В любой момент
@@ -3353,7 +3365,6 @@
 DocType: Employee Tax Exemption Proof Submission,Employee Tax Exemption Proof Submission,Предоставление доказательств в отношении налогов на сотрудников
 DocType: Patient,Surgical History,Хирургическая история
 DocType: Bank Statement Settings Item,Mapped Header,Mapped Header
-apps/erpnext/erpnext/hr/doctype/employee/employee.py,Please setup Employee Naming System in Human Resource &gt; HR Settings,"Пожалуйста, настройте систему имен сотрудников в разделе «Управление персоналом»&gt; «Настройки HR»"
 DocType: Employee,Resignation Letter Date,Отставка Письмо Дата
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Pricing Rules are further filtered based on quantity.,Правила ценообразования далее фильтруются в зависимости от количества.
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py,Please set the Date Of Joining for employee {0},Укажите дату присоединения для сотрудника {0}
@@ -3368,6 +3379,7 @@
 DocType: Bank Statement Settings,Mapped Items,Отображаемые объекты
 DocType: Amazon MWS Settings,IT,ЭТО
 DocType: Chapter,Chapter,глава
+,Fixed Asset Register,Регистр фиксированных активов
 apps/erpnext/erpnext/utilities/user_progress.py,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,Select BOM and Qty for Production,Выберите BOM и Кол-во для производства
@@ -3503,7 +3515,6 @@
 apps/erpnext/erpnext/templates/emails/reorder_item.html,Following Material Requests have been raised automatically based on Item's re-order level,Следующие запросы на материалы были созданы автоматически на основании минимального уровня запасов продукта
 apps/erpnext/erpnext/controllers/accounts_controller.py,Account {0} is invalid. Account Currency must be {1},Счёт {0} является недопустимым. Валюта счёта должна быть {1}
 apps/erpnext/erpnext/hr/doctype/salary_structure_assignment/salary_structure_assignment.py,From Date {0} cannot be after employee's relieving Date {1},From Date {0} не может быть после освобождения сотрудника {Date} {1}
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py,Debit Note {0} has been created automatically,Дебетовая нота {0} была создана автоматически
 apps/erpnext/erpnext/accounts/doctype/payment_order/payment_order.js,Create Payment Entries,Создать платежные записи
 DocType: Supplier,Is Internal Supplier,Внутренний поставщик
 DocType: Employee,Create User Permission,Создать разрешение пользователя
@@ -4066,7 +4077,6 @@
 DocType: Project User,Project Status,Статус проекта
 DocType: UOM,Check this to disallow fractions. (for Nos),"Проверьте это, чтобы запретить фракции. (Для №)"
 DocType: Student Admission Program,Naming Series (for Student Applicant),Идентификация по Имени (для заявителей-студентов)
-apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.py,UOM Conversion factor ({0} -&gt; {1}) not found for item: {2},Коэффициент преобразования UOM ({0} -&gt; {1}) не найден для элемента: {2}
 apps/erpnext/erpnext/hr/doctype/retention_bonus/retention_bonus.py,Bonus Payment Date cannot be a past date,Дата выплаты бонуса не может быть прошлой датой
 DocType: Travel Request,Copy of Invitation/Announcement,Копия приглашения / объявление
 DocType: Practitioner Service Unit Schedule,Practitioner Service Unit Schedule,График обслуживания практикующих
@@ -4234,6 +4244,7 @@
 apps/erpnext/erpnext/utilities/user_progress.py,Setup Company,Установка компании
 ,Lab Test Report,Отчет лабораторного теста
 DocType: Employee Benefit Application,Employee Benefit Application,Приложение для сотрудников
+apps/erpnext/erpnext/accounts/doctype/invoice_discounting/invoice_discounting.py,Row({0}): {1} is already discounted in {2},Строка ({0}): {1} уже дисконтирован в {2}
 apps/erpnext/erpnext/hr/doctype/additional_salary/additional_salary.py,Additional Salary Component Exists.,Существует дополнительный компонент заработной платы.
 DocType: Purchase Invoice,Unregistered,незарегистрированный
 DocType: Student Applicant,Application Date,Дата подачи документов
@@ -4312,7 +4323,6 @@
 DocType: Journal Entry,Accounting Entries,Бухгалтерские Проводки
 DocType: Job Card Time Log,Job Card Time Log,Журнал учета рабочего времени
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,"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.","Если выбрано Правило ценообразования для «Цены», оно перезапишет Прайс-лист. Правило ценообразования является окончательным, поэтому дальнейшая скидка не применяется. Следовательно, в таких транзакциях, как Сделка, Заказ на закупку и т.д., оно будет указываться в поле «Цена», а не в поле «Прайс-лист»."
-apps/erpnext/erpnext/education/doctype/instructor/instructor.py,Please setup Instructor Naming System in Education &gt; Education Settings,"Пожалуйста, настройте систему имен инструкторов в «Образование»&gt; «Настройки образования»"
 DocType: Journal Entry,Paid Loan,Платный кредит
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py,Duplicate Entry. Please check Authorization Rule {0},"Копия записи. Пожалуйста, проверьте Авторизация Правило {0}"
 DocType: Journal Entry Account,Reference Due Date,Справочная дата
@@ -4329,7 +4339,6 @@
 apps/erpnext/erpnext/templates/pages/projects.html,No time sheets,Нет табелей
 DocType: GoCardless Mandate,GoCardless Customer,Без комиссии
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py,Leave Type {0} cannot be carry-forwarded,Оставьте Тип {0} не может быть перенос направлен
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Item Code &gt; Item Group &gt; Brand,Код товара&gt; Группа товаров&gt; Марка
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py,Maintenance Schedule is not generated for all the items. Please click on 'Generate Schedule',"График обслуживания не генерируется для всех элементов. Пожалуйста, нажмите на кнопку ""Generate Расписание"""
 ,To Produce,Чтобы продукты
 DocType: Leave Encashment,Payroll,Начисление заработной платы
@@ -4445,7 +4454,6 @@
 DocType: Stock Ledger Entry,Actual Qty After Transaction,Остаток после проведения
 ,Pending SO Items For Purchase Request,Ожидаемые к Поставке Продукты Заказов
 apps/erpnext/erpnext/education/doctype/student_admission/student_admission.py,Student Admissions,зачисляемых студентов
-apps/erpnext/erpnext/accounts/party.py,{0} {1} is disabled,{0} {1} отключен
 DocType: Supplier,Billing Currency,Платежная валюта
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py,Extra Large,Очень Большой
 DocType: Loan,Loan Application,Заявка на получение ссуды
@@ -4522,7 +4530,6 @@
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py,Only Leave Applications with status 'Approved' and 'Rejected' can be submitted,Только оставьте приложения со статусом «Одобрено» и «Отклонено» могут быть представлены
 apps/erpnext/erpnext/accounts/doctype/accounting_dimension/accounting_dimension.py,Creating Dimensions...,Создание размеров ...
 apps/erpnext/erpnext/education/doctype/student_group_creation_tool/student_group_creation_tool.py,Student Group Name is mandatory in row {0},Студенческая группа Имя является обязательным в строке {0}
-DocType: Customer Credit Limit,Bypass credit limit_check,Обойти кредитную лимитную проверку
 DocType: Homepage,Products to be shown on website homepage,Продукты будут показаны на главной страницы сайта
 DocType: HR Settings,Password Policy,Политика паролей
 apps/erpnext/erpnext/setup/doctype/customer_group/customer_group.js,This is a root customer group and cannot be edited.,Это корневая группа клиентов и не могут быть изменены.
@@ -4828,6 +4835,7 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py,Row {0}: Advance against Customer must be credit,Ряд {0}: Предварительная отношении Клиента должен быть кредит
 DocType: Quality Meeting,Quality Meeting,Встреча качества
 apps/erpnext/erpnext/accounts/doctype/account/account.js,Non-Group to Group,Non-группы к группе
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,"Пожалуйста, установите серию имен для {0} через Настройка&gt; Настройки&gt; Серия имен"
 DocType: Employee,ERPNext User,Пользователь ERPNext
 apps/erpnext/erpnext/education/doctype/student_group_creation_tool/student_group_creation_tool.py,Batch is mandatory in row {0},Пакет является обязательным в строке {0}
 apps/erpnext/erpnext/education/doctype/student_group_creation_tool/student_group_creation_tool.py,Batch is mandatory in row {0},Пакет является обязательным в строке {0}
@@ -5126,6 +5134,7 @@
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py,No {0} found for Inter Company Transactions.,Нет {0} найдено для транзакций Inter Company.
 DocType: Travel Itinerary,Rented Car,Прокат автомобилей
 apps/erpnext/erpnext/public/js/hub/components/profile_dialog.js,About your Company,О вашей компании
+apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.js,Show Stock Ageing Data,Показать данные о старении запасов
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py,Credit To account must be a Balance Sheet account,Кредит на счету должен быть баланс счета
 DocType: Donor,Donor,даритель
 DocType: Global Defaults,Disable In Words,Отключить в словах
@@ -5140,8 +5149,10 @@
 DocType: Practitioner Schedule,Schedule Name,Название расписания
 apps/erpnext/erpnext/regional/doctype/gstr_3b_report/gstr_3b_report.py,Please enter GSTIN and state for the Company Address {0},"Пожалуйста, введите GSTIN и укажите адрес компании {0}"
 DocType: Currency Exchange,For Buying,Для покупки
+apps/erpnext/erpnext/setup/default_energy_point_rules.py,On Purchase Order Submission,При подаче заказа на поставку
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js,Add All Suppliers,Добавить все поставщики
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py,Row #{0}: Allocated Amount cannot be greater than outstanding amount.,Строка # {0}: выделенная сумма не может превышать невыплаченную сумму.
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Customer &gt; Customer Group &gt; Territory,Клиент&gt; Группа клиентов&gt; Территория
 DocType: Tally Migration,Parties,Стороны
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js,Browse BOM,Просмотр спецификации
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py,Secured Loans,Обеспеченные кредиты
@@ -5173,6 +5184,7 @@
 apps/erpnext/erpnext/stock/doctype/item_alternative/item_alternative.py,Not allow to set alternative item for the item {0},Не разрешить установку альтернативного элемента для элемента {0}
 apps/erpnext/erpnext/hr/doctype/leave_block_list/leave_block_list.py,Date is repeated,Дата повторяется
 apps/erpnext/erpnext/accounts/print_format/payment_receipt_voucher/payment_receipt_voucher.html,Authorized Signatory,Право подписи
+apps/erpnext/erpnext/education/doctype/instructor/instructor.py,Please setup Instructor Naming System in Education &gt; Education Settings,"Пожалуйста, настройте систему имен инструкторов в «Образование»&gt; «Настройки образования»"
 apps/erpnext/erpnext/regional/doctype/gstr_3b_report/gstr_3b_report.html,Net ITC Available(A) - (B),Чистый ITC Доступен (A) - (B)
 apps/erpnext/erpnext/education/doctype/fee_schedule/fee_schedule.js,Create Fees,Создать сборы
 DocType: Project,Total Purchase Cost (via Purchase Invoice),Общая стоимость покупки (через счет покупки)
@@ -5193,6 +5205,7 @@
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.js,Message Sent,Сообщение отправлено
 apps/erpnext/erpnext/accounts/doctype/account/account.py,Account with child nodes cannot be set as ledger,"Счет с дочерних узлов, не может быть установлен как книгу"
 DocType: C-Form,II,II
+apps/erpnext/erpnext/assets/report/fixed_asset_register/fixed_asset_register.py,Vendor Name,Имя продавца
 DocType: Quiz Result,Wrong,Неправильно
 DocType: Sales Invoice,Rate at which Price list currency is converted to customer's base currency,Курс по которому валюта Прайс листа конвертируется в базовую валюту покупателя
 DocType: Purchase Invoice Item,Net Amount (Company Currency),Чистая сумма (валюта Компании)
@@ -5438,6 +5451,7 @@
 DocType: Stock Settings,Auto Material Request,Автоматический запрос материалов
 DocType: Woocommerce Settings,API consumer secret,Секрет потребителя API
 DocType: Delivery Note Item,Available Batch Qty at From Warehouse,Доступные Пакетная Кол-во на со склада
+,Received Qty Amount,Полученная Кол-во Сумма
 DocType: Salary Slip,Gross Pay - Total Deduction - Loan Repayment,Gross Pay - Итого Вычет - Погашение кредита
 DocType: Bank Account,Last Integration Date,Дата последней интеграции
 DocType: Expense Claim,Expense Taxes and Charges,Расходные налоги и сборы
@@ -5901,6 +5915,8 @@
 DocType: Drug Prescription,Hour,Час
 DocType: Restaurant Order Entry,Last Sales Invoice,Последний счет на продажу
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py,Please select Qty against item {0},Выберите кол-во продукта {0}
+apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py,Latest Age,Поздняя стадия
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js,Transfer Material to Supplier,Перевести Материал Поставщику
 apps/erpnext/erpnext/hr/report/loan_repayment/loan_repayment.py,EMI,EMI
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py,New Serial No cannot have Warehouse. Warehouse must be set by Stock Entry or Purchase Receipt,Новый Серийный номер не может быть Склад. Склад должен быть установлен на фондовой Вступил или приобрести получении
 DocType: Lead,Lead Type,Тип Обращения
@@ -5924,7 +5940,6 @@
 apps/erpnext/erpnext/hr/doctype/employee_benefit_application/employee_benefit_application.py,"An amount of {0} already claimed for the component {1},\
 						 set the amount equal or greater than {2}","Количество {0}, уже заявленное для компонента {1}, \ задает величину, равную или превышающую {2}"
 DocType: Shipping Rule,Shipping Rule Conditions,Правило перевозки груза
-DocType: Purchase Invoice,Export Type,Тип экспорта
 DocType: Salary Slip Loan,Salary Slip Loan,Зарплатный ссудный кредит
 DocType: BOM Update Tool,The new BOM after replacement,Новая спецификация после замены
 ,Point of Sale,Точки продаж
@@ -6046,7 +6061,6 @@
 DocType: Purchase Order Item,Blanket Order Rate,Стоимость заказа на одеяло
 ,Customer Ledger Summary,Сводная книга клиентов
 apps/erpnext/erpnext/hooks.py,Certification,сертификация
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js,Are you sure you want to make debit note?,"Вы уверены, что хотите сделать дебетовую заметку?"
 DocType: Bank Guarantee,Clauses and Conditions,Положения и условия
 DocType: Serial No,Creation Document Type,Создание типа документа
 DocType: Amazon MWS Settings,ES,ES
@@ -6084,8 +6098,6 @@
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py,Financial Services,Финансовые услуги
 DocType: Student Sibling,Student ID,Студенческий билет
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.js,For Quantity must be greater than zero,Для количества должно быть больше нуля
-apps/erpnext/erpnext/hr/doctype/employee_transfer/employee_transfer.py,"Please delete the Employee <a href=""#Form/Employee/{0}"">{0}</a>\
-					to cancel this document","Пожалуйста, удалите Сотрудника <a href=""#Form/Employee/{0}"">{0}</a> \, чтобы отменить этот документ"
 apps/erpnext/erpnext/config/projects.py,Types of activities for Time Logs,Виды деятельности для Время Журналы
 DocType: Opening Invoice Creation Tool,Sales,Продажи
 DocType: Stock Entry Detail,Basic Amount,Основное количество
@@ -6164,6 +6176,7 @@
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py,Print and Stationery,Печать и канцелярские
 DocType: Stock Settings,Show Barcode Field,Показать поле штрих-кода
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js,Send Supplier Emails,Отправить электронную почту поставщика
+DocType: Asset Movement,ACC-ASM-.YYYY.-,ACC-ASM-.YYYY.-
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py,"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,Автосоздан
 apps/erpnext/erpnext/hr/doctype/employee_onboarding/employee_onboarding.py,Submit this to create the Employee record,"Отправьте это, чтобы создать запись сотрудника"
@@ -6243,7 +6256,6 @@
 DocType: Sales Team,Contact No.,Контактный номер
 apps/erpnext/erpnext/templates/includes/cart/cart_address.html,Billing Address is same as Shipping Address,Платежный адрес совпадает с адресом доставки
 DocType: Bank Reconciliation,Payment Entries,Записи оплаты
-apps/erpnext/erpnext/erpnext_integrations/doctype/shopify_settings/shopify_settings.py,Access token or Shopify URL missing,Недопустимый токен доступа или URL-адрес Shopify
 DocType: Location,Latitude,широта
 DocType: Work Order,Scrap Warehouse,Лом Склад
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py,"Warehouse required at Row No {0}, please set default warehouse for the item {1} for the company {2}","Требуется хранилище в строке «Нет» {0}, пожалуйста, установите для хранилища по умолчанию для товара {1} для компании {2}"
@@ -6288,7 +6300,6 @@
 DocType: Job Offer Term,Value / Description,Значение / Описание
 apps/erpnext/erpnext/controllers/accounts_controller.py,"Row #{0}: Asset {1} cannot be submitted, it is already {2}","Строка # {0}: Актив {1} не может быть проведен, он уже {2}"
 DocType: Tax Rule,Billing Country,Страна плательщика
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js,Are you sure you want to make credit note?,"Вы уверены, что хотите сделать кредитную заметку?"
 DocType: Purchase Order Item,Expected Delivery Date,Ожидаемая дата доставки
 DocType: Restaurant Order Entry,Restaurant Order Entry,Ввод заказа ресторана
 apps/erpnext/erpnext/accounts/general_ledger.py,Debit and Credit not equal for {0} #{1}. Difference is {2}.,Дебет и Кредит не равны для {0} # {1}. Разница {2}.
@@ -6413,6 +6424,7 @@
 DocType: Purchase Invoice,Taxes and Charges Added,Налоги и сборы добавлены
 apps/erpnext/erpnext/assets/doctype/asset/asset.py,Depreciation Row {0}: Next Depreciation Date cannot be before Available-for-use Date,"Строка амортизации {0}: следующая дата амортизации не может быть до даты, доступной для использования"
 ,Sales Funnel,Воронка продаж
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Item Code &gt; Item Group &gt; Brand,Код товара&gt; Группа товаров&gt; Марка
 apps/erpnext/erpnext/setup/doctype/company/company.py,Abbreviation is mandatory,Сокращение является обязательным
 DocType: Project,Task Progress,Готовность задачи
 apps/erpnext/erpnext/templates/includes/navbar/navbar_items.html,Cart,Тележка
@@ -6659,6 +6671,7 @@
 DocType: Employee Grade,Employee Grade,Уровень персонала
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py,Piecework,Сдельная работа
 DocType: GSTR 3B Report,June,июнь
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Supplier &gt; Supplier Type,Поставщик&gt; Тип поставщика
 DocType: Share Balance,From No,От Нет
 DocType: Shift Type,Early Exit Grace Period,Льготный период раннего выхода
 DocType: Task,Actual Time (in Hours),Фактическое время (в часах)
@@ -6945,6 +6958,7 @@
 DocType: Warehouse,Warehouse Name,Название склада
 DocType: Naming Series,Select Transaction,Выберите операцию
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py,Please enter Approving Role or Approving User,"Пожалуйста, введите утверждении роли или утверждении Пользователь"
+apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.py,UOM Conversion factor ({0} -&gt; {1}) not found for item: {2},Коэффициент преобразования UOM ({0} -&gt; {1}) не найден для элемента: {2}
 apps/erpnext/erpnext/support/doctype/service_level_agreement/service_level_agreement.py,Service Level Agreement with Entity Type {0} and Entity {1} already exists.,Соглашение об уровне обслуживания с типом объекта {0} и объектом {1} уже существует.
 DocType: Journal Entry,Write Off Entry,Списание запись
 DocType: BOM,Rate Of Materials Based On,Оценить материалов на основе
@@ -7136,6 +7150,7 @@
 DocType: Quality Inspection Reading,Quality Inspection Reading,Контроль качества Чтение
 apps/erpnext/erpnext/stock/doctype/stock_settings/stock_settings.py,`Freeze Stocks Older Than` should be smaller than %d days.,"""Заморозить остатки старше чем"" должны быть меньше %d дней."
 DocType: Tax Rule,Purchase Tax Template,Налог на покупку шаблон
+apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py,Earliest Age,Самый ранний возраст
 apps/erpnext/erpnext/utilities/user_progress.py,Set a sales goal you'd like to achieve for your company.,"Задайте цель продаж, которую вы хотите достичь для своей компании."
 DocType: Quality Goal,Revision,пересмотр
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js,Healthcare Services,Здравоохранение
@@ -7179,6 +7194,7 @@
 apps/erpnext/erpnext/healthcare/doctype/patient_encounter/patient_encounter.js,Schedule Discharge,Расписание
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py,Cheques and Deposits incorrectly cleared,Чеки и депозиты неправильно очищена
 DocType: Homepage Section Card,Homepage Section Card,Домашняя страница Раздел Карта
+,Amount To Be Billed,Сумма к оплате
 apps/erpnext/erpnext/accounts/doctype/account/account.py,Account {0}: You can not assign itself as parent account,Счёт {0}: Вы не можете  назначить самого себя родительским счётом
 DocType: Purchase Invoice Item,Price List Rate,Прайс-лист Оценить
 apps/erpnext/erpnext/utilities/activation.py,Create customer quotes,Создание котировки клиентов
@@ -7231,6 +7247,7 @@
 DocType: Supplier Scorecard Criteria,Supplier Scorecard Criteria,Критерии оценки поставщиков
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py,Please select Start Date and End Date for Item {0},"Пожалуйста, выберите дату начала и дату окончания Пункт {0}"
 DocType: Maintenance Schedule,MAT-MSH-.YYYY.-,MAT-MSH-.YYYY.-
+,Amount to Receive,Сумма для получения
 apps/erpnext/erpnext/education/doctype/student_group_creation_tool/student_group_creation_tool.py,Course is mandatory in row {0},Курс является обязательным в строке {0}
 apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py,From date can not be greater than than To date,"С даты не может быть больше, чем на дату"
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py,To date cannot be before from date,На сегодняшний день не может быть раньше от даты
@@ -7480,7 +7497,6 @@
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js,BOM and Manufacturing Quantity are required,ВМ и количество продукции обязательны
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js,Ageing Range 2,Старение Диапазон 2
 DocType: SG Creation Tool Course,Max Strength,Максимальное число студентов
-apps/erpnext/erpnext/accounts/doctype/account/account.py,"Account {0} already exists in child company {1}. The following fields have different values, they should be same:<ul><li>{2}</li></ul>","Учетная запись {0} уже существует в дочерней компании {1}. Следующие поля имеют разные значения, они должны быть одинаковыми: <ul><li> {2} </li></ul>"
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py,Installing presets,Установка пресетов
 DocType: Fee Schedule,EDU-FSH-.YYYY.-,EDU-FSH-.YYYY.-
 apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js,No Delivery Note selected for Customer {},Нет примечания о доставке для клиента {}
@@ -7692,6 +7708,7 @@
 DocType: Delivery Note,Print Without Amount,Распечатать без суммы
 apps/erpnext/erpnext/accounts/report/asset_depreciation_ledger/asset_depreciation_ledger.py,Depreciation Date,Износ Дата
 ,Work Orders in Progress,Незавершенные заказы
+DocType: Customer Credit Limit,Bypass Credit Limit Check,Обход проверки кредитного лимита
 DocType: Issue,Support Team,Отдел тех. поддержки
 apps/erpnext/erpnext/stock/report/batch_item_expiry_status/batch_item_expiry_status.py,Expiry (In Days),Срок действия (в днях)
 DocType: Appraisal,Total Score (Out of 5),Всего рейтинг (из 5)
@@ -7877,6 +7894,7 @@
 DocType: Sales Invoice,Customer GSTIN,Клиент GSTIN
 DocType: Crop Cycle,List of diseases detected on the field. When selected it'll automatically add a list of tasks to deal with the disease ,"Список заболеваний, обнаруженных на поле. При выборе он автоматически добавит список задач для борьбы с болезнью"
 apps/erpnext/erpnext/manufacturing/page/bom_comparison_tool/bom_comparison_tool.js,BOM 1,Спецификация 1
+apps/erpnext/erpnext/assets/report/fixed_asset_register/fixed_asset_register.py,Asset Id,Идентификатор актива
 apps/erpnext/erpnext/healthcare/doctype/healthcare_service_unit/healthcare_service_unit.js,This is a root healthcare service unit and cannot be edited.,Это корневая служба здравоохранения и не может быть отредактирована.
 DocType: Asset Repair,Repair Status,Статус ремонта
 apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.js,"Requested Qty: Quantity requested for purchase, but not ordered.","Запрашиваемые Кол-во: Количество просил для покупки, но не заказали."
diff --git a/erpnext/translations/si.csv b/erpnext/translations/si.csv
index 7e041f3..0fb1cd7 100644
--- a/erpnext/translations/si.csv
+++ b/erpnext/translations/si.csv
@@ -283,7 +283,6 @@
 DocType: Loan,Repay Over Number of Periods,"කාල පරිච්ඡේදය, සංඛ්යාව අධික ආපසු ගෙවීම"
 apps/erpnext/erpnext/manufacturing/report/bom_stock_report/bom_stock_report.py,Quantity to Produce can not be less than Zero,නිෂ්පාදනය කිරීමට ඇති ප්‍රමාණය ශුන්‍යයට වඩා අඩු විය නොහැක
 DocType: Stock Entry,Additional Costs,අතිරේක පිරිවැය
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Customer &gt; Customer Group &gt; Territory,පාරිභෝගික&gt; පාරිභෝගික කණ්ඩායම&gt; ප්‍රදේශය
 apps/erpnext/erpnext/accounts/doctype/account/account.py,Account with existing transaction can not be converted to group.,පවත්නා ගනුදෙනුව ගිණුමක් පිරිසක් බවට පරිවර්තනය කළ නොහැක.
 DocType: Lead,Product Enquiry,නිෂ්පාදන විමසීම්
 DocType: Education Settings,Validate Batch for Students in Student Group,ශිෂ්ය සමූහය සිසුන් සඳහා කණ්ඩායම තහවුරු කර
@@ -579,6 +578,7 @@
 DocType: Healthcare Settings,Create documents for sample collection,සාම්පල එකතු කිරීම සඳහා ලේඛන සාදන්න
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py,Payment against {0} {1} cannot be greater than Outstanding Amount {2},{0} {1} විශිෂ්ට මුදල {2} වඩා වැඩි විය නොහැකි එරෙහිව ගෙවීම්
 apps/erpnext/erpnext/patches/v11_0/add_healthcare_service_unit_tree_root.py,All Healthcare Service Units,සියලුම සෞඛ්ය සේවා ඒකක
+apps/erpnext/erpnext/setup/default_energy_point_rules.py,On Converting Opportunity,අවස්ථාව පරිවර්තනය කිරීමේ දී
 DocType: Bank Account,Address HTML,ලිපිනය HTML
 DocType: Lead,Mobile No.,ජංගම අංක
 apps/erpnext/erpnext/selling/doctype/pos_closing_voucher/closing_voucher_details.html,Mode of Payments,ගෙවීමේ ක්රමය
@@ -643,7 +643,6 @@
 DocType: Accounting Dimension,Dimension Name,මාන නම
 apps/erpnext/erpnext/healthcare/setup.py,Resistant,ප්රතිරෝධය
 apps/erpnext/erpnext/hotels/doctype/hotel_room_reservation/hotel_room_reservation.py,Please set Hotel Room Rate on {},කරුණාකර හෝටල් කාමර ගාස්තු {{
-apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py,Please setup numbering series for Attendance via Setup &gt; Numbering Series,කරුණාකර පැමිණීම සඳහා අංකනය කිරීමේ ශ්‍රේණිය සැකසුම&gt; අංකනය මාලාව හරහා සකසන්න
 DocType: Journal Entry,Multi Currency,බහු ව්යවහාර මුදල්
 DocType: Bank Statement Transaction Invoice Item,Invoice Type,ඉන්වොයිසිය වර්ගය
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py,Valid from date must be less than valid upto date,දින සිට වලංගු වන්නේ වලංගු දිනට වඩා අඩු විය යුතුය
@@ -757,6 +756,7 @@
 apps/erpnext/erpnext/accounts/page/pos/pos.js,Create a new Customer,නව පාරිභෝගික නිර්මාණය
 apps/erpnext/erpnext/non_profit/report/expiring_memberships/expiring_memberships.py,Expiring On,කල් ඉකුත් වේ
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,"If multiple Pricing Rules continue to prevail, users are asked to set Priority manually to resolve conflict.","බහු මිල නියම රීති පවතින දිගටම සිදු වන්නේ නම්, පරිශීලකයන් ගැටුම විසඳීමට අතින් ප්රමුඛ සකස් කරන ලෙස ඉල්ලා ඇත."
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js,Purchase Return,මිලදී ගැනීම ප්රතිලාභ
 apps/erpnext/erpnext/utilities/activation.py,Create Purchase Orders,මිලදී ගැනීම නියෝග නිර්මාණය
 ,Purchase Register,මිලදී රෙජිස්ටර්
 apps/erpnext/erpnext/healthcare/doctype/patient/patient.py,Patient not found,රෝගියා සොයාගත නොහැකි විය
@@ -771,7 +771,6 @@
 DocType: Location,Area UOM,UOM ප්රදේශය
 apps/erpnext/erpnext/manufacturing/doctype/workstation/workstation.py,Workstation is closed on the following dates as per Holiday List: {0},සේවා පරිගණකයක් නිවාඩු ලැයිස්තුව අනුව පහත සඳහන් දිනවලදී වසා ඇත: {0}
 apps/erpnext/erpnext/selling/page/sales_funnel/sales_funnel.py,Opportunities,අවස්ථාවන්
-apps/erpnext/erpnext/www/all-products/index.html,Clear filters,පෙරහන් ඉවත් කරන්න
 DocType: Lab Test Template,Single,තනි
 DocType: Compensatory Leave Request,Work From Date,දිනය සිට වැඩ කිරීම
 DocType: Salary Slip,Total Loan Repayment,මුළු ණය ආපසු ගෙවීමේ
@@ -815,6 +814,7 @@
 apps/erpnext/erpnext/education/doctype/program_enrollment_tool/program_enrollment_tool.py,Mandatory field - Academic Year,අනිවාර්ය ක්ෂේත්රයේ - අධ්යයන වර්ෂය
 apps/erpnext/erpnext/education/doctype/program_enrollment_tool/program_enrollment_tool.py,Mandatory field - Academic Year,අනිවාර්ය ක්ෂේත්රයේ - අධ්යයන වර්ෂය
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py,{0} {1} is not associated with {2} {3},{0} {1} {2} සමග සම්බන්ධ වී නැත {3}
+DocType: Opportunity,Converted By,විසින් පරිවර්තනය කරන ලදි
 apps/erpnext/erpnext/public/js/hub/components/ReviewArea.vue,You need to login as a Marketplace User before you can add any reviews.,ඔබට සමාලෝචන එකතු කිරීමට පෙර වෙළඳපල පරිශීලකයෙකු ලෙස ප්‍රවේශ විය යුතුය.
 apps/erpnext/erpnext/manufacturing/doctype/job_card/job_card.py,Row {0} : Operation is required against the raw material item {1},පේළිය {0}: අමුද්රව්ය අයිතමයට එරෙහිව ක්රියාත්මක කිරීම {1}
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py,Please set default payable account for the company {0},සමාගම {0} සඳහා පෙරනිමි ගෙවිය යුතු ගිණුම් සකස් කරන්න
@@ -839,6 +839,8 @@
 DocType: BOM,Work Order,වැඩ පිළිවෙල
 DocType: Sales Invoice,Total Qty,යවන ලද මුළු
 apps/erpnext/erpnext/education/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py,Guardian2 Email ID,Guardian2 විද්යුත් හැඳුනුම්පත
+apps/erpnext/erpnext/hr/doctype/employee_transfer/employee_transfer.py,"Please delete the Employee <a href=""#Form/Employee/{0}"">{0}</a>\
+					to cancel this document","මෙම ලේඛනය අවලංගු කිරීමට කරුණාකර සේවකයා <a href=""#Form/Employee/{0}"">{0}</a> delete මකන්න"
 DocType: Item,Show in Website (Variant),වෙබ් අඩවිය තුල පෙන්වන්න (ප්රභේද්යයක්)
 DocType: Employee,Health Concerns,සෞඛ්ය කනස්සල්ල
 DocType: Payroll Entry,Select Payroll Period,වැටුප් කාලය තෝරන්න
@@ -896,7 +898,6 @@
 apps/erpnext/erpnext/education/doctype/student_group/student_group.py,Please select Course,තෝරා පාඨමාලාව කරුණාකර
 DocType: Codification Table,Codification Table,සංගහ වගුව
 DocType: Timesheet Detail,Hrs,ට
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js,Please select Company,කරුණාකර සමාගම තෝරා
 DocType: Employee Skill,Employee Skill,සේවක කුසලතා
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.js,Difference Account,වෙනස ගිණුම
 DocType: Pricing Rule,Discount on Other Item,වෙනත් අයිතම සඳහා වට්ටම්
@@ -964,6 +965,7 @@
 DocType: BOM,Operating Cost,මෙහෙයුම් පිරිවැය
 DocType: Crop,Produced Items,නිෂ්පාදිත අයිතම
 DocType: Bank Statement Transaction Entry,Match Transaction to Invoices,ඉන්වොයිසිවලට ගණුදෙනු කිරීම
+apps/erpnext/erpnext/erpnext_integrations/exotel_integration.py,Error in Exotel incoming call,එක්සොටෙල් පැමිණෙන ඇමතුමේ දෝෂයකි
 DocType: Sales Order Item,Gross Profit,දළ ලාභය
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js,Unblock Invoice,අවහිර කිරීම ඉන්වොයිසිය
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py,Increment cannot be 0,වර්ධකය 0 වෙන්න බෑ
@@ -1171,6 +1173,7 @@
 DocType: Activity Cost,Activity Type,ක්රියාකාරකම් වර්ගය
 DocType: Request for Quotation,For individual supplier,තනි තනි සැපයුම්කරු සඳහා
 DocType: BOM Operation,Base Hour Rate(Company Currency),මූලික හෝරාව අනුපාතිකය (සමාගම ව්යවහාර මුදල්)
+,Qty To Be Billed,බිල් කිරීමට Qty
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py,Delivered Amount,භාර මුදල
 apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.js,Reserved Qty for Production: Raw materials quantity to make manufacturing items.,නිෂ්පාදනය සඳහා වෙන් කර ඇති ප්‍රමාණය: නිෂ්පාදන භාණ්ඩ සෑදීම සඳහා අමුද්‍රව්‍ය ප්‍රමාණය.
 DocType: Loyalty Point Entry Redemption,Redemption Date,මිදීමේ දිනය
@@ -1290,7 +1293,7 @@
 apps/erpnext/erpnext/education/doctype/student_group/student_group.py,Please select Program,කරුණාකර වැඩසටහන තෝරා
 apps/erpnext/erpnext/education/doctype/student_group/student_group.py,Please select Program,කරුණාකර වැඩසටහන තෝරා
 DocType: Project,Estimated Cost,තක්සේරු කළ පිරිවැය
-DocType: Request for Quotation,Link to material requests,ද්රව්ය ඉල්ලීම් වෙත සබැඳෙන පිටු
+DocType: Supplier Quotation,Link to material requests,ද්රව්ය ඉල්ලීම් වෙත සබැඳෙන පිටු
 apps/erpnext/erpnext/public/js/hub/pages/Publish.vue,Publish,පළ කරන්න
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py,Aerospace,ගගන
 ,Fichier des Ecritures Comptables [FEC],Fichier des Ecritures Comptables [FEC]
@@ -1303,6 +1306,7 @@
 apps/erpnext/erpnext/utilities/transaction_base.py,Invalid Posting Time,වලංගු නොවන තැපැල් කිරීම
 DocType: Salary Component,Condition and Formula,තත්වය සහ සූත්රය
 DocType: Lead,Campaign Name,ව්යාපාරය නම
+apps/erpnext/erpnext/setup/default_energy_point_rules.py,On Task Completion,කාර්යය සම්පූර්ණ කිරීම පිළිබඳ
 apps/erpnext/erpnext/hr/doctype/compensatory_leave_request/compensatory_leave_request.py,There is no leave period in between {0} and {1},{0} සහ {1} අතර විරාමයක් නොමැත.
 DocType: Fee Validity,Healthcare Practitioner,සෞඛ්ය ආරක්ෂණ වෘත්තිකයා
 DocType: Hotel Room,Capacity,ධාරිතාව
@@ -1645,7 +1649,6 @@
 DocType: Quality Feedback Template,Quality Feedback Template,ගුණාත්මක ප්‍රතිපෝෂණ ආකෘතිය
 apps/erpnext/erpnext/config/education.py,LMS Activity,LMS ක්‍රියාකාරකම්
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py,Internet Publishing,අන්තර්ජාල ප්රකාශන
-DocType: Prescription Duration,Number,අංකය
 apps/erpnext/erpnext/accounts/doctype/opening_invoice_creation_tool/opening_invoice_creation_tool.js,Creating {0} Invoice,{0} ඉන්වොයිසිය සෑදීම
 DocType: Medical Code,Medical Code Standard,වෛද්ය කේත ප්රමිතිය
 DocType: Soil Texture,Clay Composition (%),මැටි සංයුතිය (%)
@@ -1720,6 +1723,7 @@
 DocType: Support Settings,Get Started Sections,ආරම්භ කළ අංශ
 DocType: Lead,CRM-LEAD-.YYYY.-,CRM-LEAD-.YYYY.-
 DocType: Invoice Discounting,Sanctioned,අනුමත
+,Base Amount,මූලික මුදල
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.js,Total Contribution Amount: {0},මුළු දායක මුදල් ප්රමාණය: {0}
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py,Row #{0}: Please specify Serial No for Item {1},ෙරෝ # {0}: අයිතමය {1} සඳහා අනු අංකය සඳහන් කරන්න
 DocType: Payroll Entry,Salary Slips Submitted,වැටුප් ස්ලිප් ඉදිරිපත් කරන ලදි
@@ -1941,6 +1945,7 @@
 apps/erpnext/erpnext/utilities/user_progress.py,List a few of your suppliers. They could be organizations or individuals.,ඔබේ සැපයුම්කරුවන් කිහිපයක් සඳහන් කරන්න. ඔවුන් සංවිධාන හෝ පුද්ගලයින් විය හැකි ය.
 DocType: Accounting Dimension,Dimension Defaults,මාන පෙරනිමි
 apps/erpnext/erpnext/crm/report/prospects_engaged_but_not_converted/prospects_engaged_but_not_converted.js,Minimum Lead Age (Days),අවම ඊයම් වයස (දින)
+apps/erpnext/erpnext/assets/report/fixed_asset_register/fixed_asset_register.py,Available For Use Date,භාවිත දිනය සඳහා ලබා ගත හැකිය
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py,All BOMs,සියලු BOMs
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js,Create Inter Company Journal Entry,අන්තර් සමාගම් ජර්නල් ප්‍රවේශය සාදන්න
 DocType: Company,Parent Company,මව් සමාගම
@@ -2002,6 +2007,7 @@
 ,IRS 1099,IRS 1099
 DocType: Salary Slip,Leave Without Pay,වැටුප් නැතිව තබන්න
 DocType: Payment Request,Outward,පිටතින්
+apps/erpnext/erpnext/setup/default_energy_point_rules.py,On {0} Creation,{0} නිර්මාණය මත
 apps/erpnext/erpnext/regional/doctype/gstr_3b_report/gstr_3b_report.html,State/UT Tax,රාජ්ය / යූටී බද්ද
 ,Trial Balance for Party,පක්ෂය වෙනුවෙන් මාසික බැංකු සැසඳුම්
 ,Gross and Net Profit Report,දළ සහ ශුද්ධ ලාභ වාර්තාව
@@ -2116,6 +2122,7 @@
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js,Make Stock Entry,කොටස් ඇතුළත් කරන්න
 DocType: Hotel Room Reservation,Hotel Reservation User,හෝටල් වෙන් කිරීමේ පරිශීලක
 apps/erpnext/erpnext/projects/doctype/project/project.js,Set Status,තත්වය සකසන්න
+apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py,Please setup numbering series for Attendance via Setup &gt; Numbering Series,කරුණාකර පැමිණීම සඳහා අංකනය කිරීමේ ශ්‍රේණිය සැකසුම&gt; අංකනය මාලාව හරහා සකසන්න
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py,Please select prefix first,කරුණාකර පළමු උපසර්ගය තෝරා
 DocType: Contract,Fulfilment Deadline,ඉෂ්ඨ වේ
 apps/erpnext/erpnext/public/js/hub/pages/Home.vue,Near you,ඔබ අසල
@@ -2131,6 +2138,7 @@
 DocType: Announcement,All Students,සියලු ශිෂ්ය
 apps/erpnext/erpnext/assets/doctype/asset/asset.py,Item {0} must be a non-stock item,{0} අයිතමය නොවන කොටස් අයිතමය විය යුතුය
 apps/erpnext/erpnext/stock/doctype/batch/batch.js,View Ledger,දැක්ම ලේජර
+DocType: Cost Center,Lft,Lft
 DocType: Grading Scale,Intervals,කාල අන්තරයන්
 DocType: Bank Statement Transaction Entry,Reconciled Transactions,ගනුදෙනුවල ප්රතිඵලයක්
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py,Earliest,ආදිතම
@@ -2245,6 +2253,7 @@
 apps/erpnext/erpnext/hr/doctype/employee_benefit_application/employee_benefit_application.py,As per your assigned Salary Structure you cannot apply for benefits,ඔබ ලබා දුන් වැටුප් ව්යුහය අනුව ඔබට ප්රතිලාභ සඳහා අයදුම් කළ නොහැකිය
 apps/erpnext/erpnext/stock/doctype/item/item.py,Website Image should be a public file or website URL,වෙබ් අඩවිය රූප ප්රසිද්ධ ගොනුව හෝ වෙබ් අඩවි URL විය යුතුය
 DocType: Purchase Invoice Item,BOM,ද්රව්ය ලේඛණය
+apps/erpnext/erpnext/stock/doctype/item/item.py,Duplicate entry in Manufacturers table,නිෂ්පාදකයින්ගේ වගුවේ අනුපිටපත් ඇතුළත් කිරීම
 apps/erpnext/erpnext/setup/doctype/item_group/item_group.js,This is a root item group and cannot be edited.,"මෙය මූල අයිතමය පිරිසක් වන අතර, සංස්කරණය කළ නොහැක."
 apps/erpnext/erpnext/accounts/doctype/account/account.js,Merge,ඒකාබද්ධ කරන්න
 DocType: Journal Entry Account,Purchase Order,ගැණුම් ඇණවුම
@@ -2388,7 +2397,6 @@
 DocType: Asset,Depreciation Schedules,ක්ෂය කාලසටහන
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.js,Create Sales Invoice,විකුණුම් ඉන්වොයිසිය සාදන්න
 apps/erpnext/erpnext/regional/doctype/gstr_3b_report/gstr_3b_report.html,Ineligible ITC,නුසුදුසු අයිටීසී
-apps/erpnext/erpnext/erpnext_integrations/doctype/shopify_settings/shopify_settings.py,"Support for public app is deprecated. Please setup private app, for more details refer user manual",පොදු යෙදුම සඳහා සහාය නොදක්වයි. කරුණාකර වැඩි විස්තර සඳහා පරිශිලක යෙදුමක් සකසා කරුණාකර පරිශීලක අත්පොත යොමු කරන්න
 DocType: Task,Dependent Tasks,යැපෙන කාර්යයන්
 apps/erpnext/erpnext/regional/report/gstr_1/gstr_1.py,Following accounts might be selected in GST Settings:,පහත සඳහන් ගිණුම GST සැකසුම් තුළ තෝරා ගත හැකිය:
 apps/erpnext/erpnext/manufacturing/report/bom_stock_report/bom_stock_report.js,Quantity to Produce,නිෂ්පාදනය කිරීමට ඇති ප්‍රමාණය
@@ -2636,6 +2644,7 @@
 DocType: Water Analysis,Container,කන්ටේනර්
 apps/erpnext/erpnext/regional/report/gstr_1/gstr_1.py,Please set valid GSTIN No. in Company Address,කරුණාකර සමාගම් ලිපිනයේ වලංගු GSTIN අංකය සකසන්න
 apps/erpnext/erpnext/education/utils.py,Student {0} - {1} appears Multiple times in row {2} & {3},ශිෂ්ය {0} - {1} පේළියේ {2} තුළ බහු වතාවක් ප්රකාශ සහ {3}
+apps/erpnext/erpnext/selling/doctype/customer/customer.py,Following fields are mandatory to create address:,ලිපිනය සෑදීම සඳහා පහත සඳහන් ක්ෂේත්‍ර අනිවාර්ය වේ:
 DocType: Item Alternative,Two-way,ද්වි මාර්ගයක්
 DocType: Item,Manufacturers,නිෂ්පාදකයින්
 ,Employee Billing Summary,සේවක බිල්පත් සාරාංශය
@@ -2710,9 +2719,9 @@
 DocType: Employee,HR-EMP-,HR-EMP-
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py,User {0} doesn't have any default POS Profile. Check Default at Row {1} for this User.,පරිශීලක {0} කිසිදු පෙරනිමි POS පැතිකඩක් නොමැත. මෙම පරිශීලක සඳහා Row {1} හි පෙරනිමිය පරීක්ෂා කරන්න.
 DocType: Quality Meeting Minutes,Quality Meeting Minutes,තත්ත්ව රැස්වීම් විනාඩි
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Supplier &gt; Supplier Type,සැපයුම්කරු&gt; සැපයුම්කරු වර්ගය
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py,Employee Referral,සේවක යොමුකිරීම
 DocType: Student Group,Set 0 for no limit,සීමාවක් සඳහා 0 සකසන්න
+DocType: Cost Center,rgt,rgt
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py,The day(s) on which you are applying for leave are holidays. You need not apply for leave.,ඔබ නිවාඩු සඳහා අයදුම් කරන්නේ කරන දින (ව) නිවාඩු දින වේ. ඔබ නිවාඩු සඳහා අයදුම් අවශ්ය නැහැ.
 DocType: Customer,Primary Address and Contact Detail,ප්රාථමික ලිපිනය සහ සම්බන්ධතා විස්තරය
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.js,Resend Payment Email,නැවත භාරදුන් ගෙවීම් විද්යුත්
@@ -2818,7 +2827,6 @@
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py,Against Supplier Invoice {0} dated {1},සැපයුම්කරු ඉන්වොයිසිය {0} එරෙහිව දිනැති {1}
 DocType: Customer,Default Price List,පෙරනිමි මිල ලැයිස්තුව
 apps/erpnext/erpnext/assets/doctype/asset/asset.py,Asset Movement record {0} created,වත්කම් ව්යාපාරය වාර්තා {0} නිර්මාණය
-apps/erpnext/erpnext/utilities/page/leaderboard/leaderboard.js,No items found.,අයිතම හමු නොවිනි.
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py,You cannot delete Fiscal Year {0}. Fiscal Year {0} is set as default in Global Settings,ඔබ මුදල් වර්ෂය {0} මකා දැමිය නොහැකි. මුදල් වර්ෂය {0} ගෝලීය සැකසුම් සුපුරුදු ලෙස සකසා ඇත
 DocType: Share Transfer,Equity/Liability Account,කොටස් / වගකීම් ගිණුම
 apps/erpnext/erpnext/setup/doctype/customer_group/customer_group.py,A customer with the same name already exists,එකම නමක් සහිත පාරිභෝගිකයෙක් දැනටමත් පවතී
@@ -2834,6 +2842,7 @@
 apps/erpnext/erpnext/selling/doctype/customer/customer.py,Credit limit has been crossed for customer {0} ({1}/{2}),පාරිභෝගිකයින් සඳහා ණය සීමාව {0} ({1} / {2} සඳහා {{{
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py,Customer required for 'Customerwise Discount',&#39;Customerwise වට්ටම්&#39; සඳහා අවශ්ය පාරිභෝගික
 apps/erpnext/erpnext/config/accounting.py,Update bank payment dates with journals.,සඟරා බැංකු ගෙවීම් දින යාවත්කාලීන කරන්න.
+,Billed Qty,බිල් කළ Qty
 apps/erpnext/erpnext/stock/doctype/item/item_dashboard.py,Pricing,මිල ගණන්
 DocType: Employee,Attendance Device ID (Biometric/RF tag ID),පැමිණීමේ උපාංග හැඳුනුම්පත (ජෛවමිතික / ආර්එෆ් ටැග් හැඳුනුම්පත)
 DocType: Quotation,Term Details,කාලීන තොරතුරු
@@ -2856,6 +2865,7 @@
 DocType: Share Transfer,Asset Account,වත්කම් ගිණුම
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js,New release date should be in the future,නව මුදාහැරීමේ දිනය අනාගතයේදී විය යුතුය
 DocType: Purchase Invoice,End date of current invoice's period,වත්මන් ඉන්වොයිස් ගේ කාලය අවසන් දිනය
+apps/erpnext/erpnext/hr/doctype/employee/employee.py,Please setup Employee Naming System in Human Resource &gt; HR Settings,කරුණාකර සේවක නම් කිරීමේ පද්ධතිය මානව සම්පත්&gt; මානව සම්පත් සැකසුම් තුළ සකසන්න
 DocType: Lab Test,Technician Name,කාර්මික ශිල්පී නම
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py,"Cannot ensure delivery by Serial No as \
 					Item {0} is added with and without Ensure Delivery by \
@@ -2863,6 +2873,7 @@
 DocType: Accounts Settings,Unlink Payment on Cancellation of Invoice,ඉන්වොයිසිය අවලංගු මත ගෙවීම් විසන්ධි කරන්න
 DocType: Bank Reconciliation,From Date,දින සිට
 apps/erpnext/erpnext/hr/doctype/vehicle_log/vehicle_log.py,Current Odometer reading entered should be greater than initial Vehicle Odometer {0},කියවීම ඇතුළු වත්මන් Odometer මූලික වාහන Odometer {0} වඩා වැඩි විය යුතුය
+,Purchase Order Items To Be Received or Billed,ලැබිය යුතු හෝ බිල් කළ යුතු ඇණවුම් අයිතම මිලදී ගන්න
 DocType: Restaurant Reservation,No Show,පෙන්වන්නෙ නැහැ
 apps/erpnext/erpnext/regional/india/utils.py,You must be a registered supplier to generate e-Way Bill,විද්‍යුත් මාර්ග බිල්පතක් ජනනය කිරීම සඳහා ඔබ ලියාපදිංචි සැපයුම්කරුවෙකු විය යුතුය
 DocType: Shipping Rule Country,Shipping Rule Country,නැව් පාලනය රට
@@ -2905,6 +2916,7 @@
 apps/erpnext/erpnext/templates/generators/item/item_add_to_cart.html,View in Cart,කරත්ත තුළ බලන්න
 DocType: Employee Checkin,Shift Actual Start,සැබෑ ආරම්භය මාරු කරන්න
 DocType: Tally Migration,Is Day Book Data Imported,දින පොත් දත්ත ආනයනය කර ඇත
+,Purchase Order Items To Be Received or Billed1,ලැබිය යුතු හෝ බිල් කළ යුතු ඇණවුම් අයිතම මිලදී ගන්න
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py,Marketing Expenses,අලෙවි වියදම්
 ,Item Shortage Report,අයිතමය හිඟය වාර්තාව
 DocType: Bank Transaction Payments,Bank Transaction Payments,බැංකු ගනුදෙනු ගෙවීම්
@@ -3273,6 +3285,7 @@
 ,Campaign Efficiency,ව්යාපාරය කාර්යක්ෂමතා
 ,Campaign Efficiency,ව්යාපාරය කාර්යක්ෂමතා
 DocType: Discussion,Discussion,සාකච්ඡා
+apps/erpnext/erpnext/setup/default_energy_point_rules.py,On Sales Order Submission,විකුණුම් ඇණවුම් ඉදිරිපත් කිරීමේදී
 DocType: Bank Transaction,Transaction ID,ගනුදෙනු හැඳුනුම්පත
 DocType: Payroll Entry,Deduct Tax For Unsubmitted Tax Exemption Proof,බදු විරහිත බදු ඔප්පු කිරීම සඳහා වන බදු ඉවත් කිරීම
 DocType: Volunteer,Anytime,ඕනෑම අවස්ථාවක
@@ -3280,7 +3293,6 @@
 DocType: Employee Tax Exemption Proof Submission,Employee Tax Exemption Proof Submission,සේවක බදු නිදහස් කිරීම් ඉදිරිපත් කිරිම
 DocType: Patient,Surgical History,ශල්ය ඉතිහාසය
 DocType: Bank Statement Settings Item,Mapped Header,සිතියම්ගත කළ ශීර්ෂකය
-apps/erpnext/erpnext/hr/doctype/employee/employee.py,Please setup Employee Naming System in Human Resource &gt; HR Settings,කරුණාකර සේවක නම් කිරීමේ පද්ධතිය මානව සම්පත්&gt; මානව සම්පත් සැකසුම් තුළ සකසන්න
 DocType: Employee,Resignation Letter Date,ඉල්ලා අස්වීමේ ලිපිය දිනය
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Pricing Rules are further filtered based on quantity.,ප්රමාණය මත පදනම් මිල ගණන් රීති තවදුරටත් පෙරනු ලබයි.
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py,Please set the Date Of Joining for employee {0},සේවක {0} සඳහා එක්වීමට දිනය සකස් කරන්න
@@ -3295,6 +3307,7 @@
 DocType: Bank Statement Settings,Mapped Items,සිතියම්ගත අයිතම
 DocType: Amazon MWS Settings,IT,එය
 DocType: Chapter,Chapter,පරිච්ඡේදය
+,Fixed Asset Register,ස්ථාවර වත්කම් ලේඛනය
 apps/erpnext/erpnext/utilities/user_progress.py,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,Select BOM and Qty for Production,නිෂ්පාදන සඳහා ද ෙව් හා යවන ලද තෝරන්න
@@ -3426,7 +3439,6 @@
 apps/erpnext/erpnext/templates/emails/reorder_item.html,Following Material Requests have been raised automatically based on Item's re-order level,පහත සඳහන් ද්රව්ය ඉල්ලීම් අයිතමය යලි සඳහා මට්ටම මත පදනම්ව ස්වයංක්රීයව ඉහළ නංවා තිබෙනවා
 apps/erpnext/erpnext/controllers/accounts_controller.py,Account {0} is invalid. Account Currency must be {1},ගිණුම {0} වලංගු නැත. ගිණුම ව්යවහාර මුදල් විය යුතුය {1}
 apps/erpnext/erpnext/hr/doctype/salary_structure_assignment/salary_structure_assignment.py,From Date {0} cannot be after employee's relieving Date {1},දිනයෙන් {0} සේවකයාගේ දිනයෙන් පසුව {1}
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py,Debit Note {0} has been created automatically,හර සටහන {0} ස්වයංක්‍රීයව නිර්මාණය වී ඇත
 apps/erpnext/erpnext/accounts/doctype/payment_order/payment_order.js,Create Payment Entries,ගෙවීම් සටහන් සාදන්න
 DocType: Supplier,Is Internal Supplier,අභ්යන්තර සැපයුම්කරු වේ
 DocType: Employee,Create User Permission,පරිශීලක අවසරය සාදන්න
@@ -3983,7 +3995,6 @@
 DocType: Project User,Project Status,ව්යාපෘති තත්ත්වය
 DocType: UOM,Check this to disallow fractions. (for Nos),භාග බලය පැවරෙන මෙම පරීක්ෂා කරන්න. (අංක සඳහා)
 DocType: Student Admission Program,Naming Series (for Student Applicant),(ශිෂ්ය අයදුම්කරු සඳහා) ශ්රේණි අනුප්රාප්තිකයා නම් කිරීම
-apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.py,UOM Conversion factor ({0} -&gt; {1}) not found for item: {2},අයිතමය සඳහා UOM පරිවර්තන සාධකය ({0} -&gt; {1}) හමු නොවීය: {2}
 apps/erpnext/erpnext/hr/doctype/retention_bonus/retention_bonus.py,Bonus Payment Date cannot be a past date,Bonus Payment Date අතීත දිනය නොවේ
 DocType: Travel Request,Copy of Invitation/Announcement,ආරාධනා / නිවේදනය පිටපත්
 DocType: Practitioner Service Unit Schedule,Practitioner Service Unit Schedule,වෘත්තිකයින්ගේ සේවා කාලසටහන
@@ -4207,7 +4218,6 @@
 DocType: Journal Entry,Accounting Entries,මුල්ය අයැදුම්පත්
 DocType: Job Card Time Log,Job Card Time Log,රැකියා කාඩ් කාල සටහන්
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,"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; ක්ෂේත්රයට වඩා එය ලබා දේ."
-apps/erpnext/erpnext/education/doctype/instructor/instructor.py,Please setup Instructor Naming System in Education &gt; Education Settings,කරුණාකර අධ්‍යාපනය&gt; අධ්‍යාපන සැකසුම් තුළ උපදේශක නම් කිරීමේ පද්ධතිය සකසන්න
 DocType: Journal Entry,Paid Loan,ගෙවුම් ණය
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py,Duplicate Entry. Please check Authorization Rule {0},පිවිසුම් අනුපිටපත්. බලය පැවරීමේ පාලනය {0} කරුණාකර පරීක්ෂා කරන්න
 DocType: Journal Entry Account,Reference Due Date,යොමු නියමිත දිනය
@@ -4224,7 +4234,6 @@
 apps/erpnext/erpnext/templates/pages/projects.html,No time sheets,කිසිදු කාල සටහන්
 DocType: GoCardless Mandate,GoCardless Customer,GoCardless පාරිභෝගිකයා
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py,Leave Type {0} cannot be carry-forwarded,"වර්ගය අවසරය, {0} ගෙන-ඉදිරිපත් කළ නොහැකි"
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Item Code &gt; Item Group &gt; Brand,අයිතම කේතය&gt; අයිතම සමූහය&gt; වෙළඳ නාමය
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py,Maintenance Schedule is not generated for all the items. Please click on 'Generate Schedule',නඩත්තු උපෙල්ඛනෙය් සියලු භාණ්ඩ සඳහා ජනනය කර නැත. &#39;උත්පාදනය උපෙල්ඛනෙය්&#39; මත ක්ලික් කරන්න
 ,To Produce,නිර්මාණය කිරීම සඳහා
 DocType: Leave Encashment,Payroll,වැටුප්
@@ -4337,7 +4346,6 @@
 DocType: Stock Ledger Entry,Actual Qty After Transaction,ගනුදෙනු කිරීමෙන් පසු සැබෑ යවන ලද
 ,Pending SO Items For Purchase Request,විභාග SO අයිතම මිලදී ගැනීම ඉල්ලීම් සඳහා
 apps/erpnext/erpnext/education/doctype/student_admission/student_admission.py,Student Admissions,ශිෂ්ය ප්රවේශ
-apps/erpnext/erpnext/accounts/party.py,{0} {1} is disabled,{0} {1} අක්රීය
 DocType: Supplier,Billing Currency,බිල්පත් ව්යවහාර මුදල්
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py,Extra Large,මහා පරිමාණ
 DocType: Loan,Loan Application,ණය අයදුම්පත
@@ -4414,7 +4422,6 @@
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py,Only Leave Applications with status 'Approved' and 'Rejected' can be submitted,&#39;අනුමත&#39; සහ &#39;ප්රතික්ෂේප&#39; ඉදිරිපත් කළ හැකි එකම තත්ත්වය සහිත යෙදුම් තබන්න
 apps/erpnext/erpnext/accounts/doctype/accounting_dimension/accounting_dimension.py,Creating Dimensions...,මානයන් නිර්මාණය කිරීම ...
 apps/erpnext/erpnext/education/doctype/student_group_creation_tool/student_group_creation_tool.py,Student Group Name is mandatory in row {0},ශිෂ්ය සමූහය නම පේළිය {0} අනිවාර්ය වේ
-DocType: Customer Credit Limit,Bypass credit limit_check,ණය සීමාව_ පරීක්ෂා කරන්න
 DocType: Homepage,Products to be shown on website homepage,නිෂ්පාදන වෙබ් අඩවිය මුල්පිටුව පෙන්වා කිරීමට
 DocType: HR Settings,Password Policy,මුරපද ප්‍රතිපත්තිය
 apps/erpnext/erpnext/setup/doctype/customer_group/customer_group.js,This is a root customer group and cannot be edited.,"මෙය මූල පාරිභෝගික පිරිසක් වන අතර, සංස්කරණය කළ නොහැක."
@@ -4998,6 +5005,7 @@
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py,No {0} found for Inter Company Transactions.,අන්තර් සමාගම් ගනුදෙනු සඳහා {0} සොයාගත නොහැකි විය.
 DocType: Travel Itinerary,Rented Car,කුලී කාර්
 apps/erpnext/erpnext/public/js/hub/components/profile_dialog.js,About your Company,ඔබේ සමාගම ගැන
+apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.js,Show Stock Ageing Data,කොටස් වයස්ගත දත්ත පෙන්වන්න
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py,Credit To account must be a Balance Sheet account,ගිණුමක් සඳහා ක්රෙඩිට් ශේෂ පත්රය ගිණුමක් විය යුතුය
 DocType: Donor,Donor,ඩොනර්
 DocType: Global Defaults,Disable In Words,වචන දී අක්රීය
@@ -5011,8 +5019,10 @@
 DocType: Patient,Patient ID,රෝගියාගේ ID
 DocType: Practitioner Schedule,Schedule Name,උපලේඛනයේ නම
 DocType: Currency Exchange,For Buying,මිලදී ගැනීම සඳහා
+apps/erpnext/erpnext/setup/default_energy_point_rules.py,On Purchase Order Submission,මිලදී ගැනීමේ ඇණවුම් ඉදිරිපත් කිරීමේදී
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js,Add All Suppliers,සියලු සැපයුම්කරුවන් එකතු කරන්න
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py,Row #{0}: Allocated Amount cannot be greater than outstanding amount.,පේළියේ # {0}: වෙන් කළ මුදල ගෙවීමට ඇති මුදල වඩා වැඩි විය නොහැක.
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Customer &gt; Customer Group &gt; Territory,පාරිභෝගික&gt; පාරිභෝගික කණ්ඩායම&gt; ප්‍රදේශය
 DocType: Tally Migration,Parties,පාර්ශවයන්
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js,Browse BOM,ගවේශක ද්රව්ය ලේඛණය
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py,Secured Loans,ආරක්ෂිත ණය
@@ -5043,6 +5053,7 @@
 apps/erpnext/erpnext/stock/doctype/item_alternative/item_alternative.py,Not allow to set alternative item for the item {0},අයිතමය සඳහා විකල්ප අයිතමයක් තැබීමට ඉඩ නොදේ. {0}
 apps/erpnext/erpnext/hr/doctype/leave_block_list/leave_block_list.py,Date is repeated,දිනය නැවත නැවත
 apps/erpnext/erpnext/accounts/print_format/payment_receipt_voucher/payment_receipt_voucher.html,Authorized Signatory,බලයලත් අත්සන්
+apps/erpnext/erpnext/education/doctype/instructor/instructor.py,Please setup Instructor Naming System in Education &gt; Education Settings,කරුණාකර අධ්‍යාපනය&gt; අධ්‍යාපන සැකසුම් තුළ උපදේශක නම් කිරීමේ පද්ධතිය සකසන්න
 apps/erpnext/erpnext/regional/doctype/gstr_3b_report/gstr_3b_report.html,Net ITC Available(A) - (B),ශුද්ධ ITC ලබා ගත හැකිය (A) - (B)
 apps/erpnext/erpnext/education/doctype/fee_schedule/fee_schedule.js,Create Fees,ගාස්තු නිර්මාණය කරන්න
 DocType: Project,Total Purchase Cost (via Purchase Invoice),(මිලදී ගැනීමේ ඉන්වොයිසිය හරහා) මුළු මිලදී ගැනීම පිරිවැය
@@ -5062,6 +5073,7 @@
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.js,Message Sent,පණිවිඩය යැව්වා
 apps/erpnext/erpnext/accounts/doctype/account/account.py,Account with child nodes cannot be set as ledger,ළමා ශීර්ෂයන් සමඟ ගිණුම් ලෙජරය ලෙස සැකසීම කළ නොහැකි
 DocType: C-Form,II,දෙවන
+apps/erpnext/erpnext/assets/report/fixed_asset_register/fixed_asset_register.py,Vendor Name,විකුණුම්කරුගේ නම
 DocType: Quiz Result,Wrong,වැරදි
 DocType: Sales Invoice,Rate at which Price list currency is converted to customer's base currency,මිල ලැයිස්තුව මුදල් පාරිභෝගික පදනම මුදල් බවට පරිවර්තනය වන අවස්ථාවේ අනුපාතය
 DocType: Purchase Invoice Item,Net Amount (Company Currency),ශුද්ධ මුදල (සමාගම ව්යවහාර මුදල්)
@@ -5302,6 +5314,7 @@
 DocType: Stock Settings,Auto Material Request,වාහන ද්රව්ය ඉල්ලීම්
 DocType: Woocommerce Settings,API consumer secret,API පාරිභෝගික රහස
 DocType: Delivery Note Item,Available Batch Qty at From Warehouse,ලබා ගත හැකි කණ්ඩායම යවන ලද පොත් ගබඩාව සිට දී
+,Received Qty Amount,Qty මුදල ලැබුණි
 DocType: Salary Slip,Gross Pay - Total Deduction - Loan Repayment,දළ වැටුප් - මුළු අඩු - ණය ආපසු ගෙවීමේ
 DocType: Bank Account,Last Integration Date,අවසන් ඒකාබද්ධ කිරීමේ දිනය
 DocType: Expense Claim,Expense Taxes and Charges,වියදම් බදු සහ ගාස්තු
@@ -5762,6 +5775,8 @@
 DocType: Drug Prescription,Hour,පැය
 DocType: Restaurant Order Entry,Last Sales Invoice,අවසාන විකුණුම් ඉන්වොයිසිය
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py,Please select Qty against item {0},අයිතමයට එරෙහිව Qty තෝරන්න {0}
+apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py,Latest Age,නවතම වයස
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js,Transfer Material to Supplier,ද්‍රව්‍ය සැපයුම්කරු වෙත මාරු කරන්න
 apps/erpnext/erpnext/hr/report/loan_repayment/loan_repayment.py,EMI,ඊඑම්අයි
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py,New Serial No cannot have Warehouse. Warehouse must be set by Stock Entry or Purchase Receipt,නව අනු අංකය ගබඩා තිබිය නොහැකිය. පොත් ගබඩාව කොටස් සටහන් හෝ මිළදී රිසිට්පත විසින් තබා ගත යුතු
 DocType: Lead,Lead Type,ඊයම් වර්ගය
@@ -5783,7 +5798,6 @@
 apps/erpnext/erpnext/hr/doctype/employee_benefit_application/employee_benefit_application.py,"An amount of {0} already claimed for the component {1},\
 						 set the amount equal or greater than {2}","Component {1}, \ දැනටමත් හිමිකම් ලබා ඇති {0} ගණනක් {2}"
 DocType: Shipping Rule,Shipping Rule Conditions,නැව් පාලනය කොන්දේසි
-DocType: Purchase Invoice,Export Type,අපනයන වර්ගය
 DocType: Salary Slip Loan,Salary Slip Loan,වැටුප් ස්ලිප් ණය
 DocType: BOM Update Tool,The new BOM after replacement,වෙනුවට පසු නව ද්රව්ය ලේඛණය
 ,Point of Sale,", විකුණුම් පේදුරු"
@@ -5903,7 +5917,6 @@
 DocType: Purchase Order Item,Blanket Order Rate,නිමි ඇඳුම් මිල
 ,Customer Ledger Summary,පාරිභෝගික ලෙජර් සාරාංශය
 apps/erpnext/erpnext/hooks.py,Certification,සහතික කිරීම
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js,Are you sure you want to make debit note?,ඔබට හර සටහනක් තැබීමට අවශ්‍ය බව ඔබට විශ්වාසද?
 DocType: Bank Guarantee,Clauses and Conditions,වගන්ති සහ කොන්දේසි
 DocType: Serial No,Creation Document Type,නිර්මාණය ලේඛන වර්ගය
 DocType: Amazon MWS Settings,ES,ES
@@ -5941,8 +5954,6 @@
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py,Financial Services,මූල්යමය සේවා
 DocType: Student Sibling,Student ID,ශිෂ්ය හැඳුනුම්පතක්
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.js,For Quantity must be greater than zero,ප්රමාණය සඳහා ශුන්යයට වඩා වැඩි විය යුතුය
-apps/erpnext/erpnext/hr/doctype/employee_transfer/employee_transfer.py,"Please delete the Employee <a href=""#Form/Employee/{0}"">{0}</a>\
-					to cancel this document","මෙම ලේඛනය අවලංගු කිරීමට කරුණාකර සේවකයා <a href=""#Form/Employee/{0}"">{0}</a> delete මකන්න"
 apps/erpnext/erpnext/config/projects.py,Types of activities for Time Logs,වේලාව ලඝු-සටහන් සඳහා ක්රියාකාරකම් වර්ග
 DocType: Opening Invoice Creation Tool,Sales,විකුණුම්
 DocType: Stock Entry Detail,Basic Amount,මූලික මුදල
@@ -6021,6 +6032,7 @@
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py,Print and Stationery,මුද්රිත හා ලිපි ද්රව්ය
 DocType: Stock Settings,Show Barcode Field,Barcode ක්ෂේත්ර පෙන්වන්න
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js,Send Supplier Emails,සැපයුම්කරු විද්යුත් තැපැල් පණිවුඩ යවන්න
+DocType: Asset Movement,ACC-ASM-.YYYY.-,ACC-ASM-.YYYY.-
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py,"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,ස්වයංක්රීයව නිර්මාණය කර ඇත
 apps/erpnext/erpnext/hr/doctype/employee_onboarding/employee_onboarding.py,Submit this to create the Employee record,සේවක වාර්තාව සෑදීමට මෙය ඉදිරිපත් කරන්න
@@ -6100,7 +6112,6 @@
 DocType: Sales Team,Contact No.,අප අමතන්න අංක
 apps/erpnext/erpnext/templates/includes/cart/cart_address.html,Billing Address is same as Shipping Address,බිල්පත් ලිපිනය නැව්ගත කිරීමේ ලිපිනයට සමාන වේ
 DocType: Bank Reconciliation,Payment Entries,ගෙවීම් සඳහා අයැදුම්පත්
-apps/erpnext/erpnext/erpnext_integrations/doctype/shopify_settings/shopify_settings.py,Access token or Shopify URL missing,ටෝකන ප්රවේශය හෝ සාප්පු කිරීම URL ලිපිනය අස්ථානගත වී ඇත
 DocType: Location,Latitude,Latitude
 DocType: Work Order,Scrap Warehouse,පරණ පොත් ගබඩාව
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py,"Warehouse required at Row No {0}, please set default warehouse for the item {1} for the company {2}","අංක No {0} හි අවශ්ය ගබඩාව, සමාගම {2} සඳහා {1} අයිතමය සඳහා පෙරනිමි ගබඩාව සකස් කරන්න."
@@ -6144,7 +6155,6 @@
 DocType: Job Offer Term,Value / Description,අගය / විස්තරය
 apps/erpnext/erpnext/controllers/accounts_controller.py,"Row #{0}: Asset {1} cannot be submitted, it is already {2}","ෙරෝ # {0}: වත්කම් {1} ඉදිරිපත් කළ නොහැකි, එය දැනටමත් {2}"
 DocType: Tax Rule,Billing Country,බිල්පත් රට
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js,Are you sure you want to make credit note?,ඔබට ණය සටහනක් තැබීමට අවශ්‍ය බව ඔබට විශ්වාසද?
 DocType: Purchase Order Item,Expected Delivery Date,අපේක්ෂිත භාර දීම දිනය
 DocType: Restaurant Order Entry,Restaurant Order Entry,ආපන ශාලා ප්රවේශය
 apps/erpnext/erpnext/accounts/general_ledger.py,Debit and Credit not equal for {0} #{1}. Difference is {2}.,හර සහ බැර {0} # {1} සඳහා සමාන නැත. වෙනස {2} වේ.
@@ -6266,6 +6276,7 @@
 DocType: Purchase Invoice,Taxes and Charges Added,බදු හා බදු ගාස්තු එකතු
 apps/erpnext/erpnext/assets/doctype/asset/asset.py,Depreciation Row {0}: Next Depreciation Date cannot be before Available-for-use Date,ක්ෂය කිරීම් පේළි {0}: ඉදිරි ක්ෂය කිරීම් දිනය ලබා ගත හැකි දිනය සඳහා භාවිතා කල නොහැක
 ,Sales Funnel,විකුණුම් පොම්ප
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Item Code &gt; Item Group &gt; Brand,අයිතම කේතය&gt; අයිතම සමූහය&gt; වෙළඳ නාමය
 apps/erpnext/erpnext/setup/doctype/company/company.py,Abbreviation is mandatory,කෙටි යෙදුම් අනිවාර්ය වේ
 DocType: Project,Task Progress,කාර්ය සාධක ප්රගති
 apps/erpnext/erpnext/templates/includes/navbar/navbar_items.html,Cart,කරත්ත
@@ -6509,6 +6520,7 @@
 DocType: Employee Grade,Employee Grade,සේවක ශ්රේණිය
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py,Piecework,Piecework
 DocType: GSTR 3B Report,June,ජූනි
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Supplier &gt; Supplier Type,සැපයුම්කරු&gt; සැපයුම්කරු වර්ගය
 DocType: Share Balance,From No,අංක සිට
 DocType: Shift Type,Early Exit Grace Period,මුල් පිටවීමේ වර්‍ග කාලය
 DocType: Task,Actual Time (in Hours),සැබෑ කාලය (පැය දී)
@@ -6791,6 +6803,7 @@
 DocType: Warehouse,Warehouse Name,පොත් ගබඩාව නම
 DocType: Naming Series,Select Transaction,ගනුදෙනු තෝරන්න
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py,Please enter Approving Role or Approving User,කාර්යභාරය අනුමත හෝ පරිශීලක අනුමත ඇතුලත් කරන්න
+apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.py,UOM Conversion factor ({0} -&gt; {1}) not found for item: {2},අයිතමය සඳහා UOM පරිවර්තන සාධකය ({0} -&gt; {1}) හමු නොවීය: {2}
 DocType: Journal Entry,Write Off Entry,පිවිසුම් Off ලියන්න
 DocType: BOM,Rate Of Materials Based On,ද්රව්ය මත පදනම් මත අනුපාතය
 DocType: Education Settings,"If enabled, field Academic Term will be Mandatory in Program Enrollment Tool.","සක්රීය නම්, වැඩසටහන් බඳවා ගැනීමේ මෙවලමෙහි ඇති ක්ෂේත්ර අධ්යයන වාරය අනිවාර්ය වේ."
@@ -6980,6 +6993,7 @@
 DocType: Quality Inspection Reading,Quality Inspection Reading,තත්ත්ව පරීක්ෂක වර කියවීම
 apps/erpnext/erpnext/stock/doctype/stock_settings/stock_settings.py,`Freeze Stocks Older Than` should be smaller than %d days.,&#39;&#39; කණ්ඩරාව කොටස් පැරණි Than` දින% d ට වඩා කුඩා විය යුතුය.
 DocType: Tax Rule,Purchase Tax Template,මිලදී ගැනීම බදු සැකිල්ල
+apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py,Earliest Age,මුල්ම වයස
 apps/erpnext/erpnext/utilities/user_progress.py,Set a sales goal you'd like to achieve for your company.,ඔබේ සමාගම සඳහා ඔබ අපේක්ෂා කරන විකුණුම් ඉලක්කයක් සකසන්න.
 DocType: Quality Goal,Revision,සංශෝධනය
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js,Healthcare Services,සෞඛ්ය සේවා
@@ -7022,6 +7036,7 @@
 apps/erpnext/erpnext/healthcare/doctype/patient_encounter/patient_encounter.js,Schedule Discharge,උපලේඛන
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py,Cheques and Deposits incorrectly cleared,වැරදි ලෙස එළි පෙහෙළි චෙක්පත් සහ තැන්පතු
 DocType: Homepage Section Card,Homepage Section Card,මුල් පිටුව අංශ කාඩ්පත
+,Amount To Be Billed,බිල් කළ යුතු මුදල
 apps/erpnext/erpnext/accounts/doctype/account/account.py,Account {0}: You can not assign itself as parent account,ගිණුම {0}: ඔබ මව් ගිණුම ලෙස ම යෙදිය නොහැක
 DocType: Purchase Invoice Item,Price List Rate,මිල ලැයිස්තුව අනුපාතිකය
 apps/erpnext/erpnext/utilities/activation.py,Create customer quotes,පාරිභෝගික මිල කැඳවීම් නිර්මාණය
@@ -7074,6 +7089,7 @@
 DocType: Supplier Scorecard Criteria,Supplier Scorecard Criteria,සැපයුම්කරුවන් ලකුණු ලකුණු නිර්ණායක
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py,Please select Start Date and End Date for Item {0},කරුණාකර විෂය {0} සඳහා ආරම්භය දිනය හා අවසාන දිනය තෝරා
 DocType: Maintenance Schedule,MAT-MSH-.YYYY.-,MAT-MSH-.YYYY-
+,Amount to Receive,ලැබිය යුතු මුදල
 apps/erpnext/erpnext/education/doctype/student_group_creation_tool/student_group_creation_tool.py,Course is mandatory in row {0},පාඨමාලා පේළිය {0} අනිවාර්ය වේ
 apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py,From date can not be greater than than To date,දිනය සිට අදට වඩා වැඩි විය නොහැක
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py,To date cannot be before from date,මේ දක්වා දින සිට පෙර විය නොහැකි
@@ -7526,6 +7542,7 @@
 DocType: Delivery Note,Print Without Amount,මුදල තොරව මුද්රණය
 apps/erpnext/erpnext/accounts/report/asset_depreciation_ledger/asset_depreciation_ledger.py,Depreciation Date,ක්ෂය දිනය
 ,Work Orders in Progress,ප්රගතියේ වැඩ කිරීම
+DocType: Customer Credit Limit,Bypass Credit Limit Check,ණය සීමාව පරීක්ෂා කිරීම
 DocType: Issue,Support Team,සහාය කණ්ඩායම
 apps/erpnext/erpnext/stock/report/batch_item_expiry_status/batch_item_expiry_status.py,Expiry (In Days),කල් ඉකුත් වීමේ (දින දී)
 DocType: Appraisal,Total Score (Out of 5),මුළු ලකුණු (5 න්)
@@ -7709,6 +7726,7 @@
 DocType: Sales Invoice,Customer GSTIN,පාරිභෝගික GSTIN
 DocType: Crop Cycle,List of diseases detected on the field. When selected it'll automatically add a list of tasks to deal with the disease ,ක්ෂේත්රයේ සොයාගත් රෝග ලැයිස්තුව. තෝරාගත් විට එය ස්වයංක්රීයව රෝගය සමඟ කටයුතු කිරීමට කාර්ය ලැයිස්තුවක් එක් කරයි
 apps/erpnext/erpnext/manufacturing/page/bom_comparison_tool/bom_comparison_tool.js,BOM 1,BOM 1
+apps/erpnext/erpnext/assets/report/fixed_asset_register/fixed_asset_register.py,Asset Id,වත්කම් හැඳුනුම්පත
 apps/erpnext/erpnext/healthcare/doctype/healthcare_service_unit/healthcare_service_unit.js,This is a root healthcare service unit and cannot be edited.,මෙය මූල සෞඛ්ය සේවා ඒකකය සංස්කරණය කළ නොහැක.
 DocType: Asset Repair,Repair Status,අළුත්වැඩියා තත්ත්වය
 apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.js,"Requested Qty: Quantity requested for purchase, but not ordered.","ඉල්ලූ Qty: මිලදී ගැනීම සඳහා ඉල්ලූ ප්‍රමාණය, නමුත් ඇණවුම් කර නැත."
diff --git a/erpnext/translations/sk.csv b/erpnext/translations/sk.csv
index 760c18b..ca28762 100644
--- a/erpnext/translations/sk.csv
+++ b/erpnext/translations/sk.csv
@@ -288,7 +288,6 @@
 DocType: Loan,Repay Over Number of Periods,Splatiť Over počet období
 apps/erpnext/erpnext/manufacturing/report/bom_stock_report/bom_stock_report.py,Quantity to Produce can not be less than Zero,Množstvo na výrobu nesmie byť menšie ako nula
 DocType: Stock Entry,Additional Costs,Dodatočné náklady
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Customer &gt; Customer Group &gt; Territory,Zákazník&gt; Skupina zákazníkov&gt; Územie
 apps/erpnext/erpnext/accounts/doctype/account/account.py,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
@@ -586,6 +585,7 @@
 DocType: Healthcare Settings,Create documents for sample collection,Vytvorte dokumenty na odber vzoriek
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py,Payment against {0} {1} cannot be greater than Outstanding Amount {2},Platba proti {0} {1} nemôže byť väčšia ako dlžnej čiastky {2}
 apps/erpnext/erpnext/patches/v11_0/add_healthcare_service_unit_tree_root.py,All Healthcare Service Units,Všetky jednotky zdravotnej starostlivosti
+apps/erpnext/erpnext/setup/default_energy_point_rules.py,On Converting Opportunity,O konverzii príležitosti
 DocType: Bank Account,Address HTML,Adresa HTML
 DocType: Lead,Mobile No.,Mobile No.
 apps/erpnext/erpnext/selling/doctype/pos_closing_voucher/closing_voucher_details.html,Mode of Payments,Spôsob platieb
@@ -650,7 +650,6 @@
 DocType: Accounting Dimension,Dimension Name,Názov dimenzie
 apps/erpnext/erpnext/healthcare/setup.py,Resistant,odolný
 apps/erpnext/erpnext/hotels/doctype/hotel_room_reservation/hotel_room_reservation.py,Please set Hotel Room Rate on {},"Prosím, nastavte sadzbu izby hotela na {}"
-apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py,Please setup numbering series for Attendance via Setup &gt; Numbering Series,Nastavte číslovacie série pre Účasť cez Nastavenie&gt; Číslovacie série
 DocType: Journal Entry,Multi Currency,Viac mien
 DocType: Bank Statement Transaction Invoice Item,Invoice Type,Typ faktúry
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py,Valid from date must be less than valid upto date,Platné od dátumu musí byť kratšie ako platné do dátumu
@@ -768,6 +767,7 @@
 apps/erpnext/erpnext/accounts/page/pos/pos.js,Create a new Customer,Vytvoriť nového zákazníka
 apps/erpnext/erpnext/non_profit/report/expiring_memberships/expiring_memberships.py,Expiring On,Vypršanie zapnuté
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,"If multiple Pricing Rules continue to prevail, users are asked to set Priority manually to resolve conflict.","Je-li více pravidla pro tvorbu cen i nadále přednost, jsou uživatelé vyzváni k nastavení priority pro vyřešení konfliktu."
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js,Purchase Return,Nákup Return
 apps/erpnext/erpnext/utilities/activation.py,Create Purchase Orders,vytvorenie objednávok
 ,Purchase Register,Nákup Register
 apps/erpnext/erpnext/healthcare/doctype/patient/patient.py,Patient not found,Pacient sa nenašiel
@@ -783,7 +783,6 @@
 DocType: Location,Area UOM,Oblasť UOM
 apps/erpnext/erpnext/manufacturing/doctype/workstation/workstation.py,Workstation is closed on the following dates as per Holiday List: {0},Workstation je uzavřena v následujících dnech podle Prázdninový Seznam: {0}
 apps/erpnext/erpnext/selling/page/sales_funnel/sales_funnel.py,Opportunities,Príležitosti
-apps/erpnext/erpnext/www/all-products/index.html,Clear filters,Vymazať filtre
 DocType: Lab Test Template,Single,Slobodný/á
 DocType: Compensatory Leave Request,Work From Date,Práca od dátumu
 DocType: Salary Slip,Total Loan Repayment,celkové splátky
@@ -827,6 +826,7 @@
 apps/erpnext/erpnext/education/doctype/program_enrollment_tool/program_enrollment_tool.py,Mandatory field - Academic Year,Povinná oblasť - akademický rok
 apps/erpnext/erpnext/education/doctype/program_enrollment_tool/program_enrollment_tool.py,Mandatory field - Academic Year,Povinná oblasť - akademický rok
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py,{0} {1} is not associated with {2} {3},{0} {1} nie je priradená k {2} {3}
+DocType: Opportunity,Converted By,Prevedené
 apps/erpnext/erpnext/public/js/hub/components/ReviewArea.vue,You need to login as a Marketplace User before you can add any reviews.,Pred pridaním akýchkoľvek recenzií sa musíte prihlásiť ako používateľ Marketplace.
 apps/erpnext/erpnext/manufacturing/doctype/job_card/job_card.py,Row {0} : Operation is required against the raw material item {1},Riadok {0}: Vyžaduje sa operácia proti položke surovín {1}
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py,Please set default payable account for the company {0},Nastavte predvolený splatný účet pre spoločnosť {0}
@@ -853,6 +853,8 @@
 DocType: Sales Invoice,Total Qty,Celkem Množství
 apps/erpnext/erpnext/education/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py,Guardian2 Email ID,ID e-mailu Guardian2
 apps/erpnext/erpnext/education/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py,Guardian2 Email ID,ID e-mailu Guardian2
+apps/erpnext/erpnext/hr/doctype/employee_transfer/employee_transfer.py,"Please delete the Employee <a href=""#Form/Employee/{0}"">{0}</a>\
+					to cancel this document","Ak chcete tento dokument zrušiť, odstráňte zamestnanca <a href=""#Form/Employee/{0}"">{0}</a> \"
 DocType: Item,Show in Website (Variant),Zobraziť na webstránke (Variant)
 DocType: Employee,Health Concerns,Zdravotní Obavy
 DocType: Payroll Entry,Select Payroll Period,Vyberte mzdové
@@ -913,7 +915,6 @@
 DocType: Codification Table,Codification Table,Kodifikačná tabuľka
 DocType: Timesheet Detail,Hrs,hod
 apps/erpnext/erpnext/manufacturing/page/bom_comparison_tool/bom_comparison_tool.js,Changes in {0},Zmeny v {0}
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js,Please select Company,"Prosím, vyberte spoločnosť"
 DocType: Employee Skill,Employee Skill,Zručnosť zamestnancov
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.js,Difference Account,Rozdíl účtu
 DocType: Pricing Rule,Discount on Other Item,Zľava na inú položku
@@ -982,6 +983,7 @@
 DocType: BOM,Operating Cost,Provozní náklady
 DocType: Crop,Produced Items,Vyrobené položky
 DocType: Bank Statement Transaction Entry,Match Transaction to Invoices,Prebieha transakcia so faktúrami
+apps/erpnext/erpnext/erpnext_integrations/exotel_integration.py,Error in Exotel incoming call,Chyba pri prichádzajúcom hovore z exotelu
 DocType: Sales Order Item,Gross Profit,Hrubý Zisk
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js,Unblock Invoice,Odblokovať faktúru
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py,Increment cannot be 0,Prírastok nemôže byť 0
@@ -1196,6 +1198,7 @@
 DocType: Activity Cost,Activity Type,Druh činnosti
 DocType: Request for Quotation,For individual supplier,Pre jednotlivé dodávateľa
 DocType: BOM Operation,Base Hour Rate(Company Currency),Základňa hodinová sadzba (Company meny)
+,Qty To Be Billed,Množstvo na vyúčtovanie
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py,Delivered Amount,Dodaná Čiastka
 apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.js,Reserved Qty for Production: Raw materials quantity to make manufacturing items.,Vyhradené množstvo pre výrobu: Množstvo surovín na výrobu výrobných položiek.
 DocType: Loyalty Point Entry Redemption,Redemption Date,Dátum vykúpenia
@@ -1316,7 +1319,7 @@
 DocType: Sales Invoice,Commission Rate (%),Výška provízie (%)
 apps/erpnext/erpnext/education/doctype/student_group/student_group.py,Please select Program,Vyberte program
 DocType: Project,Estimated Cost,odhadované náklady
-DocType: Request for Quotation,Link to material requests,Odkaz na materiálnych požiadaviek
+DocType: Supplier Quotation,Link to material requests,Odkaz na materiálnych požiadaviek
 apps/erpnext/erpnext/public/js/hub/pages/Publish.vue,Publish,publikovať
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py,Aerospace,Aerospace
 ,Fichier des Ecritures Comptables [FEC],Fichier des Ecritures Comptables [FEC]
@@ -1329,6 +1332,7 @@
 apps/erpnext/erpnext/utilities/transaction_base.py,Invalid Posting Time,Neplatný čas odoslania
 DocType: Salary Component,Condition and Formula,Podmienka a vzorec
 DocType: Lead,Campaign Name,Názov kampane
+apps/erpnext/erpnext/setup/default_energy_point_rules.py,On Task Completion,Pri dokončení úlohy
 apps/erpnext/erpnext/hr/doctype/compensatory_leave_request/compensatory_leave_request.py,There is no leave period in between {0} and {1},Neexistuje žiadne obdobie dovolenky medzi {0} a {1}
 DocType: Fee Validity,Healthcare Practitioner,Zdravotnícky lekár
 DocType: Hotel Room,Capacity,kapacita
@@ -1693,7 +1697,6 @@
 DocType: Quality Feedback Template,Quality Feedback Template,Šablóna spätnej väzby kvality
 apps/erpnext/erpnext/config/education.py,LMS Activity,Aktivita LMS
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py,Internet Publishing,Internet Publishing
-DocType: Prescription Duration,Number,číslo
 apps/erpnext/erpnext/accounts/doctype/opening_invoice_creation_tool/opening_invoice_creation_tool.js,Creating {0} Invoice,Vytvorenie faktúry {0}
 DocType: Medical Code,Medical Code Standard,Štandardný zdravotnícky kód
 DocType: Soil Texture,Clay Composition (%),Zloženie hliny (%)
@@ -1768,6 +1771,7 @@
 DocType: Support Settings,Get Started Sections,Začnite sekcie
 DocType: Lead,CRM-LEAD-.YYYY.-,CRM-LEAD-.YYYY.-
 DocType: Invoice Discounting,Sanctioned,Sankcionované
+,Base Amount,Základná čiastka
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.js,Total Contribution Amount: {0},Celková suma príspevku: {0}
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py,Row #{0}: Please specify Serial No for Item {1},Row # {0}: Zadejte Pořadové číslo k bodu {1}
 DocType: Payroll Entry,Salary Slips Submitted,Príspevky na platy boli odoslané
@@ -1989,6 +1993,7 @@
 DocType: Accounting Dimension,Dimension Defaults,Predvolené rozmery
 apps/erpnext/erpnext/crm/report/prospects_engaged_but_not_converted/prospects_engaged_but_not_converted.js,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,Minimum Lead Age (Days),Minimálny vek vedenia (dni)
+apps/erpnext/erpnext/assets/report/fixed_asset_register/fixed_asset_register.py,Available For Use Date,Dostupné na použitie
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py,All BOMs,všetky kusovníky
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js,Create Inter Company Journal Entry,Založenie záznamu do firemného denníka
 DocType: Company,Parent Company,Materská spoločnosť
@@ -2053,6 +2058,7 @@
 ,IRS 1099,IRS 1099
 DocType: Salary Slip,Leave Without Pay,Nechat bez nároku na mzdu
 DocType: Payment Request,Outward,von
+apps/erpnext/erpnext/setup/default_energy_point_rules.py,On {0} Creation,Dňa {0} stvorenia
 apps/erpnext/erpnext/regional/doctype/gstr_3b_report/gstr_3b_report.html,State/UT Tax,Štátna / UT daň
 ,Trial Balance for Party,Trial váhy pre stranu
 ,Gross and Net Profit Report,Správa o hrubom a čistom zisku
@@ -2170,6 +2176,7 @@
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js,Make Stock Entry,Vykonajte zadanie zásob
 DocType: Hotel Room Reservation,Hotel Reservation User,Používateľ rezervácie hotelov
 apps/erpnext/erpnext/projects/doctype/project/project.js,Set Status,Nastaviť stav
+apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py,Please setup numbering series for Attendance via Setup &gt; Numbering Series,Nastavte číslovacie série pre Účasť cez Nastavenie&gt; Číslovacie série
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py,Please select prefix first,"Prosím, vyberte první prefix"
 DocType: Contract,Fulfilment Deadline,Termín splnenia
 apps/erpnext/erpnext/public/js/hub/pages/Home.vue,Near you,Vo vašom okolí
@@ -2185,6 +2192,7 @@
 DocType: Announcement,All Students,všetci študenti
 apps/erpnext/erpnext/assets/doctype/asset/asset.py,Item {0} must be a non-stock item,Item {0} musí byť non-skladová položka
 apps/erpnext/erpnext/stock/doctype/batch/batch.js,View Ledger,View Ledger
+DocType: Cost Center,Lft,LFT
 DocType: Grading Scale,Intervals,intervaly
 DocType: Bank Statement Transaction Entry,Reconciled Transactions,Zosúladené transakcie
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py,Earliest,Najstarší
@@ -2300,6 +2308,7 @@
 apps/erpnext/erpnext/hr/doctype/employee_benefit_application/employee_benefit_application.py,As per your assigned Salary Structure you cannot apply for benefits,Podľa vašej pridelenej štruktúry platov nemôžete požiadať o výhody
 apps/erpnext/erpnext/stock/doctype/item/item.py,Website Image should be a public file or website URL,Webové stránky Image by mala byť verejná súboru alebo webovej stránky URL
 DocType: Purchase Invoice Item,BOM,BOM
+apps/erpnext/erpnext/stock/doctype/item/item.py,Duplicate entry in Manufacturers table,Duplikát v tabuľke Výrobcovia
 apps/erpnext/erpnext/setup/doctype/item_group/item_group.js,This is a root item group and cannot be edited.,Jedná se o skupinu kořen položky a nelze upravovat.
 apps/erpnext/erpnext/accounts/doctype/account/account.js,Merge,Zlúčiť
 DocType: Journal Entry Account,Purchase Order,Nákupná objednávka
@@ -2446,7 +2455,6 @@
 DocType: Asset,Depreciation Schedules,odpisy Plány
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.js,Create Sales Invoice,Vytvoriť predajnú faktúru
 apps/erpnext/erpnext/regional/doctype/gstr_3b_report/gstr_3b_report.html,Ineligible ITC,Neoprávnené ITC
-apps/erpnext/erpnext/erpnext_integrations/doctype/shopify_settings/shopify_settings.py,"Support for public app is deprecated. Please setup private app, for more details refer user manual","Podpora pre verejnú aplikáciu je zastaraná. Prosím, nastavte súkromnú aplikáciu, ďalšie informácie nájdete v používateľskej príručke"
 DocType: Task,Dependent Tasks,Závislé úlohy
 apps/erpnext/erpnext/regional/report/gstr_1/gstr_1.py,Following accounts might be selected in GST Settings:,Nasledujúce účty môžu byť vybraté v nastaveniach GST:
 apps/erpnext/erpnext/manufacturing/report/bom_stock_report/bom_stock_report.js,Quantity to Produce,Množstvo na výrobu
@@ -2699,6 +2707,7 @@
 DocType: Water Analysis,Container,kontajner
 apps/erpnext/erpnext/regional/report/gstr_1/gstr_1.py,Please set valid GSTIN No. in Company Address,V adrese spoločnosti zadajte platné číslo GSTIN
 apps/erpnext/erpnext/education/utils.py,Student {0} - {1} appears Multiple times in row {2} & {3},Študent {0} - {1} objaví viackrát za sebou {2} {3}
+apps/erpnext/erpnext/selling/doctype/customer/customer.py,Following fields are mandatory to create address:,Na vytvorenie adresy sú povinné nasledujúce polia:
 DocType: Item Alternative,Two-way,obojsmerný
 DocType: Item,Manufacturers,výrobcovia
 apps/erpnext/erpnext/accounts/deferred_revenue.py,Error while processing deferred accounting for {0},Chyba pri spracovaní odloženého účtovania pre {0}
@@ -2774,9 +2783,9 @@
 DocType: Employee,HR-EMP-,HR-EMP
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py,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: Quality Meeting Minutes,Quality Meeting Minutes,Zápisnica zo zasadnutia o kvalite
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Supplier &gt; Supplier Type,Dodávateľ&gt; Typ dodávateľa
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py,Employee Referral,Odporúčanie zamestnancov
 DocType: Student Group,Set 0 for no limit,Nastavte 0 pre žiadny limit
+DocType: Cost Center,rgt,Rgt
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py,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."
 DocType: Customer,Primary Address and Contact Detail,Primárna adresa a podrobnosti kontaktu
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.js,Resend Payment Email,Znovu poslať e-mail Payment
@@ -2886,7 +2895,6 @@
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py,Against Supplier Invoice {0} dated {1},Proti faktuře dodavatele {0} ze dne {1}
 DocType: Customer,Default Price List,Predvolený cenník
 apps/erpnext/erpnext/assets/doctype/asset/asset.py,Asset Movement record {0} created,Záznam Asset Pohyb {0} vytvoril
-apps/erpnext/erpnext/utilities/page/leaderboard/leaderboard.js,No items found.,Nenašli sa žiadne položky.
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py,You cannot delete Fiscal Year {0}. Fiscal Year {0} is set as default in Global Settings,Nemožno odstrániť fiškálny rok {0}. Fiškálny rok {0} je nastavený ako predvolený v globálnom nastavení
 DocType: Share Transfer,Equity/Liability Account,Účet vlastného imania / zodpovednosti
 apps/erpnext/erpnext/setup/doctype/customer_group/customer_group.py,A customer with the same name already exists,Zákazník s rovnakým názvom už existuje
@@ -2902,6 +2910,7 @@
 apps/erpnext/erpnext/selling/doctype/customer/customer.py,Credit limit has been crossed for customer {0} ({1}/{2}),Úverový limit bol pre zákazníka prekročený {0} ({1} / {2})
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py,Customer required for 'Customerwise Discount',"Zákazník požadoval pro 'Customerwise sleva """
 apps/erpnext/erpnext/config/accounting.py,Update bank payment dates with journals.,"Aktualizujte bankovní platební termín, časopisů."
+,Billed Qty,Účtované množstvo
 apps/erpnext/erpnext/stock/doctype/item/item_dashboard.py,Pricing,Stanovenie ceny
 DocType: Employee,Attendance Device ID (Biometric/RF tag ID),ID dochádzkového zariadenia (biometrické / RF ID značky)
 DocType: Quotation,Term Details,Termín Podrobnosti
@@ -2925,6 +2934,7 @@
 DocType: Share Transfer,Asset Account,Asset Account
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js,New release date should be in the future,Nový dátum vydania by mal byť v budúcnosti
 DocType: Purchase Invoice,End date of current invoice's period,Datum ukončení doby aktuální faktury je
+apps/erpnext/erpnext/hr/doctype/employee/employee.py,Please setup Employee Naming System in Human Resource &gt; HR Settings,Nastavte systém pomenovávania zamestnancov v časti Ľudské zdroje&gt; Nastavenia ľudských zdrojov
 DocType: Lab Test,Technician Name,Názov technikov
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py,"Cannot ensure delivery by Serial No as \
 					Item {0} is added with and without Ensure Delivery by \
@@ -2932,6 +2942,7 @@
 DocType: Accounts Settings,Unlink Payment on Cancellation of Invoice,Odpojiť Platba o zrušení faktúry
 DocType: Bank Reconciliation,From Date,Od data
 apps/erpnext/erpnext/hr/doctype/vehicle_log/vehicle_log.py,Current Odometer reading entered should be greater than initial Vehicle Odometer {0},Aktuálny stav km vstúpil by mala byť väčšia ako počiatočný stav kilometrov {0}
+,Purchase Order Items To Be Received or Billed,"Položky objednávok, ktoré majú byť prijaté alebo fakturované"
 DocType: Restaurant Reservation,No Show,Žiadne zobrazenie
 apps/erpnext/erpnext/regional/india/utils.py,You must be a registered supplier to generate e-Way Bill,"Ak chcete generovať faktúru za e-Way, musíte byť registrovaným dodávateľom"
 DocType: Shipping Rule Country,Shipping Rule Country,Prepravné Pravidlo Krajina
@@ -2974,6 +2985,7 @@
 apps/erpnext/erpnext/templates/generators/item/item_add_to_cart.html,View in Cart,Zobraziť Košík
 DocType: Employee Checkin,Shift Actual Start,Shift Skutočný štart
 DocType: Tally Migration,Is Day Book Data Imported,Importujú sa údaje dennej knihy
+,Purchase Order Items To Be Received or Billed1,"Položky objednávok, ktoré majú byť prijaté alebo fakturované1"
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py,Marketing Expenses,Marketingové náklady
 apps/erpnext/erpnext/stock/doctype/pick_list/pick_list.py,{0} units of {1} is not available.,{0} jednotiek z {1} nie je k dispozícii.
 ,Item Shortage Report,Položka Nedostatek Report
@@ -3202,7 +3214,6 @@
 apps/erpnext/erpnext/public/js/call_popup/call_popup.js,View all issues from {0},Zobraziť všetky čísla od {0}
 DocType: Quality Inspection,MAT-QA-.YYYY.-,MAT-QA-.YYYY.-
 DocType: Quality Meeting Table,Quality Meeting Table,Tabuľka stretnutí kvality
-apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,Prosím pomenujte Series pre {0} cez Setup&gt; Settings&gt; Naming Series
 apps/erpnext/erpnext/templates/pages/help.html,Visit the forums,Navštívte fóra
 DocType: Student,Student Mobile Number,Študent Číslo mobilného telefónu
 DocType: Item,Has Variants,Má varianty
@@ -3347,6 +3358,7 @@
 ,Campaign Efficiency,Efektívnosť kampane
 ,Campaign Efficiency,Efektívnosť kampane
 DocType: Discussion,Discussion,diskusia
+apps/erpnext/erpnext/setup/default_energy_point_rules.py,On Sales Order Submission,O zadaní zákazky odberateľa
 DocType: Bank Transaction,Transaction ID,ID transakcie
 DocType: Payroll Entry,Deduct Tax For Unsubmitted Tax Exemption Proof,Odpočítajte daň z nezdaniteľnej daňovej výnimky
 DocType: Volunteer,Anytime,kedykoľvek
@@ -3354,7 +3366,6 @@
 DocType: Employee Tax Exemption Proof Submission,Employee Tax Exemption Proof Submission,Oslobodenie od dane z oslobodenia od dane zamestnancov
 DocType: Patient,Surgical History,Chirurgická história
 DocType: Bank Statement Settings Item,Mapped Header,Zmapovaná hlavička
-apps/erpnext/erpnext/hr/doctype/employee/employee.py,Please setup Employee Naming System in Human Resource &gt; HR Settings,Nastavte systém pomenovávania zamestnancov v časti Ľudské zdroje&gt; Nastavenia ľudských zdrojov
 DocType: Employee,Resignation Letter Date,Rezignace Letter Datum
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Pricing Rules are further filtered based on quantity.,Pravidla pro stanovení sazeb jsou dále filtrována na základě množství.
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py,Please set the Date Of Joining for employee {0},Nastavte dátum založenia pre zamestnanca {0}
@@ -3369,6 +3380,7 @@
 DocType: Bank Statement Settings,Mapped Items,Mapované položky
 DocType: Amazon MWS Settings,IT,IT
 DocType: Chapter,Chapter,kapitola
+,Fixed Asset Register,Register fixných aktív
 apps/erpnext/erpnext/utilities/user_progress.py,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,Select BOM and Qty for Production,Vyberte BOM a Množstvo na výrobu
@@ -3504,7 +3516,6 @@
 apps/erpnext/erpnext/templates/emails/reorder_item.html,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
 apps/erpnext/erpnext/controllers/accounts_controller.py,Account {0} is invalid. Account Currency must be {1},Účet {0} je neplatná. Mena účtu musí byť {1}
 apps/erpnext/erpnext/hr/doctype/salary_structure_assignment/salary_structure_assignment.py,From Date {0} cannot be after employee's relieving Date {1},Od dátumu {0} nemôže byť po uvoľnení zamestnanca Dátum {1}
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py,Debit Note {0} has been created automatically,Debetná poznámka {0} bola vytvorená automaticky
 apps/erpnext/erpnext/accounts/doctype/payment_order/payment_order.js,Create Payment Entries,Vytvorte platobné položky
 DocType: Supplier,Is Internal Supplier,Je interný dodávateľ
 DocType: Employee,Create User Permission,Vytvoriť povolenie používateľa
@@ -4068,7 +4079,6 @@
 DocType: Project User,Project Status,Stav projektu
 DocType: UOM,Check this to disallow fractions. (for Nos),"Zkontrolujte, zda to zakázat frakce. (U č)"
 DocType: Student Admission Program,Naming Series (for Student Applicant),Pomenovanie Series (pre študentské prihlasovateľ)
-apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.py,UOM Conversion factor ({0} -&gt; {1}) not found for item: {2},Prepočítavací faktor UOM ({0} -&gt; {1}) nebol nájdený pre položku: {2}
 apps/erpnext/erpnext/hr/doctype/retention_bonus/retention_bonus.py,Bonus Payment Date cannot be a past date,Bonus Dátum platby nemôže byť minulý dátum
 DocType: Travel Request,Copy of Invitation/Announcement,Kópia pozvánky / oznámenia
 DocType: Practitioner Service Unit Schedule,Practitioner Service Unit Schedule,Časový plán služby pre praktizujúcich
@@ -4237,6 +4247,7 @@
 apps/erpnext/erpnext/utilities/user_progress.py,Setup Company,Nastavenie spoločnosti
 ,Lab Test Report,Lab Test Report
 DocType: Employee Benefit Application,Employee Benefit Application,Žiadosť o zamestnanecké požitky
+apps/erpnext/erpnext/accounts/doctype/invoice_discounting/invoice_discounting.py,Row({0}): {1} is already discounted in {2},Riadok ({0}): {1} je už zľavnený v {2}
 apps/erpnext/erpnext/hr/doctype/additional_salary/additional_salary.py,Additional Salary Component Exists.,Existuje ďalšia zložka platu.
 DocType: Purchase Invoice,Unregistered,neregistrovaný
 DocType: Student Applicant,Application Date,aplikácie Dátum
@@ -4316,7 +4327,6 @@
 DocType: Journal Entry,Accounting Entries,Účetní záznamy
 DocType: Job Card Time Log,Job Card Time Log,Denník pracovných kariet
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,"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."
-apps/erpnext/erpnext/education/doctype/instructor/instructor.py,Please setup Instructor Naming System in Education &gt; Education Settings,Nastavte Pomenovací systém inštruktorov v časti Vzdelanie&gt; Nastavenia vzdelávania
 DocType: Journal Entry,Paid Loan,Platené pôžičky
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py,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
@@ -4333,7 +4343,6 @@
 apps/erpnext/erpnext/templates/pages/projects.html,No time sheets,Žiadne časové rozvrhy
 DocType: GoCardless Mandate,GoCardless Customer,Zákazník spoločnosti GoCardless
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py,Leave Type {0} cannot be carry-forwarded,Nechajte typ {0} nemožno vykonávať odovzdávané
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Item Code &gt; Item Group &gt; Brand,Kód položky&gt; Skupina položiek&gt; Značka
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py,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ě
 DocType: Leave Encashment,Payroll,Mzda
@@ -4448,7 +4457,6 @@
 DocType: Stock Ledger Entry,Actual Qty After Transaction,Skutečné Množství Po transakci
 ,Pending SO Items For Purchase Request,"Do doby, než SO položky k nákupu Poptávka"
 apps/erpnext/erpnext/education/doctype/student_admission/student_admission.py,Student Admissions,študent Prijímacie
-apps/erpnext/erpnext/accounts/party.py,{0} {1} is disabled,{0} {1} je zakázaný
 DocType: Supplier,Billing Currency,Mena fakturácie
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py,Extra Large,Extra Veľké
 DocType: Loan,Loan Application,Aplikácia úveru
@@ -4525,7 +4533,6 @@
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py,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/accounts/doctype/accounting_dimension/accounting_dimension.py,Creating Dimensions...,Vytvára sa dimenzia ...
 apps/erpnext/erpnext/education/doctype/student_group_creation_tool/student_group_creation_tool.py,Student Group Name is mandatory in row {0},Študent Názov skupiny je povinné v rade {0}
-DocType: Customer Credit Limit,Bypass credit limit_check,Obísť kreditný limit_check
 DocType: Homepage,Products to be shown on website homepage,"Produkty, ktoré majú byť uvedené na internetových stránkach domovskej"
 DocType: HR Settings,Password Policy,Zásady hesla
 apps/erpnext/erpnext/setup/doctype/customer_group/customer_group.js,This is a root customer group and cannot be edited.,"To je kořen skupiny zákazníků, a nelze upravovat."
@@ -4831,6 +4838,7 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py,Row {0}: Advance against Customer must be credit,Riadok {0}: Advance proti zákazník musí byť úver
 DocType: Quality Meeting,Quality Meeting,Kvalitné stretnutie
 apps/erpnext/erpnext/accounts/doctype/account/account.js,Non-Group to Group,Non-skupiny k skupine
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,Prosím pomenujte Series pre {0} cez Setup&gt; Settings&gt; Naming Series
 DocType: Employee,ERPNext User,ERPĎalší používateľ
 apps/erpnext/erpnext/education/doctype/student_group_creation_tool/student_group_creation_tool.py,Batch is mandatory in row {0},Dávka je povinná v riadku {0}
 apps/erpnext/erpnext/education/doctype/student_group_creation_tool/student_group_creation_tool.py,Batch is mandatory in row {0},Dávka je povinná v riadku {0}
@@ -5130,6 +5138,7 @@
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py,No {0} found for Inter Company Transactions.,Nie je {0} zistené pre transakcie medzi spoločnosťami.
 DocType: Travel Itinerary,Rented Car,Nájomné auto
 apps/erpnext/erpnext/public/js/hub/components/profile_dialog.js,About your Company,O vašej spoločnosti
+apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.js,Show Stock Ageing Data,Zobraziť údaje o starnutí zásob
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py,Credit To account must be a Balance Sheet account,Pripísať na účet musí byť účtu Súvaha
 DocType: Donor,Donor,darcu
 DocType: Global Defaults,Disable In Words,Zakázať v slovách
@@ -5144,8 +5153,10 @@
 DocType: Practitioner Schedule,Schedule Name,Názov plánu
 apps/erpnext/erpnext/regional/doctype/gstr_3b_report/gstr_3b_report.py,Please enter GSTIN and state for the Company Address {0},Zadajte GSTIN a uveďte adresu spoločnosti {0}
 DocType: Currency Exchange,For Buying,Pre nákup
+apps/erpnext/erpnext/setup/default_energy_point_rules.py,On Purchase Order Submission,Pri zadávaní objednávky
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js,Add All Suppliers,Pridať všetkých dodávateľov
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py,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/accounts/doctype/pricing_rule/pricing_rule.js,Customer &gt; Customer Group &gt; Territory,Zákazník&gt; Skupina zákazníkov&gt; Územie
 DocType: Tally Migration,Parties,strany
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js,Browse BOM,Prechádzať BOM
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py,Secured Loans,Zajištěné úvěry
@@ -5177,6 +5188,7 @@
 apps/erpnext/erpnext/stock/doctype/item_alternative/item_alternative.py,Not allow to set alternative item for the item {0},Nepovoliť nastavenie alternatívnej položky pre položku {0}
 apps/erpnext/erpnext/hr/doctype/leave_block_list/leave_block_list.py,Date is repeated,Dátum sa opakuje
 apps/erpnext/erpnext/accounts/print_format/payment_receipt_voucher/payment_receipt_voucher.html,Authorized Signatory,Prokurista
+apps/erpnext/erpnext/education/doctype/instructor/instructor.py,Please setup Instructor Naming System in Education &gt; Education Settings,Nastavte Pomenovací systém inštruktorov v časti Vzdelanie&gt; Nastavenia vzdelávania
 apps/erpnext/erpnext/regional/doctype/gstr_3b_report/gstr_3b_report.html,Net ITC Available(A) - (B),Dostupné čisté ITC (A) - (B)
 apps/erpnext/erpnext/education/doctype/fee_schedule/fee_schedule.js,Create Fees,Vytvorte poplatky
 DocType: Project,Total Purchase Cost (via Purchase Invoice),Celkové obstarávacie náklady (cez nákupné faktúry)
@@ -5197,6 +5209,7 @@
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.js,Message Sent,Správa bola odoslaná
 apps/erpnext/erpnext/accounts/doctype/account/account.py,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/assets/report/fixed_asset_register/fixed_asset_register.py,Vendor Name,Meno predajcu
 DocType: Quiz Result,Wrong,zle
 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)
@@ -5442,6 +5455,7 @@
 DocType: Stock Settings,Auto Material Request,Auto materiálu Poptávka
 DocType: Woocommerce Settings,API consumer secret,API spotrebiteľské tajomstvo
 DocType: Delivery Note Item,Available Batch Qty at From Warehouse,K dispozícii dávky Množstvo na Od Warehouse
+,Received Qty Amount,Prijatá suma Množstvo
 DocType: Salary Slip,Gross Pay - Total Deduction - Loan Repayment,Gross Pay - Total dedukcie - splátky
 DocType: Bank Account,Last Integration Date,Dátum poslednej integrácie
 DocType: Expense Claim,Expense Taxes and Charges,Dane a poplatky za výdavky
@@ -5906,6 +5920,8 @@
 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,Please select Qty against item {0},Vyberte položku Qty v položke {0}
+apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py,Latest Age,Najnovší vek
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js,Transfer Material to Supplier,Preneste materiál Dodávateľovi
 apps/erpnext/erpnext/hr/report/loan_repayment/loan_repayment.py,EMI,EMI
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py,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
@@ -5929,7 +5945,6 @@
 apps/erpnext/erpnext/hr/doctype/employee_benefit_application/employee_benefit_application.py,"An amount of {0} already claimed for the component {1},\
 						 set the amount equal or greater than {2}","Suma {0}, ktorá už bola požadovaná pre komponent {1}, \ nastavila čiastku rovnú alebo väčšiu ako {2}"
 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
 DocType: BOM Update Tool,The new BOM after replacement,Nový BOM po výměně
 ,Point of Sale,Miesto predaja
@@ -6050,7 +6065,6 @@
 DocType: Purchase Order Item,Blanket Order Rate,Dekoračná objednávka
 ,Customer Ledger Summary,Zhrnutie knihy odberateľov
 apps/erpnext/erpnext/hooks.py,Certification,osvedčenie
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js,Are you sure you want to make debit note?,Naozaj chcete zaznamenať ťarchopis?
 DocType: Bank Guarantee,Clauses and Conditions,Doložky a podmienky
 DocType: Serial No,Creation Document Type,Tvorba Typ dokumentu
 DocType: Amazon MWS Settings,ES,ES
@@ -6088,8 +6102,6 @@
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py,Financial Services,Finanční služby
 DocType: Student Sibling,Student ID,Študentská karta
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.js,For Quantity must be greater than zero,Pre množstvo musí byť väčšia ako nula
-apps/erpnext/erpnext/hr/doctype/employee_transfer/employee_transfer.py,"Please delete the Employee <a href=""#Form/Employee/{0}"">{0}</a>\
-					to cancel this document","Ak chcete tento dokument zrušiť, odstráňte zamestnanca <a href=""#Form/Employee/{0}"">{0}</a> \"
 apps/erpnext/erpnext/config/projects.py,Types of activities for Time Logs,Typy činností pre Time Záznamy
 DocType: Opening Invoice Creation Tool,Sales,Predaj
 DocType: Stock Entry Detail,Basic Amount,Základná čiastka
@@ -6168,6 +6180,7 @@
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py,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,Send Supplier Emails,Poslať Dodávateľ e-maily
+DocType: Asset Movement,ACC-ASM-.YYYY.-,ACC-ASM-.YYYY.-
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py,"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
 apps/erpnext/erpnext/hr/doctype/employee_onboarding/employee_onboarding.py,Submit this to create the Employee record,"Odošlite toto, aby ste vytvorili záznam zamestnanca"
@@ -6248,7 +6261,6 @@
 DocType: Sales Team,Contact No.,Kontakt Číslo
 apps/erpnext/erpnext/templates/includes/cart/cart_address.html,Billing Address is same as Shipping Address,Fakturačná adresa je rovnaká ako dodacia adresa
 DocType: Bank Reconciliation,Payment Entries,platobné Príspevky
-apps/erpnext/erpnext/erpnext_integrations/doctype/shopify_settings/shopify_settings.py,Access token or Shopify URL missing,Nepodarilo sa získať prístupový token alebo adresu URL shopify
 DocType: Location,Latitude,zemepisná šírka
 DocType: Work Order,Scrap Warehouse,šrot Warehouse
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py,"Warehouse required at Row No {0}, please set default warehouse for the item {1} for the company {2}","Požadovaný sklad v riadku Nie {0}, nastavte prosím predvolený sklad pre položku {1} pre spoločnosť {2}"
@@ -6292,7 +6304,6 @@
 DocType: Job Offer Term,Value / Description,Hodnota / Popis
 apps/erpnext/erpnext/controllers/accounts_controller.py,"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
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js,Are you sure you want to make credit note?,Naozaj chcete urobiť dobropis?
 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,Debit and Credit not equal for {0} #{1}. Difference is {2}.,Debetné a kreditné nerovná za {0} # {1}. Rozdiel je v tom {2}.
@@ -6417,6 +6428,7 @@
 DocType: Purchase Invoice,Taxes and Charges Added,Daně a poplatky přidané
 apps/erpnext/erpnext/assets/doctype/asset/asset.py,Depreciation Row {0}: Next Depreciation Date cannot be before Available-for-use Date,Odpisový riadok {0}: Nasledujúci dátum odpisovania nemôže byť pred dátumom k dispozícii na použitie
 ,Sales Funnel,Predajný lievik
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Item Code &gt; Item Group &gt; Brand,Kód položky&gt; Skupina položiek&gt; Značka
 apps/erpnext/erpnext/setup/doctype/company/company.py,Abbreviation is mandatory,Skratka je povinná
 DocType: Project,Task Progress,pokrok úloha
 apps/erpnext/erpnext/templates/includes/navbar/navbar_items.html,Cart,Košík
@@ -6663,6 +6675,7 @@
 DocType: Employee Grade,Employee Grade,Zamestnanec stupeň
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py,Piecework,Úkolová práce
 DocType: GSTR 3B Report,June,jún
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Supplier &gt; Supplier Type,Dodávateľ&gt; Typ dodávateľa
 DocType: Share Balance,From No,Od č
 DocType: Shift Type,Early Exit Grace Period,Predčasné ukončenie odkladu
 DocType: Task,Actual Time (in Hours),Skutočná doba (v hodinách)
@@ -6949,6 +6962,7 @@
 DocType: Warehouse,Warehouse Name,Názov skladu
 DocType: Naming Series,Select Transaction,Vybrat Transaction
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py,Please enter Approving Role or Approving User,Zadejte Schvalování role nebo Schvalování Uživatel
+apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.py,UOM Conversion factor ({0} -&gt; {1}) not found for item: {2},Prepočítavací faktor UOM ({0} -&gt; {1}) nebol nájdený pre položku: {2}
 apps/erpnext/erpnext/support/doctype/service_level_agreement/service_level_agreement.py,Service Level Agreement with Entity Type {0} and Entity {1} already exists.,Dohoda o úrovni služieb s typom entity {0} a entitou {1} už existuje.
 DocType: Journal Entry,Write Off Entry,Odepsat Vstup
 DocType: BOM,Rate Of Materials Based On,Hodnotit materiálů na bázi
@@ -7140,6 +7154,7 @@
 DocType: Quality Inspection Reading,Quality Inspection Reading,Kvalita Kontrola Reading
 apps/erpnext/erpnext/stock/doctype/stock_settings/stock_settings.py,`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/stock/report/stock_balance/stock_balance.py,Earliest Age,Najstarší vek
 apps/erpnext/erpnext/utilities/user_progress.py,Set a sales goal you'd like to achieve for your company.,"Nastavte cieľ predaja, ktorý chcete dosiahnuť pre vašu spoločnosť."
 DocType: Quality Goal,Revision,opakovanie
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js,Healthcare Services,Zdravotnícke služby
@@ -7183,6 +7198,7 @@
 apps/erpnext/erpnext/healthcare/doctype/patient_encounter/patient_encounter.js,Schedule Discharge,Rozvrh Výdavky
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py,Cheques and Deposits incorrectly cleared,Šeky a Vklady nesprávne vymazané
 DocType: Homepage Section Card,Homepage Section Card,Karta sekcie domovskej stránky
+,Amount To Be Billed,"Suma, ktorá sa má fakturovať"
 apps/erpnext/erpnext/accounts/doctype/account/account.py,Account {0}: You can not assign itself as parent account,Účet {0}: nelze přiřadit sebe jako nadřazený účet
 DocType: Purchase Invoice Item,Price List Rate,Cenníková cena
 apps/erpnext/erpnext/utilities/activation.py,Create customer quotes,Vytvoriť zákaznícke ponuky
@@ -7235,6 +7251,7 @@
 DocType: Supplier Scorecard Criteria,Supplier Scorecard Criteria,Kritériá hodnotiacej tabuľky dodávateľa
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py,Please select Start Date and End Date for Item {0},"Prosím, vyberte Počáteční datum a koncové datum pro položku {0}"
 DocType: Maintenance Schedule,MAT-MSH-.YYYY.-,MAT-MSH-.YYYY.-
+,Amount to Receive,Suma na príjem
 apps/erpnext/erpnext/education/doctype/student_group_creation_tool/student_group_creation_tool.py,Course is mandatory in row {0},Samozrejme je povinné v rade {0}
 apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py,From date can not be greater than than To date,Od dátumu nemôže byť väčšie ako do dátumu
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py,To date cannot be before from date,Dátum DO nemôže byť skôr ako dátum OD
@@ -7486,7 +7503,6 @@
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js,BOM and Manufacturing Quantity are required,BOM a Výrobné množstvo sú povinné
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js,Ageing Range 2,Stárnutí rozsah 2
 DocType: SG Creation Tool Course,Max Strength,Max Sila
-apps/erpnext/erpnext/accounts/doctype/account/account.py,"Account {0} already exists in child company {1}. The following fields have different values, they should be same:<ul><li>{2}</li></ul>","Účet {0} už existuje v dcérskej spoločnosti {1}. Nasledujúce polia majú rôzne hodnoty, mali by byť rovnaké: <ul><li> {2} </li></ul>"
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py,Installing presets,Inštalácia predvolieb
 DocType: Fee Schedule,EDU-FSH-.YYYY.-,EDU-FSH-.YYYY.-
 apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js,No Delivery Note selected for Customer {},Pre zákazníka nie je vybratá žiadna dodacia poznámka {}
@@ -7698,6 +7714,7 @@
 DocType: Delivery Note,Print Without Amount,Tisknout bez Částka
 apps/erpnext/erpnext/accounts/report/asset_depreciation_ledger/asset_depreciation_ledger.py,Depreciation Date,odpisy Dátum
 ,Work Orders in Progress,Pracovné príkazy v procese
+DocType: Customer Credit Limit,Bypass Credit Limit Check,Kontrola obtokového úverového limitu
 DocType: Issue,Support Team,Tým podpory
 apps/erpnext/erpnext/stock/report/batch_item_expiry_status/batch_item_expiry_status.py,Expiry (In Days),Doba použiteľnosti (v dňoch)
 DocType: Appraisal,Total Score (Out of 5),Celkové skóre (Out of 5)
@@ -7883,6 +7900,7 @@
 DocType: Sales Invoice,Customer GSTIN,Zákazník GSTIN
 DocType: Crop Cycle,List of diseases detected on the field. When selected it'll automatically add a list of tasks to deal with the disease ,"Zoznam chorôb zistených v teréne. Po výbere bude automaticky pridaný zoznam úloh, ktoré sa budú týkať tejto choroby"
 apps/erpnext/erpnext/manufacturing/page/bom_comparison_tool/bom_comparison_tool.js,BOM 1,Kus 1
+apps/erpnext/erpnext/assets/report/fixed_asset_register/fixed_asset_register.py,Asset Id,ID majetku
 apps/erpnext/erpnext/healthcare/doctype/healthcare_service_unit/healthcare_service_unit.js,This is a root healthcare service unit and cannot be edited.,Jedná sa o koreňovú službu zdravotnej starostlivosti a nemožno ju upraviť.
 DocType: Asset Repair,Repair Status,Stav opravy
 apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.js,"Requested Qty: Quantity requested for purchase, but not ordered.","Požadované množství: Množství požádalo o koupi, ale nenařídil."
diff --git a/erpnext/translations/sl.csv b/erpnext/translations/sl.csv
index 8a2ee50..e8e2409 100644
--- a/erpnext/translations/sl.csv
+++ b/erpnext/translations/sl.csv
@@ -289,7 +289,6 @@
 DocType: Loan,Repay Over Number of Periods,Odplačilo Over število obdobij
 apps/erpnext/erpnext/manufacturing/report/bom_stock_report/bom_stock_report.py,Quantity to Produce can not be less than Zero,Količina za proizvodnjo ne sme biti manjša od ničle
 DocType: Stock Entry,Additional Costs,Dodatni stroški
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Customer &gt; Customer Group &gt; Territory,Stranka&gt; Skupina kupcev&gt; Ozemlje
 apps/erpnext/erpnext/accounts/doctype/account/account.py,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
@@ -587,6 +586,7 @@
 DocType: Healthcare Settings,Create documents for sample collection,Ustvarite dokumente za zbiranje vzorcev
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py,Payment against {0} {1} cannot be greater than Outstanding Amount {2},Plačilo pred {0} {1} ne sme biti večja od neporavnanega zneska {2}
 apps/erpnext/erpnext/patches/v11_0/add_healthcare_service_unit_tree_root.py,All Healthcare Service Units,Vse enote zdravstvenega varstva
+apps/erpnext/erpnext/setup/default_energy_point_rules.py,On Converting Opportunity,O pretvorbi priložnosti
 DocType: Bank Account,Address HTML,Naslov HTML
 DocType: Lead,Mobile No.,Mobilni No.
 apps/erpnext/erpnext/selling/doctype/pos_closing_voucher/closing_voucher_details.html,Mode of Payments,Način plačila
@@ -651,7 +651,6 @@
 DocType: Accounting Dimension,Dimension Name,Ime razsežnosti
 apps/erpnext/erpnext/healthcare/setup.py,Resistant,Odporen
 apps/erpnext/erpnext/hotels/doctype/hotel_room_reservation/hotel_room_reservation.py,Please set Hotel Room Rate on {},"Prosimo, nastavite hotelsko sobo na {"
-apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py,Please setup numbering series for Attendance via Setup &gt; Numbering Series,Nastavite serijsko številčenje za udeležbo prek Setup&gt; Seting Number
 DocType: Journal Entry,Multi Currency,Multi Valuta
 DocType: Bank Statement Transaction Invoice Item,Invoice Type,Račun Type
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py,Valid from date must be less than valid upto date,"Velja od datuma, ki mora biti manjši od veljavnega do datuma"
@@ -769,6 +768,7 @@
 apps/erpnext/erpnext/accounts/page/pos/pos.js,Create a new Customer,Ustvari novo stranko
 apps/erpnext/erpnext/non_profit/report/expiring_memberships/expiring_memberships.py,Expiring On,Izteče se
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,"If multiple Pricing Rules continue to prevail, users are asked to set Priority manually to resolve conflict.","Če je več Rules Cenik še naprej prevladovala, so pozvane, da nastavite Priority ročno za reševanje morebitnih sporov."
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js,Purchase Return,nakup Return
 apps/erpnext/erpnext/utilities/activation.py,Create Purchase Orders,Ustvari naročilnice
 ,Purchase Register,Nakup Register
 apps/erpnext/erpnext/healthcare/doctype/patient/patient.py,Patient not found,Bolnik ni najden
@@ -784,7 +784,6 @@
 DocType: Location,Area UOM,Področje UOM
 apps/erpnext/erpnext/manufacturing/doctype/workstation/workstation.py,Workstation is closed on the following dates as per Holiday List: {0},Workstation je zaprt na naslednje datume kot na Holiday Seznam: {0}
 apps/erpnext/erpnext/selling/page/sales_funnel/sales_funnel.py,Opportunities,Priložnosti
-apps/erpnext/erpnext/www/all-products/index.html,Clear filters,Počistite filtre
 DocType: Lab Test Template,Single,Samski
 DocType: Compensatory Leave Request,Work From Date,Delo od datuma
 DocType: Salary Slip,Total Loan Repayment,Skupaj posojila Povračilo
@@ -828,6 +827,7 @@
 apps/erpnext/erpnext/education/doctype/program_enrollment_tool/program_enrollment_tool.py,Mandatory field - Academic Year,Obvezno polje - študijsko leto
 apps/erpnext/erpnext/education/doctype/program_enrollment_tool/program_enrollment_tool.py,Mandatory field - Academic Year,Obvezno polje - študijsko leto
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py,{0} {1} is not associated with {2} {3},{0} {1} ni povezan z {2} {3}
+DocType: Opportunity,Converted By,Pretvoril
 apps/erpnext/erpnext/public/js/hub/components/ReviewArea.vue,You need to login as a Marketplace User before you can add any reviews.,"Preden lahko dodate ocene, se morate prijaviti kot uporabnik tržnice."
 apps/erpnext/erpnext/manufacturing/doctype/job_card/job_card.py,Row {0} : Operation is required against the raw material item {1},Vrstica {0}: delovanje je potrebno proti elementu surovin {1}
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py,Please set default payable account for the company {0},"Prosimo, nastavite privzeto se plača račun za podjetje {0}"
@@ -854,6 +854,8 @@
 DocType: Sales Invoice,Total Qty,Skupaj Kol
 apps/erpnext/erpnext/education/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py,Guardian2 Email ID,Skrbnika2 E-ID
 apps/erpnext/erpnext/education/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py,Guardian2 Email ID,Skrbnika2 E-ID
+apps/erpnext/erpnext/hr/doctype/employee_transfer/employee_transfer.py,"Please delete the Employee <a href=""#Form/Employee/{0}"">{0}</a>\
+					to cancel this document","Izbrišite zaposlenega <a href=""#Form/Employee/{0}"">{0}</a> \, če želite preklicati ta dokument"
 DocType: Item,Show in Website (Variant),Prikaži na spletni strani (Variant)
 DocType: Employee,Health Concerns,Zdravje
 DocType: Payroll Entry,Select Payroll Period,Izberite izplačane Obdobje
@@ -913,7 +915,6 @@
 DocType: Codification Table,Codification Table,Tabela kodifikacije
 DocType: Timesheet Detail,Hrs,Ur
 apps/erpnext/erpnext/manufacturing/page/bom_comparison_tool/bom_comparison_tool.js,Changes in {0},Spremembe v {0}
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js,Please select Company,"Prosimo, izberite Company"
 DocType: Employee Skill,Employee Skill,Spretnost zaposlenih
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.js,Difference Account,Razlika račun
 DocType: Pricing Rule,Discount on Other Item,Popust na drugi artikel
@@ -982,6 +983,7 @@
 DocType: BOM,Operating Cost,Obratovalni stroški
 DocType: Crop,Produced Items,Proizvedeni elementi
 DocType: Bank Statement Transaction Entry,Match Transaction to Invoices,Ujemanje transakcije z računi
+apps/erpnext/erpnext/erpnext_integrations/exotel_integration.py,Error in Exotel incoming call,Napaka pri dohodnem klicu Exotel
 DocType: Sales Order Item,Gross Profit,Bruto dobiček
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js,Unblock Invoice,Odblokiraj račun
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py,Increment cannot be 0,Prirastek ne more biti 0
@@ -1197,6 +1199,7 @@
 DocType: Activity Cost,Activity Type,Vrsta dejavnosti
 DocType: Request for Quotation,For individual supplier,Za posameznega dobavitelja
 DocType: BOM Operation,Base Hour Rate(Company Currency),Osnovna urni tečaj (družba Valuta)
+,Qty To Be Billed,"Količina, ki jo morate plačati"
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py,Delivered Amount,Delivered Znesek
 apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.js,Reserved Qty for Production: Raw materials quantity to make manufacturing items.,Količina pridržane za proizvodnjo: Količina surovin za izdelavo izdelkov.
 DocType: Loyalty Point Entry Redemption,Redemption Date,Datum odkupa
@@ -1318,7 +1321,7 @@
 apps/erpnext/erpnext/education/doctype/student_group/student_group.py,Please select Program,Izberite program
 apps/erpnext/erpnext/education/doctype/student_group/student_group.py,Please select Program,Izberite program
 DocType: Project,Estimated Cost,Ocenjeni strošek
-DocType: Request for Quotation,Link to material requests,Povezava na materialne zahteve
+DocType: Supplier Quotation,Link to material requests,Povezava na materialne zahteve
 apps/erpnext/erpnext/public/js/hub/pages/Publish.vue,Publish,Objavi
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py,Aerospace,Aerospace
 ,Fichier des Ecritures Comptables [FEC],Fichier des Ecritures Comptables [FEC]
@@ -1331,6 +1334,7 @@
 apps/erpnext/erpnext/utilities/transaction_base.py,Invalid Posting Time,Neveljaven čas pošiljanja
 DocType: Salary Component,Condition and Formula,Pogoj in formula
 DocType: Lead,Campaign Name,Ime kampanje
+apps/erpnext/erpnext/setup/default_energy_point_rules.py,On Task Completion,Ob zaključku naloge
 apps/erpnext/erpnext/hr/doctype/compensatory_leave_request/compensatory_leave_request.py,There is no leave period in between {0} and {1},Obdobja dopusta ni med {0} in {1}
 DocType: Fee Validity,Healthcare Practitioner,Zdravstveni delavec
 DocType: Hotel Room,Capacity,Zmogljivost
@@ -1676,7 +1680,6 @@
 DocType: Quality Feedback Template,Quality Feedback Template,Predloga za povratne informacije o kakovosti
 apps/erpnext/erpnext/config/education.py,LMS Activity,LMS dejavnost
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py,Internet Publishing,Internet Založništvo
-DocType: Prescription Duration,Number,Številka
 apps/erpnext/erpnext/accounts/doctype/opening_invoice_creation_tool/opening_invoice_creation_tool.js,Creating {0} Invoice,Ustvarjanje računa {0}
 DocType: Medical Code,Medical Code Standard,Standard medicinske oznake
 DocType: Soil Texture,Clay Composition (%),Glina Sestava (%)
@@ -1751,6 +1754,7 @@
 DocType: Support Settings,Get Started Sections,Začnite razdelke
 DocType: Lead,CRM-LEAD-.YYYY.-,CRM-LEAD-.YYYY.-
 DocType: Invoice Discounting,Sanctioned,sankcionirano
+,Base Amount,Osnovni znesek
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.js,Total Contribution Amount: {0},Skupni znesek prispevka: {0}
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py,Row #{0}: Please specify Serial No for Item {1},Vrstica # {0}: Navedite Zaporedna številka za postavko {1}
 DocType: Payroll Entry,Salary Slips Submitted,Poslane plačljive plače
@@ -1971,6 +1975,7 @@
 apps/erpnext/erpnext/utilities/user_progress.py,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.
 DocType: Accounting Dimension,Dimension Defaults,Privzete dimenzije
 apps/erpnext/erpnext/crm/report/prospects_engaged_but_not_converted/prospects_engaged_but_not_converted.js,Minimum Lead Age (Days),Minimalna Svinec Starost (dnevi)
+apps/erpnext/erpnext/assets/report/fixed_asset_register/fixed_asset_register.py,Available For Use Date,Na voljo za uporabo
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py,All BOMs,Vse BOMs
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js,Create Inter Company Journal Entry,Ustvari vpis v revijo Inter Company
 DocType: Company,Parent Company,Matična družba
@@ -2035,6 +2040,7 @@
 ,IRS 1099,IRS 1099
 DocType: Salary Slip,Leave Without Pay,Leave brez plačila
 DocType: Payment Request,Outward,Zunaj
+apps/erpnext/erpnext/setup/default_energy_point_rules.py,On {0} Creation,Ob {0} Ustvarjanje
 apps/erpnext/erpnext/regional/doctype/gstr_3b_report/gstr_3b_report.html,State/UT Tax,Državni / davek na UT
 ,Trial Balance for Party,Trial Balance za stranke
 ,Gross and Net Profit Report,Poročilo o bruto in neto dobičku
@@ -2152,6 +2158,7 @@
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js,Make Stock Entry,Naredite vnos zalog
 DocType: Hotel Room Reservation,Hotel Reservation User,Uporabnik rezervacije hotela
 apps/erpnext/erpnext/projects/doctype/project/project.js,Set Status,Nastavi stanje
+apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py,Please setup numbering series for Attendance via Setup &gt; Numbering Series,Nastavite serijsko številčenje za udeležbo prek Setup&gt; Seting Number
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py,Please select prefix first,"Prosimo, izberite predpono najprej"
 DocType: Contract,Fulfilment Deadline,Rok izpolnjevanja
 apps/erpnext/erpnext/public/js/hub/pages/Home.vue,Near you,Blizu vas
@@ -2167,6 +2174,7 @@
 DocType: Announcement,All Students,Vse Študenti
 apps/erpnext/erpnext/assets/doctype/asset/asset.py,Item {0} must be a non-stock item,"Točka {0} mora biti postavka, non-stock"
 apps/erpnext/erpnext/stock/doctype/batch/batch.js,View Ledger,Ogled Ledger
+DocType: Cost Center,Lft,LFT
 DocType: Grading Scale,Intervals,intervali
 DocType: Bank Statement Transaction Entry,Reconciled Transactions,Usklajene transakcije
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py,Earliest,Najzgodnejša
@@ -2282,6 +2290,7 @@
 apps/erpnext/erpnext/hr/doctype/employee_benefit_application/employee_benefit_application.py,As per your assigned Salary Structure you cannot apply for benefits,Glede na dodeljeno strukturo plače ne morete zaprositi za ugodnosti
 apps/erpnext/erpnext/stock/doctype/item/item.py,Website Image should be a public file or website URL,Spletna stran Slika bi morala biti javna datoteka ali spletna stran URL
 DocType: Purchase Invoice Item,BOM,Surovine
+apps/erpnext/erpnext/stock/doctype/item/item.py,Duplicate entry in Manufacturers table,Podvojen vnos v tabeli Proizvajalci
 apps/erpnext/erpnext/setup/doctype/item_group/item_group.js,This is a root item group and cannot be edited.,"To je skupina, root element in ga ni mogoče urejati."
 apps/erpnext/erpnext/accounts/doctype/account/account.js,Merge,Spoji se
 DocType: Journal Entry Account,Purchase Order,Naročilnica
@@ -2428,7 +2437,6 @@
 DocType: Asset,Depreciation Schedules,Amortizacija Urniki
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.js,Create Sales Invoice,Ustvari prodajni račun
 apps/erpnext/erpnext/regional/doctype/gstr_3b_report/gstr_3b_report.html,Ineligible ITC,Neupravičena ITC
-apps/erpnext/erpnext/erpnext_integrations/doctype/shopify_settings/shopify_settings.py,"Support for public app is deprecated. Please setup private app, for more details refer user manual","Podpora za javno aplikacijo je zastarela. Prosimo, nastavite zasebno aplikacijo, za več podrobnosti glejte uporabniški priročnik"
 DocType: Task,Dependent Tasks,Odvisne naloge
 apps/erpnext/erpnext/regional/report/gstr_1/gstr_1.py,Following accounts might be selected in GST Settings:,V nastavitvah GST se lahko izberejo naslednji računi:
 apps/erpnext/erpnext/manufacturing/report/bom_stock_report/bom_stock_report.js,Quantity to Produce,Količina za proizvodnjo
@@ -2680,6 +2688,7 @@
 DocType: Water Analysis,Container,Zabojnik
 apps/erpnext/erpnext/regional/report/gstr_1/gstr_1.py,Please set valid GSTIN No. in Company Address,V naslov podjetja nastavite veljavno številko GSTIN
 apps/erpnext/erpnext/education/utils.py,Student {0} - {1} appears Multiple times in row {2} & {3},Študent {0} - {1} pojavi večkrat v vrsti {2} {3}
+apps/erpnext/erpnext/selling/doctype/customer/customer.py,Following fields are mandatory to create address:,Naslednja polja so obvezna za ustvarjanje naslova:
 DocType: Item Alternative,Two-way,Dvosmerni
 DocType: Item,Manufacturers,Proizvajalci
 apps/erpnext/erpnext/accounts/deferred_revenue.py,Error while processing deferred accounting for {0},Napaka pri obdelavi odloženega računovodstva za {0}
@@ -2755,9 +2764,9 @@
 DocType: Employee,HR-EMP-,HR-EMP-
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py,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: Quality Meeting Minutes,Quality Meeting Minutes,Zapisniki o kakovostnem sestanku
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Supplier &gt; Supplier Type,Dobavitelj&gt; Vrsta dobavitelja
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py,Employee Referral,Napotitev zaposlenih
 DocType: Student Group,Set 0 for no limit,Nastavite 0 za brez omejitev
+DocType: Cost Center,rgt,RGT
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py,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."
 DocType: Customer,Primary Address and Contact Detail,Osnovni naslov in kontaktni podatki
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.js,Resend Payment Email,Ponovno pošlji plačila Email
@@ -2867,7 +2876,6 @@
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py,Against Supplier Invoice {0} dated {1},Zoper dobavitelja Račun {0} dne {1}
 DocType: Customer,Default Price List,Privzeto Cenik
 apps/erpnext/erpnext/assets/doctype/asset/asset.py,Asset Movement record {0} created,zapis Gibanje sredstvo {0} ustvaril
-apps/erpnext/erpnext/utilities/page/leaderboard/leaderboard.js,No items found.,Ni elementov.
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py,You cannot delete Fiscal Year {0}. Fiscal Year {0} is set as default in Global Settings,"Ne, ne moreš brisati poslovnega leta {0}. Poslovno leto {0} je privzet v globalnih nastavitvah"
 DocType: Share Transfer,Equity/Liability Account,Račun kapitala / obveznost
 apps/erpnext/erpnext/setup/doctype/customer_group/customer_group.py,A customer with the same name already exists,Kupec z istim imenom že obstaja
@@ -2883,6 +2891,7 @@
 apps/erpnext/erpnext/selling/doctype/customer/customer.py,Credit limit has been crossed for customer {0} ({1}/{2}),Kreditna meja je prešla za stranko {0} ({1} / {2})
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py,Customer required for 'Customerwise Discount',Stranka zahteva za &quot;Customerwise popust&quot;
 apps/erpnext/erpnext/config/accounting.py,Update bank payment dates with journals.,Posodobite rok plačila banka s revijah.
+,Billed Qty,Število računov
 apps/erpnext/erpnext/stock/doctype/item/item_dashboard.py,Pricing,Cenitev
 DocType: Employee,Attendance Device ID (Biometric/RF tag ID),ID naprave za udeležbo (ID biometrične / RF oznake)
 DocType: Quotation,Term Details,Izraz Podrobnosti
@@ -2906,6 +2915,7 @@
 DocType: Share Transfer,Asset Account,Račun sredstev
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js,New release date should be in the future,Nov datum izida bi moral biti v prihodnosti
 DocType: Purchase Invoice,End date of current invoice's period,Končni datum obdobja tekočega faktura je
+apps/erpnext/erpnext/hr/doctype/employee/employee.py,Please setup Employee Naming System in Human Resource &gt; HR Settings,"Prosimo, nastavite sistem poimenovanja zaposlenih v kadrovski službi&gt; Nastavitve človeških virov"
 DocType: Lab Test,Technician Name,Ime tehnika
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py,"Cannot ensure delivery by Serial No as \
 					Item {0} is added with and without Ensure Delivery by \
@@ -2913,6 +2923,7 @@
 DocType: Accounts Settings,Unlink Payment on Cancellation of Invoice,Prekinitev povezave med Plačilo na Izbris računa
 DocType: Bank Reconciliation,From Date,Od datuma
 apps/erpnext/erpnext/hr/doctype/vehicle_log/vehicle_log.py,Current Odometer reading entered should be greater than initial Vehicle Odometer {0},Trenutni Stanje kilometrov vpisana mora biti večja od začetne števca prevožene poti vozila {0}
+,Purchase Order Items To Be Received or Billed,"Nabavni predmeti, ki jih je treba prejeti ali plačati"
 DocType: Restaurant Reservation,No Show,Ni predstave
 apps/erpnext/erpnext/regional/india/utils.py,You must be a registered supplier to generate e-Way Bill,Za generiranje e-poti morate biti registrirani dobavitelj
 DocType: Shipping Rule Country,Shipping Rule Country,Država dostavnega pravila
@@ -2955,6 +2966,7 @@
 apps/erpnext/erpnext/templates/generators/item/item_add_to_cart.html,View in Cart,Poglej v košarico
 DocType: Employee Checkin,Shift Actual Start,Dejanski začetek premika
 DocType: Tally Migration,Is Day Book Data Imported,Ali so uvoženi podatki o dnevnikih
+,Purchase Order Items To Be Received or Billed1,"Nabavni predmeti, ki jih je treba prejeti ali plačati1"
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py,Marketing Expenses,Stroški trženja
 apps/erpnext/erpnext/stock/doctype/pick_list/pick_list.py,{0} units of {1} is not available.,{0} enot od {1} ni na voljo.
 ,Item Shortage Report,Postavka Pomanjkanje Poročilo
@@ -3182,7 +3194,6 @@
 apps/erpnext/erpnext/public/js/call_popup/call_popup.js,View all issues from {0},Oglejte si vse težave od {0}
 DocType: Quality Inspection,MAT-QA-.YYYY.-,MAT-QA-YYYY-
 DocType: Quality Meeting Table,Quality Meeting Table,Kakovostna tabela za sestanke
-apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,"Prosimo, nastavite Naming Series za {0} z nastavitvijo&gt; Settings&gt; Naming Series"
 apps/erpnext/erpnext/templates/pages/help.html,Visit the forums,Obiščite forume
 DocType: Student,Student Mobile Number,Študent mobilno številko
 DocType: Item,Has Variants,Ima različice
@@ -3325,6 +3336,7 @@
 DocType: Homepage Section,Section Cards,Karte oddelka
 ,Campaign Efficiency,kampanja Učinkovitost
 DocType: Discussion,Discussion,Diskusija
+apps/erpnext/erpnext/setup/default_energy_point_rules.py,On Sales Order Submission,Ob oddaji prodajnega naročila
 DocType: Bank Transaction,Transaction ID,Transaction ID
 DocType: Payroll Entry,Deduct Tax For Unsubmitted Tax Exemption Proof,Davek od odbitka za neosnovan dokaz o davčni oprostitvi
 DocType: Volunteer,Anytime,Kadarkoli
@@ -3332,7 +3344,6 @@
 DocType: Employee Tax Exemption Proof Submission,Employee Tax Exemption Proof Submission,Predložitev dokazila o oprostitvi davka na zaposlene
 DocType: Patient,Surgical History,Kirurška zgodovina
 DocType: Bank Statement Settings Item,Mapped Header,Mapped Header
-apps/erpnext/erpnext/hr/doctype/employee/employee.py,Please setup Employee Naming System in Human Resource &gt; HR Settings,"Prosimo, nastavite sistem poimenovanja zaposlenih v kadrovski službi&gt; Nastavitve človeških virov"
 DocType: Employee,Resignation Letter Date,Odstop pismo Datum
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Pricing Rules are further filtered based on quantity.,Cenovne Pravila so dodatno filtriran temelji na količini.
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py,Please set the Date Of Joining for employee {0},"Prosimo, da določi datum Vstop za zaposlenega {0}"
@@ -3347,6 +3358,7 @@
 DocType: Bank Statement Settings,Mapped Items,Kartirani elementi
 DocType: Amazon MWS Settings,IT,IT
 DocType: Chapter,Chapter,Poglavje
+,Fixed Asset Register,Register nepremičnega premoženja
 apps/erpnext/erpnext/utilities/user_progress.py,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,Select BOM and Qty for Production,Izberite BOM in Količina za proizvodnjo
@@ -3482,7 +3494,6 @@
 apps/erpnext/erpnext/templates/emails/reorder_item.html,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
 apps/erpnext/erpnext/controllers/accounts_controller.py,Account {0} is invalid. Account Currency must be {1},Račun {0} ni veljaven. Valuta računa mora biti {1}
 apps/erpnext/erpnext/hr/doctype/salary_structure_assignment/salary_structure_assignment.py,From Date {0} cannot be after employee's relieving Date {1},Od datuma {0} ne more biti po razrešitvi delavca Datum {1}
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py,Debit Note {0} has been created automatically,Opomba o bremenitvi {0} je bila ustvarjena samodejno
 apps/erpnext/erpnext/accounts/doctype/payment_order/payment_order.js,Create Payment Entries,Ustvari plačilne vnose
 DocType: Supplier,Is Internal Supplier,Je notranji dobavitelj
 DocType: Employee,Create User Permission,Ustvarite dovoljenje za uporabnika
@@ -4045,7 +4056,6 @@
 DocType: Project User,Project Status,Stanje projekta
 DocType: UOM,Check this to disallow fractions. (for Nos),"Preverite, da je to prepoveste frakcij. (za številkami)"
 DocType: Student Admission Program,Naming Series (for Student Applicant),Poimenovanje Series (za Student prijavitelja)
-apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.py,UOM Conversion factor ({0} -&gt; {1}) not found for item: {2},Faktor konverzije UOM ({0} -&gt; {1}) za element: {2}
 apps/erpnext/erpnext/hr/doctype/retention_bonus/retention_bonus.py,Bonus Payment Date cannot be a past date,Datum plačila bonusa ne more biti pretekli datum
 DocType: Travel Request,Copy of Invitation/Announcement,Kopija vabila / obvestila
 DocType: Practitioner Service Unit Schedule,Practitioner Service Unit Schedule,Urnik službe zdravnika
@@ -4194,6 +4204,7 @@
 apps/erpnext/erpnext/utilities/user_progress.py,Setup Company,Setup Company
 ,Lab Test Report,Poročilo o laboratorijskem testu
 DocType: Employee Benefit Application,Employee Benefit Application,Application Employee Benefit
+apps/erpnext/erpnext/accounts/doctype/invoice_discounting/invoice_discounting.py,Row({0}): {1} is already discounted in {2},Vrstica ({0}): {1} je že znižana v {2}
 apps/erpnext/erpnext/hr/doctype/additional_salary/additional_salary.py,Additional Salary Component Exists.,Dodatne komponente plače obstajajo.
 DocType: Purchase Invoice,Unregistered,Neregistrirani
 DocType: Student Applicant,Application Date,uporaba Datum
@@ -4273,7 +4284,6 @@
 DocType: Journal Entry,Accounting Entries,Vknjižbe
 DocType: Job Card Time Log,Job Card Time Log,Dnevni dnevnik delovne kartice
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,"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«."
-apps/erpnext/erpnext/education/doctype/instructor/instructor.py,Please setup Instructor Naming System in Education &gt; Education Settings,Nastavite sistem poimenovanja inštruktorjev v izobraževanju&gt; Nastavitve za izobraževanje
 DocType: Journal Entry,Paid Loan,Plačano posojilo
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py,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
@@ -4290,7 +4300,6 @@
 apps/erpnext/erpnext/templates/pages/projects.html,No time sheets,Ni listami
 DocType: GoCardless Mandate,GoCardless Customer,GoCardless stranka
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py,Leave Type {0} cannot be carry-forwarded,"Pustite Type {0} ni mogoče izvajati, posredovati"
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Item Code &gt; Item Group &gt; Brand,Koda izdelka&gt; Skupina izdelkov&gt; Blagovna znamka
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py,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
 DocType: Leave Encashment,Payroll,izplačane plače
@@ -4406,7 +4415,6 @@
 DocType: Stock Ledger Entry,Actual Qty After Transaction,Dejanska Kol Po Transaction
 ,Pending SO Items For Purchase Request,Dokler SO Točke za nakup dogovoru
 apps/erpnext/erpnext/education/doctype/student_admission/student_admission.py,Student Admissions,Študentski Sprejemi
-apps/erpnext/erpnext/accounts/party.py,{0} {1} is disabled,{0} {1} je onemogočeno
 DocType: Supplier,Billing Currency,Zaračunavanje Valuta
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py,Extra Large,Extra Large
 DocType: Loan,Loan Application,Loan Application
@@ -4483,7 +4491,6 @@
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py,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/accounts/doctype/accounting_dimension/accounting_dimension.py,Creating Dimensions...,Ustvarjanje dimenzij ...
 apps/erpnext/erpnext/education/doctype/student_group_creation_tool/student_group_creation_tool.py,Student Group Name is mandatory in row {0},Študent Group Ime je obvezno v vrsti {0}
-DocType: Customer Credit Limit,Bypass credit limit_check,Obvozite kreditno omejitev
 DocType: Homepage,Products to be shown on website homepage,"Proizvodi, ki se prikaže na spletni strani"
 DocType: HR Settings,Password Policy,Politika gesla
 apps/erpnext/erpnext/setup/doctype/customer_group/customer_group.js,This is a root customer group and cannot be edited.,To je skupina koren stranke in jih ni mogoče urejati.
@@ -4777,6 +4784,7 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py,Row {0}: Advance against Customer must be credit,Vrstica {0}: Advance proti naročniku mora biti kredit
 DocType: Quality Meeting,Quality Meeting,Kakovostno srečanje
 apps/erpnext/erpnext/accounts/doctype/account/account.js,Non-Group to Group,Non-Group skupini
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,"Prosimo, nastavite Naming Series za {0} z nastavitvijo&gt; Settings&gt; Naming Series"
 DocType: Employee,ERPNext User,Uporabnik ERPNext
 apps/erpnext/erpnext/education/doctype/student_group_creation_tool/student_group_creation_tool.py,Batch is mandatory in row {0},Serija je obvezna v vrstici {0}
 apps/erpnext/erpnext/education/doctype/student_group_creation_tool/student_group_creation_tool.py,Batch is mandatory in row {0},Serija je obvezna v vrstici {0}
@@ -5074,6 +5082,7 @@
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py,No {0} found for Inter Company Transactions.,Št. {0} je bil najden za transakcije podjetja Inter.
 DocType: Travel Itinerary,Rented Car,Najem avtomobila
 apps/erpnext/erpnext/public/js/hub/components/profile_dialog.js,About your Company,O vaši družbi
+apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.js,Show Stock Ageing Data,Prikaži podatke o staranju zalog
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py,Credit To account must be a Balance Sheet account,Credit Za računu mora biti bilanca računa
 DocType: Donor,Donor,Darovalec
 DocType: Global Defaults,Disable In Words,"Onemogoči ""z besedami"""
@@ -5088,8 +5097,10 @@
 DocType: Practitioner Schedule,Schedule Name,Ime seznama
 apps/erpnext/erpnext/regional/doctype/gstr_3b_report/gstr_3b_report.py,Please enter GSTIN and state for the Company Address {0},Vnesite GSTIN in navedite naslov podjetja {0}
 DocType: Currency Exchange,For Buying,Za nakup
+apps/erpnext/erpnext/setup/default_energy_point_rules.py,On Purchase Order Submission,Ob oddaji naročilnice
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js,Add All Suppliers,Dodaj vse dobavitelje
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py,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/accounts/doctype/pricing_rule/pricing_rule.js,Customer &gt; Customer Group &gt; Territory,Stranka&gt; Skupina kupcev&gt; Ozemlje
 DocType: Tally Migration,Parties,Pogodbenice
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js,Browse BOM,Prebrskaj BOM
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py,Secured Loans,Secured Posojila
@@ -5121,6 +5132,7 @@
 apps/erpnext/erpnext/stock/doctype/item_alternative/item_alternative.py,Not allow to set alternative item for the item {0},Ne dovolite nastavitve nadomestnega elementa za predmet {0}
 apps/erpnext/erpnext/hr/doctype/leave_block_list/leave_block_list.py,Date is repeated,Datum se ponovi
 apps/erpnext/erpnext/accounts/print_format/payment_receipt_voucher/payment_receipt_voucher.html,Authorized Signatory,Pooblaščeni podpisnik
+apps/erpnext/erpnext/education/doctype/instructor/instructor.py,Please setup Instructor Naming System in Education &gt; Education Settings,Nastavite sistem poimenovanja inštruktorjev v izobraževanju&gt; Nastavitve za izobraževanje
 apps/erpnext/erpnext/regional/doctype/gstr_3b_report/gstr_3b_report.html,Net ITC Available(A) - (B),Neto razpoložljivi ITC (A) - (B)
 apps/erpnext/erpnext/education/doctype/fee_schedule/fee_schedule.js,Create Fees,Ustvari pristojbine
 DocType: Project,Total Purchase Cost (via Purchase Invoice),Skupaj Nakup Cost (via računu o nakupu)
@@ -5141,6 +5153,7 @@
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.js,Message Sent,Sporočilo je bilo poslano
 apps/erpnext/erpnext/accounts/doctype/account/account.py,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/assets/report/fixed_asset_register/fixed_asset_register.py,Vendor Name,Ime prodajalca
 DocType: Quiz Result,Wrong,Napačno
 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)
@@ -5385,6 +5398,7 @@
 DocType: Stock Settings,Auto Material Request,Auto Material Zahteva
 DocType: Woocommerce Settings,API consumer secret,API potrošnikov skrivnost
 DocType: Delivery Note Item,Available Batch Qty at From Warehouse,Dostopno Serija Količina na IZ SKLADIŠČA
+,Received Qty Amount,Prejeta količina v količini
 DocType: Salary Slip,Gross Pay - Total Deduction - Loan Repayment,Bruto plača - Skupaj Odbitek - Posojilo Povračilo
 DocType: Bank Account,Last Integration Date,Zadnji datum vključitve
 DocType: Expense Claim,Expense Taxes and Charges,Davek na dajatve in dajatve
@@ -5849,6 +5863,8 @@
 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,Please select Qty against item {0},Izberite količino proti elementu {0}
+apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py,Latest Age,Najnovejša doba
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js,Transfer Material to Supplier,Prenos Material za dobavitelja
 apps/erpnext/erpnext/hr/report/loan_repayment/loan_repayment.py,EMI,EMI
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py,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
@@ -5872,7 +5888,6 @@
 apps/erpnext/erpnext/hr/doctype/employee_benefit_application/employee_benefit_application.py,"An amount of {0} already claimed for the component {1},\
 						 set the amount equal or greater than {2}","Količina {0}, ki je bila že zahtevana za komponento {1}, \ nastavite znesek, enak ali večji od {2}"
 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
 DocType: BOM Update Tool,The new BOM after replacement,Novi BOM po zamenjavi
 ,Point of Sale,Prodajno mesto
@@ -5993,7 +6008,6 @@
 DocType: Purchase Order Item,Blanket Order Rate,Stopnja poravnave
 ,Customer Ledger Summary,Povzetek glavne knjige strank
 apps/erpnext/erpnext/hooks.py,Certification,Certificiranje
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js,Are you sure you want to make debit note?,"Ali ste prepričani, da želite dodati opombo?"
 DocType: Bank Guarantee,Clauses and Conditions,Klavzule in pogoji
 DocType: Serial No,Creation Document Type,Creation Document Type
 DocType: Amazon MWS Settings,ES,ES
@@ -6031,8 +6045,6 @@
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py,Financial Services,Finančne storitve
 DocType: Student Sibling,Student ID,Student ID
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.js,For Quantity must be greater than zero,Za količino mora biti večja od nič
-apps/erpnext/erpnext/hr/doctype/employee_transfer/employee_transfer.py,"Please delete the Employee <a href=""#Form/Employee/{0}"">{0}</a>\
-					to cancel this document","Izbrišite zaposlenega <a href=""#Form/Employee/{0}"">{0}</a> \, če želite preklicati ta dokument"
 apps/erpnext/erpnext/config/projects.py,Types of activities for Time Logs,Vrste dejavnosti za Čas Dnevniki
 DocType: Opening Invoice Creation Tool,Sales,Prodaja
 DocType: Stock Entry Detail,Basic Amount,Osnovni znesek
@@ -6111,6 +6123,7 @@
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py,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,Send Supplier Emails,Pošlji Dobavitelj e-pošte
+DocType: Asset Movement,ACC-ASM-.YYYY.-,ACC-ASM-.LLLL.-
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py,"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
 apps/erpnext/erpnext/hr/doctype/employee_onboarding/employee_onboarding.py,Submit this to create the Employee record,"Pošljite to, da ustvarite zapis zaposlenega"
@@ -6191,7 +6204,6 @@
 DocType: Sales Team,Contact No.,Kontakt št.
 apps/erpnext/erpnext/templates/includes/cart/cart_address.html,Billing Address is same as Shipping Address,Naslov za izstavitev računa je isti kot naslov za pošiljanje
 DocType: Bank Reconciliation,Payment Entries,Plačilni vnosi
-apps/erpnext/erpnext/erpnext_integrations/doctype/shopify_settings/shopify_settings.py,Access token or Shopify URL missing,Manjka dostopni žeton ali Shopify URL
 DocType: Location,Latitude,Zemljepisna širina
 DocType: Work Order,Scrap Warehouse,ostanki Skladišče
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py,"Warehouse required at Row No {0}, please set default warehouse for the item {1} for the company {2}","Skladišče, potrebno na vrstico št. {0}, nastavite privzeto skladišče za predmet {1} za podjetje {2}"
@@ -6236,7 +6248,6 @@
 DocType: Job Offer Term,Value / Description,Vrednost / Opis
 apps/erpnext/erpnext/controllers/accounts_controller.py,"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
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js,Are you sure you want to make credit note?,"Ali ste prepričani, da želite opraviti dobropis?"
 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,Debit and Credit not equal for {0} #{1}. Difference is {2}.,Debetnih in kreditnih ni enaka za {0} # {1}. Razlika je {2}.
@@ -6361,6 +6372,7 @@
 DocType: Purchase Invoice,Taxes and Charges Added,Davki in dajatve Dodano
 apps/erpnext/erpnext/assets/doctype/asset/asset.py,Depreciation Row {0}: Next Depreciation Date cannot be before Available-for-use Date,"Amortizacijski vrstici {0}: Naslednji Amortizacijski datum ne sme biti pred datumom, ki je na voljo za uporabo"
 ,Sales Funnel,Prodaja toka
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Item Code &gt; Item Group &gt; Brand,Koda izdelka&gt; Skupina izdelkov&gt; Blagovna znamka
 apps/erpnext/erpnext/setup/doctype/company/company.py,Abbreviation is mandatory,Kratica je obvezna
 DocType: Project,Task Progress,naloga Progress
 apps/erpnext/erpnext/templates/includes/navbar/navbar_items.html,Cart,Košarica
@@ -6606,6 +6618,7 @@
 DocType: Employee Grade,Employee Grade,Razred zaposlenih
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py,Piecework,Akord
 DocType: GSTR 3B Report,June,Junij
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Supplier &gt; Supplier Type,Dobavitelj&gt; Vrsta dobavitelja
 DocType: Share Balance,From No,Od št
 DocType: Shift Type,Early Exit Grace Period,Predčasno izstopno milostno obdobje
 DocType: Task,Actual Time (in Hours),Dejanski čas (v urah)
@@ -6892,6 +6905,7 @@
 DocType: Warehouse,Warehouse Name,Skladišče Ime
 DocType: Naming Series,Select Transaction,Izberite Transaction
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py,Please enter Approving Role or Approving User,Vnesite Odobritev vloge ali Potrditev uporabnika
+apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.py,UOM Conversion factor ({0} -&gt; {1}) not found for item: {2},Faktor konverzije UOM ({0} -&gt; {1}) za element: {2}
 apps/erpnext/erpnext/support/doctype/service_level_agreement/service_level_agreement.py,Service Level Agreement with Entity Type {0} and Entity {1} already exists.,Pogodba o ravni storitve s tipom entitete {0} in entiteto {1} že obstaja.
 DocType: Journal Entry,Write Off Entry,Napišite Off Entry
 DocType: BOM,Rate Of Materials Based On,Oceni materialov na osnovi
@@ -7083,6 +7097,7 @@
 DocType: Quality Inspection Reading,Quality Inspection Reading,Kakovost Inšpekcijski Reading
 apps/erpnext/erpnext/stock/doctype/stock_settings/stock_settings.py,`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/stock/report/stock_balance/stock_balance.py,Earliest Age,Najstarejša starost
 apps/erpnext/erpnext/utilities/user_progress.py,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."
 DocType: Quality Goal,Revision,Revizija
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js,Healthcare Services,Zdravstvene storitve
@@ -7126,6 +7141,7 @@
 apps/erpnext/erpnext/healthcare/doctype/patient_encounter/patient_encounter.js,Schedule Discharge,Razrešnica razporeda
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py,Cheques and Deposits incorrectly cleared,Čeki in depoziti nepravilno izbil
 DocType: Homepage Section Card,Homepage Section Card,Kartica oddelka za domačo stran
+,Amount To Be Billed,"Znesek, ki ga je treba plačati"
 apps/erpnext/erpnext/accounts/doctype/account/account.py,Account {0}: You can not assign itself as parent account,Račun {0}: ne moreš dodeliti samega sebe kot matični račun
 DocType: Purchase Invoice Item,Price List Rate,Cenik Rate
 apps/erpnext/erpnext/utilities/activation.py,Create customer quotes,Ustvari ponudbe kupcev
@@ -7178,6 +7194,7 @@
 DocType: Supplier Scorecard Criteria,Supplier Scorecard Criteria,Merila ocenjevalnih meril za dobavitelje
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py,Please select Start Date and End Date for Item {0},"Prosimo, izberite Start in končni datum za postavko {0}"
 DocType: Maintenance Schedule,MAT-MSH-.YYYY.-,MAT-MSH-YYYY.-
+,Amount to Receive,Znesek za prejem
 apps/erpnext/erpnext/education/doctype/student_group_creation_tool/student_group_creation_tool.py,Course is mandatory in row {0},Seveda je obvezna v vrsti {0}
 apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py,From date can not be greater than than To date,Od datuma ne sme biti večje od Do danes
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py,To date cannot be before from date,Do danes ne more biti pred od datuma
@@ -7428,7 +7445,6 @@
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js,BOM and Manufacturing Quantity are required,BOM and Manufacturing Količina so obvezna
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js,Ageing Range 2,Staranje Razpon 2
 DocType: SG Creation Tool Course,Max Strength,Max moč
-apps/erpnext/erpnext/accounts/doctype/account/account.py,"Account {0} already exists in child company {1}. The following fields have different values, they should be same:<ul><li>{2}</li></ul>",Račun {0} že obstaja v otroškem podjetju {1}. Naslednja polja imajo različne vrednosti in morajo biti enaka: <ul><li> {2} </li></ul>
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py,Installing presets,Namestitev prednastavitev
 DocType: Fee Schedule,EDU-FSH-.YYYY.-,EDU-FSH-.YYYY.-
 apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js,No Delivery Note selected for Customer {},Za kupca ni izbranega obvestila o dostavi {}
@@ -7639,6 +7655,7 @@
 DocType: Delivery Note,Print Without Amount,Natisni Brez Znesek
 apps/erpnext/erpnext/accounts/report/asset_depreciation_ledger/asset_depreciation_ledger.py,Depreciation Date,Amortizacija Datum
 ,Work Orders in Progress,Delovni nalogi v teku
+DocType: Customer Credit Limit,Bypass Credit Limit Check,Obhodno preverjanje kreditnega limita
 DocType: Issue,Support Team,Support Team
 apps/erpnext/erpnext/stock/report/batch_item_expiry_status/batch_item_expiry_status.py,Expiry (In Days),Iztek (v dnevih)
 DocType: Appraisal,Total Score (Out of 5),Skupna ocena (od 5)
@@ -7824,6 +7841,7 @@
 DocType: Sales Invoice,Customer GSTIN,GSTIN stranka
 DocType: Crop Cycle,List of diseases detected on the field. When selected it'll automatically add a list of tasks to deal with the disease ,"Seznam bolezni, odkritih na terenu. Ko je izbran, bo samodejno dodal seznam nalog, ki se ukvarjajo z boleznijo"
 apps/erpnext/erpnext/manufacturing/page/bom_comparison_tool/bom_comparison_tool.js,BOM 1,BOM 1
+apps/erpnext/erpnext/assets/report/fixed_asset_register/fixed_asset_register.py,Asset Id,ID premoženja
 apps/erpnext/erpnext/healthcare/doctype/healthcare_service_unit/healthcare_service_unit.js,This is a root healthcare service unit and cannot be edited.,To je korenska storitev zdravstvene oskrbe in je ni mogoče urejati.
 DocType: Asset Repair,Repair Status,Stanje popravila
 apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.js,"Requested Qty: Quantity requested for purchase, but not ordered.","Zahtevana količina: Zahtevana količina za nakup, vendar ni naročena."
diff --git a/erpnext/translations/sq.csv b/erpnext/translations/sq.csv
index 2e12cd0..cf8e8fd 100644
--- a/erpnext/translations/sq.csv
+++ b/erpnext/translations/sq.csv
@@ -286,7 +286,6 @@
 DocType: Loan,Repay Over Number of Periods,Paguaj Over numri i periudhave
 apps/erpnext/erpnext/manufacturing/report/bom_stock_report/bom_stock_report.py,Quantity to Produce can not be less than Zero,Sasia e Prodhimit nuk mund të jetë më e vogël se Zero
 DocType: Stock Entry,Additional Costs,Kostot shtesë
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Customer &gt; Customer Group &gt; Territory,Klienti&gt; Grupi i Klientëve&gt; Territori
 apps/erpnext/erpnext/accounts/doctype/account/account.py,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
@@ -582,6 +581,7 @@
 DocType: Healthcare Settings,Create documents for sample collection,Krijo dokumente për mbledhjen e mostrave
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py,Payment against {0} {1} cannot be greater than Outstanding Amount {2},Pagesës kundër {0} {1} nuk mund të jetë më i madh se Outstanding Sasia {2}
 apps/erpnext/erpnext/patches/v11_0/add_healthcare_service_unit_tree_root.py,All Healthcare Service Units,Të gjitha njësitë e shërbimit shëndetësor
+apps/erpnext/erpnext/setup/default_energy_point_rules.py,On Converting Opportunity,Mbi mundësinë e konvertimit
 DocType: Bank Account,Address HTML,Adresa HTML
 DocType: Lead,Mobile No.,Mobile Nr
 apps/erpnext/erpnext/selling/doctype/pos_closing_voucher/closing_voucher_details.html,Mode of Payments,Mënyra e pagesave
@@ -646,7 +646,6 @@
 DocType: Accounting Dimension,Dimension Name,Emri i dimensionit
 apps/erpnext/erpnext/healthcare/setup.py,Resistant,i qëndrueshëm
 apps/erpnext/erpnext/hotels/doctype/hotel_room_reservation/hotel_room_reservation.py,Please set Hotel Room Rate on {},Ju lutemi përcaktoni vlerën e dhomës së hotelit në {}
-apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py,Please setup numbering series for Attendance via Setup &gt; Numbering Series,Ju lutemi vendosni seritë e numrave për Pjesëmarrje përmes Konfigurimit&gt; Seritë e numrave
 DocType: Journal Entry,Multi Currency,Multi Valuta
 DocType: Bank Statement Transaction Invoice Item,Invoice Type,Lloji Faturë
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py,Valid from date must be less than valid upto date,Vlefshmëria nga data duhet të jetë më pak se data e vlefshme
@@ -762,6 +761,7 @@
 apps/erpnext/erpnext/accounts/page/pos/pos.js,Create a new Customer,Krijo një klient i ri
 apps/erpnext/erpnext/non_profit/report/expiring_memberships/expiring_memberships.py,Expiring On,Po kalon
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,"If multiple Pricing Rules continue to prevail, users are asked to set Priority manually to resolve conflict.","Nëse Rregullat shumta Çmimeve të vazhdojë të mbizotërojë, përdoruesit janë të kërkohet për të vendosur përparësi dorë për të zgjidhur konfliktin."
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js,Purchase Return,Kthimi Blerje
 apps/erpnext/erpnext/utilities/activation.py,Create Purchase Orders,Krijo urdhëron Blerje
 ,Purchase Register,Blerje Regjistrohu
 apps/erpnext/erpnext/healthcare/doctype/patient/patient.py,Patient not found,Pacienti nuk u gjet
@@ -776,7 +776,6 @@
 DocType: Location,Area UOM,Zona UOM
 apps/erpnext/erpnext/manufacturing/doctype/workstation/workstation.py,Workstation is closed on the following dates as per Holiday List: {0},Workstation është i mbyllur në datat e mëposhtme sipas Holiday Lista: {0}
 apps/erpnext/erpnext/selling/page/sales_funnel/sales_funnel.py,Opportunities,Mundësitë
-apps/erpnext/erpnext/www/all-products/index.html,Clear filters,Pastroni filtrat
 DocType: Lab Test Template,Single,I vetëm
 DocType: Compensatory Leave Request,Work From Date,Puna nga data
 DocType: Salary Slip,Total Loan Repayment,Ripagimi Total Loan
@@ -820,6 +819,7 @@
 apps/erpnext/erpnext/education/doctype/program_enrollment_tool/program_enrollment_tool.py,Mandatory field - Academic Year,Fushë e detyrueshme - Viti akademik
 apps/erpnext/erpnext/education/doctype/program_enrollment_tool/program_enrollment_tool.py,Mandatory field - Academic Year,Fushë e detyrueshme - Viti akademik
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py,{0} {1} is not associated with {2} {3},{0} {1} nuk është i lidhur me {2} {3}
+DocType: Opportunity,Converted By,Konvertuar nga
 apps/erpnext/erpnext/public/js/hub/components/ReviewArea.vue,You need to login as a Marketplace User before you can add any reviews.,Ju duhet të identifikoheni si Përdorues i Tregut përpara se të shtoni ndonjë koment.
 apps/erpnext/erpnext/manufacturing/doctype/job_card/job_card.py,Row {0} : Operation is required against the raw material item {1},Rreshti {0}: Funksionimi kërkohet kundrejt artikullit të lëndës së parë {1}
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py,Please set default payable account for the company {0},Ju lutemi të vendosur llogari parazgjedhur pagueshëm për kompaninë {0}
@@ -845,6 +845,8 @@
 DocType: Sales Invoice,Total Qty,Gjithsej Qty
 apps/erpnext/erpnext/education/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py,Guardian2 Email ID,Guardian2 Email ID
 apps/erpnext/erpnext/education/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py,Guardian2 Email ID,Guardian2 Email ID
+apps/erpnext/erpnext/hr/doctype/employee_transfer/employee_transfer.py,"Please delete the Employee <a href=""#Form/Employee/{0}"">{0}</a>\
+					to cancel this document","Ju lutemi fshini punonjësin <a href=""#Form/Employee/{0}"">{0}</a> \ për të anulluar këtë dokument"
 DocType: Item,Show in Website (Variant),Show në Website (Variant)
 DocType: Employee,Health Concerns,Shqetësimet shëndetësore
 DocType: Payroll Entry,Select Payroll Period,Zgjidhni Periudha Payroll
@@ -904,7 +906,6 @@
 apps/erpnext/erpnext/education/doctype/student_group/student_group.py,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,Please select Company,"Ju lutem, përzgjidhni Company"
 DocType: Employee Skill,Employee Skill,Shkathtësia e punonjësve
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.js,Difference Account,Llogaria Diferenca
 DocType: Pricing Rule,Discount on Other Item,Zbritje në artikullin tjetër
@@ -972,6 +973,7 @@
 DocType: BOM,Operating Cost,Kosto Operative
 DocType: Crop,Produced Items,Artikujt e prodhuar
 DocType: Bank Statement Transaction Entry,Match Transaction to Invoices,Ndeshja e transaksionit me faturat
+apps/erpnext/erpnext/erpnext_integrations/exotel_integration.py,Error in Exotel incoming call,Gabim në thirrjen hyrëse në Exotel
 DocType: Sales Order Item,Gross Profit,Fitim bruto
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js,Unblock Invoice,Zhbllokoje faturën
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py,Increment cannot be 0,Rritja nuk mund të jetë 0
@@ -1180,6 +1182,7 @@
 DocType: Activity Cost,Activity Type,Aktiviteti Type
 DocType: Request for Quotation,For individual supplier,Për furnizuesit individual
 DocType: BOM Operation,Base Hour Rate(Company Currency),Base Hour Vlerësoni (Company Valuta)
+,Qty To Be Billed,Qëllimi për t&#39;u faturuar
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py,Delivered Amount,Shuma Dorëzuar
 apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.js,Reserved Qty for Production: Raw materials quantity to make manufacturing items.,Sasia e Rezervuar për Prodhim: Sasia e lëndëve të para për të bërë artikuj prodhues.
 DocType: Loyalty Point Entry Redemption,Redemption Date,Data e riblerjes
@@ -1300,7 +1303,7 @@
 DocType: Sales Invoice,Commission Rate (%),Vlerësoni komision (%)
 apps/erpnext/erpnext/education/doctype/student_group/student_group.py,Please select Program,"Ju lutem, përzgjidhni Program"
 DocType: Project,Estimated Cost,Kostoja e vlerësuar
-DocType: Request for Quotation,Link to material requests,Link të kërkesave materiale
+DocType: Supplier Quotation,Link to material requests,Link të kërkesave materiale
 apps/erpnext/erpnext/public/js/hub/pages/Publish.vue,Publish,publikoj
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py,Aerospace,Hapësirës ajrore
 ,Fichier des Ecritures Comptables [FEC],Fichier des Ecritures Comptables [FEC]
@@ -1313,6 +1316,7 @@
 apps/erpnext/erpnext/utilities/transaction_base.py,Invalid Posting Time,Koha e pavlefshme e regjistrimit
 DocType: Salary Component,Condition and Formula,Kushti dhe Formula
 DocType: Lead,Campaign Name,Emri fushatë
+apps/erpnext/erpnext/setup/default_energy_point_rules.py,On Task Completion,Për përfundimin e detyrave
 apps/erpnext/erpnext/hr/doctype/compensatory_leave_request/compensatory_leave_request.py,There is no leave period in between {0} and {1},Nuk ka periudhë pushimi në mes {0} dhe {1}
 DocType: Fee Validity,Healthcare Practitioner,Mjeku i Kujdesit Shëndetësor
 DocType: Hotel Room,Capacity,kapacitet
@@ -1655,7 +1659,6 @@
 DocType: Quality Feedback Template,Quality Feedback Template,Modeli i reagimit të cilësisë
 apps/erpnext/erpnext/config/education.py,LMS Activity,Aktiviteti LMS
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py,Internet Publishing,Botime Internet
-DocType: Prescription Duration,Number,numër
 apps/erpnext/erpnext/accounts/doctype/opening_invoice_creation_tool/opening_invoice_creation_tool.js,Creating {0} Invoice,Krijimi i {0} faturës
 DocType: Medical Code,Medical Code Standard,Kodi i Mjekësisë Standard
 DocType: Soil Texture,Clay Composition (%),Përbërja e argjilës (%)
@@ -1730,6 +1733,7 @@
 DocType: Support Settings,Get Started Sections,Filloni seksionin e fillimit
 DocType: Lead,CRM-LEAD-.YYYY.-,CRM-LEAD-.YYYY.-
 DocType: Invoice Discounting,Sanctioned,sanksionuar
+,Base Amount,Shuma bazë
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.js,Total Contribution Amount: {0},Shuma totale e kontributit: {0}
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py,Row #{0}: Please specify Serial No for Item {1},Row # {0}: Ju lutem specifikoni Serial Jo për Item {1}
 DocType: Payroll Entry,Salary Slips Submitted,Paga Slips Dërguar
@@ -1952,6 +1956,7 @@
 DocType: Accounting Dimension,Dimension Defaults,Default Default
 apps/erpnext/erpnext/crm/report/prospects_engaged_but_not_converted/prospects_engaged_but_not_converted.js,Minimum Lead Age (Days),Lead Minimumi moshes (ditë)
 apps/erpnext/erpnext/crm/report/prospects_engaged_but_not_converted/prospects_engaged_but_not_converted.js,Minimum Lead Age (Days),Lead Minimumi moshes (ditë)
+apps/erpnext/erpnext/assets/report/fixed_asset_register/fixed_asset_register.py,Available For Use Date,Në dispozicion për data e përdorimit
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py,All BOMs,Të gjitha BOM
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js,Create Inter Company Journal Entry,Krijoni hyrjen e revistës Inter Company
 DocType: Company,Parent Company,Kompania e Prindërve
@@ -2015,6 +2020,7 @@
 ,IRS 1099,IRS 1099
 DocType: Salary Slip,Leave Without Pay,Lini pa pagesë
 DocType: Payment Request,Outward,jashtë
+apps/erpnext/erpnext/setup/default_energy_point_rules.py,On {0} Creation,Në {0} Krijimi
 apps/erpnext/erpnext/regional/doctype/gstr_3b_report/gstr_3b_report.html,State/UT Tax,Taksa e shtetit / UT
 ,Trial Balance for Party,Bilanci gjyqi për Partinë
 ,Gross and Net Profit Report,Raporti i fitimit bruto dhe neto
@@ -2130,6 +2136,7 @@
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js,Make Stock Entry,Bëni hyrjen e aksioneve
 DocType: Hotel Room Reservation,Hotel Reservation User,Përdoruesi i Rezervimit të Hoteleve
 apps/erpnext/erpnext/projects/doctype/project/project.js,Set Status,Vendosni statusin
+apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py,Please setup numbering series for Attendance via Setup &gt; Numbering Series,Ju lutemi vendosni seritë e numrave për Pjesëmarrje përmes Konfigurimit&gt; Seritë e numrave
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py,Please select prefix first,"Ju lutem, përzgjidhni prefiks parë"
 DocType: Contract,Fulfilment Deadline,Afati i përmbushjes
 apps/erpnext/erpnext/public/js/hub/pages/Home.vue,Near you,Pranë jush
@@ -2145,6 +2152,7 @@
 DocType: Announcement,All Students,Të gjitha Studentët
 apps/erpnext/erpnext/assets/doctype/asset/asset.py,Item {0} must be a non-stock item,{0} artikull duhet të jetë një element jo-aksioneve
 apps/erpnext/erpnext/stock/doctype/batch/batch.js,View Ledger,Shiko Ledger
+DocType: Cost Center,Lft,LFT
 DocType: Grading Scale,Intervals,intervalet
 DocType: Bank Statement Transaction Entry,Reconciled Transactions,Transaksionet e pajtuara
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py,Earliest,Hershme
@@ -2259,6 +2267,7 @@
 apps/erpnext/erpnext/hr/doctype/employee_benefit_application/employee_benefit_application.py,As per your assigned Salary Structure you cannot apply for benefits,Sipas Strukturës së Paga tuaj të caktuar ju nuk mund të aplikoni për përfitime
 apps/erpnext/erpnext/stock/doctype/item/item.py,Website Image should be a public file or website URL,Faqja Image duhet të jetë një file publik ose URL website
 DocType: Purchase Invoice Item,BOM,BOM
+apps/erpnext/erpnext/stock/doctype/item/item.py,Duplicate entry in Manufacturers table,Futja e kopjuar në tabelën e Prodhuesve
 apps/erpnext/erpnext/setup/doctype/item_group/item_group.js,This is a root item group and cannot be edited.,Ky është një grup artikull rrënjë dhe nuk mund të redaktohen.
 apps/erpnext/erpnext/accounts/doctype/account/account.js,Merge,Shkrihet
 DocType: Journal Entry Account,Purchase Order,Rendit Blerje
@@ -2402,7 +2411,6 @@
 DocType: Asset,Depreciation Schedules,Oraret e amortizimit
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.js,Create Sales Invoice,Krijoni faturën e shitjeve
 apps/erpnext/erpnext/regional/doctype/gstr_3b_report/gstr_3b_report.html,Ineligible ITC,ITC i papranueshëm
-apps/erpnext/erpnext/erpnext_integrations/doctype/shopify_settings/shopify_settings.py,"Support for public app is deprecated. Please setup private app, for more details refer user manual","Mbështetja për aplikacionin publik është i vjetruar. Ju lutem vendosni aplikacion privat, për më shumë detaje referojuni manualit të përdorimit"
 DocType: Task,Dependent Tasks,Detyrat e varura
 apps/erpnext/erpnext/regional/report/gstr_1/gstr_1.py,Following accounts might be selected in GST Settings:,Llogaritë pasuese mund të zgjidhen në cilësimet e GST:
 apps/erpnext/erpnext/manufacturing/report/bom_stock_report/bom_stock_report.js,Quantity to Produce,Sasia për të prodhuar
@@ -2650,6 +2658,7 @@
 DocType: Water Analysis,Container,enë
 apps/erpnext/erpnext/regional/report/gstr_1/gstr_1.py,Please set valid GSTIN No. in Company Address,Ju lutemi vendosni nr. GSTIN të vlefshëm në Adresën e Kompanisë
 apps/erpnext/erpnext/education/utils.py,Student {0} - {1} appears Multiple times in row {2} & {3},Student {0} - {1} shfaqet disa herë në rresht {2} dhe {3}
+apps/erpnext/erpnext/selling/doctype/customer/customer.py,Following fields are mandatory to create address:,Fushat e mëposhtme janë të detyrueshme për të krijuar adresë:
 DocType: Item Alternative,Two-way,Me dy kalime
 DocType: Item,Manufacturers,Prodhuesit
 ,Employee Billing Summary,Përmbledhje e Faturimit të punonjësve
@@ -2724,9 +2733,9 @@
 DocType: Employee,HR-EMP-,HR-boshllëkun
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py,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: Quality Meeting Minutes,Quality Meeting Minutes,Minutat e Takimit të Cilësisë
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Supplier &gt; Supplier Type,Furnizuesi&gt; Lloji i furnizuesit
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py,Employee Referral,Referimi i Punonjësve
 DocType: Student Group,Set 0 for no limit,Set 0 për pa limit
+DocType: Cost Center,rgt,rgt
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py,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.
 DocType: Customer,Primary Address and Contact Detail,Adresa Fillestare dhe Detajet e Kontaktit
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.js,Resend Payment Email,Ridergo Pagesa Email
@@ -2833,7 +2842,6 @@
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py,Against Supplier Invoice {0} dated {1},Kundër Furnizuesin Fatura {0} datë {1}
 DocType: Customer,Default Price List,E albumit Lista e Çmimeve
 apps/erpnext/erpnext/assets/doctype/asset/asset.py,Asset Movement record {0} created,Rekord Lëvizja Asset {0} krijuar
-apps/erpnext/erpnext/utilities/page/leaderboard/leaderboard.js,No items found.,Asnjë artikull nuk u gjet.
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py,You cannot delete Fiscal Year {0}. Fiscal Year {0} is set as default in Global Settings,Ju nuk mund të fshini Viti Fiskal {0}. Viti Fiskal {0} është vendosur si default në Settings Global
 DocType: Share Transfer,Equity/Liability Account,Llogaria e ekuitetit / përgjegjësisë
 apps/erpnext/erpnext/setup/doctype/customer_group/customer_group.py,A customer with the same name already exists,Një klient me të njëjtin emër tashmë ekziston
@@ -2849,6 +2857,7 @@
 apps/erpnext/erpnext/selling/doctype/customer/customer.py,Credit limit has been crossed for customer {0} ({1}/{2}),Limiti i kredisë është kaluar për konsumatorin {0} ({1} / {2})
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py,Customer required for 'Customerwise Discount',Customer kërkohet për &#39;Customerwise Discount &quot;
 apps/erpnext/erpnext/config/accounting.py,Update bank payment dates with journals.,Update pagesës datat bankare me revista.
+,Billed Qty,Fatja e faturuar
 apps/erpnext/erpnext/stock/doctype/item/item_dashboard.py,Pricing,çmimi
 DocType: Employee,Attendance Device ID (Biometric/RF tag ID),ID e Pajisjes së Pjesëmarrjes (ID biometrike / RF e etiketës RF)
 DocType: Quotation,Term Details,Detajet Term
@@ -2872,6 +2881,7 @@
 DocType: Share Transfer,Asset Account,Llogaria e Aseteve
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js,New release date should be in the future,Data e re e lëshimit duhet të jetë në të ardhmen
 DocType: Purchase Invoice,End date of current invoice's period,Data e fundit e periudhës së fatura aktual
+apps/erpnext/erpnext/hr/doctype/employee/employee.py,Please setup Employee Naming System in Human Resource &gt; HR Settings,Ju lutemi vendosni Sistemin e Emërtimit të Punonjësve në Burimet Njerëzore&gt; Cilësimet e BNJ
 DocType: Lab Test,Technician Name,Emri Teknik
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py,"Cannot ensure delivery by Serial No as \
 					Item {0} is added with and without Ensure Delivery by \
@@ -2879,6 +2889,7 @@
 DocType: Accounts Settings,Unlink Payment on Cancellation of Invoice,Shkëput Pagesa mbi anulimin e Faturë
 DocType: Bank Reconciliation,From Date,Nga Data
 apps/erpnext/erpnext/hr/doctype/vehicle_log/vehicle_log.py,Current Odometer reading entered should be greater than initial Vehicle Odometer {0},Leximi aktuale Odometer hyrë duhet të jetë më i madh se fillestare automjeteve rrugëmatës {0}
+,Purchase Order Items To Be Received or Billed,Bleni Artikujt e Rendit që Do të Merren ose Faturohen
 DocType: Restaurant Reservation,No Show,Asnjë shfaqje
 apps/erpnext/erpnext/regional/india/utils.py,You must be a registered supplier to generate e-Way Bill,Ju duhet të jeni një furnizues i regjistruar për të gjeneruar faturën e e-way
 DocType: Shipping Rule Country,Shipping Rule Country,Rregulla Shipping Vendi
@@ -2920,6 +2931,7 @@
 apps/erpnext/erpnext/templates/generators/item/item_add_to_cart.html,View in Cart,Shiko në Shportë
 DocType: Employee Checkin,Shift Actual Start,Shift Fillimi Aktual
 DocType: Tally Migration,Is Day Book Data Imported,A importohen të dhënat e librit ditor
+,Purchase Order Items To Be Received or Billed1,Bleni Artikujt e Rendit që Do të Merren ose Faturohen1
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py,Marketing Expenses,Shpenzimet e marketingut
 ,Item Shortage Report,Item Mungesa Raport
 DocType: Bank Transaction Payments,Bank Transaction Payments,Pagesat e transaksionit bankar
@@ -3144,7 +3156,6 @@
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js,Material Consumption is not set in Manufacturing Settings.,Konsumi i materialit nuk është vendosur në Cilësimet e Prodhimtaria.
 DocType: Quality Inspection,MAT-QA-.YYYY.-,MAT-QA-.YYYY.-
 DocType: Quality Meeting Table,Quality Meeting Table,Tabela e Takimeve Cilësore
-apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,Ju lutemi vendosni Seritë e Emërtimit për {0} përmes Konfigurimit&gt; Cilësimet&gt; Seritë e Emrave
 apps/erpnext/erpnext/templates/pages/help.html,Visit the forums,Vizito forumet
 DocType: Student,Student Mobile Number,Student Mobile Number
 DocType: Item,Has Variants,Ka Variantet
@@ -3288,6 +3299,7 @@
 ,Campaign Efficiency,Efikasiteti fushatë
 ,Campaign Efficiency,Efikasiteti fushatë
 DocType: Discussion,Discussion,diskutim
+apps/erpnext/erpnext/setup/default_energy_point_rules.py,On Sales Order Submission,Për dorëzimin e urdhrit të shitjeve
 DocType: Bank Transaction,Transaction ID,ID Transaction
 DocType: Payroll Entry,Deduct Tax For Unsubmitted Tax Exemption Proof,Zbritja e taksës për vërtetimin e përjashtimit të taksave të pashpërndara
 DocType: Volunteer,Anytime,Kurdo
@@ -3295,7 +3307,6 @@
 DocType: Employee Tax Exemption Proof Submission,Employee Tax Exemption Proof Submission,Parashtrimi i provës së përjashtimit nga taksat e punonjësve
 DocType: Patient,Surgical History,Historia kirurgjikale
 DocType: Bank Statement Settings Item,Mapped Header,Koka e copëzuar
-apps/erpnext/erpnext/hr/doctype/employee/employee.py,Please setup Employee Naming System in Human Resource &gt; HR Settings,Ju lutemi vendosni Sistemin e Emërtimit të Punonjësve në Burimet Njerëzore&gt; Cilësimet e BNJ
 DocType: Employee,Resignation Letter Date,Dorëheqja Letër Data
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Pricing Rules are further filtered based on quantity.,Rregullat e Çmimeve të filtruar më tej në bazë të sasisë.
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py,Please set the Date Of Joining for employee {0},Ju lutemi të vendosur datën e bashkuar për të punësuar {0}
@@ -3310,6 +3321,7 @@
 DocType: Bank Statement Settings,Mapped Items,Artikujt e mbledhur
 DocType: Amazon MWS Settings,IT,IT
 DocType: Chapter,Chapter,kapitull
+,Fixed Asset Register,Regjistri i Pasurive Fikse
 apps/erpnext/erpnext/utilities/user_progress.py,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,Select BOM and Qty for Production,Zgjidhni bom dhe Qty për Prodhimin
@@ -3441,7 +3453,6 @@
 apps/erpnext/erpnext/templates/emails/reorder_item.html,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
 apps/erpnext/erpnext/controllers/accounts_controller.py,Account {0} is invalid. Account Currency must be {1},Llogari {0} është i pavlefshëm. Llogaria Valuta duhet të jetë {1}
 apps/erpnext/erpnext/hr/doctype/salary_structure_assignment/salary_structure_assignment.py,From Date {0} cannot be after employee's relieving Date {1},Nga Data {0} nuk mund të jetë pas heqjes së punonjësit Data {1}
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py,Debit Note {0} has been created automatically,Shënimi i Debit {0} është krijuar automatikisht
 apps/erpnext/erpnext/accounts/doctype/payment_order/payment_order.js,Create Payment Entries,Krijoni hyrje në pagesa
 DocType: Supplier,Is Internal Supplier,Është furnizuesi i brendshëm
 DocType: Employee,Create User Permission,Krijo lejen e përdoruesit
@@ -4223,7 +4234,6 @@
 DocType: Journal Entry,Accounting Entries,Entries Kontabilitetit
 DocType: Job Card Time Log,Job Card Time Log,Regjistri i Kohës së Kartës së Punës
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,"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ë."
-apps/erpnext/erpnext/education/doctype/instructor/instructor.py,Please setup Instructor Naming System in Education &gt; Education Settings,Ju lutemi vendosni Sistemin e Emërtimit të Instruktorëve në Arsim&gt; Cilësimet e arsimit
 DocType: Journal Entry,Paid Loan,Kredia e paguar
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py,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
@@ -4240,7 +4250,6 @@
 apps/erpnext/erpnext/templates/pages/projects.html,No time sheets,Nuk ka fletë kohë
 DocType: GoCardless Mandate,GoCardless Customer,Klientë GoCardless
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py,Leave Type {0} cannot be carry-forwarded,"Dërgo Type {0} nuk mund të kryejë, përcillet"
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Item Code &gt; Item Group &gt; Brand,Kodi i Artikullit&gt; Grupi i Artikujve&gt; Marka
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py,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
 DocType: Leave Encashment,Payroll,Payroll
@@ -4352,7 +4361,6 @@
 DocType: Stock Ledger Entry,Actual Qty After Transaction,Qty aktual Pas Transaksionit
 ,Pending SO Items For Purchase Request,Në pritje SO artikuj për Kërkesë Blerje
 apps/erpnext/erpnext/education/doctype/student_admission/student_admission.py,Student Admissions,Pranimet e studentëve
-apps/erpnext/erpnext/accounts/party.py,{0} {1} is disabled,{0} {1} është me aftësi të kufizuara
 DocType: Supplier,Billing Currency,Faturimi Valuta
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py,Extra Large,Shumë i madh
 DocType: Loan,Loan Application,Aplikimi i huasë
@@ -4429,7 +4437,6 @@
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py,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/accounts/doctype/accounting_dimension/accounting_dimension.py,Creating Dimensions...,Krijimi i dimensioneve ...
 apps/erpnext/erpnext/education/doctype/student_group_creation_tool/student_group_creation_tool.py,Student Group Name is mandatory in row {0},Student Group Emri është i detyrueshëm në rresht {0}
-DocType: Customer Credit Limit,Bypass credit limit_check,Anashkaloni limitin e kredisë
 DocType: Homepage,Products to be shown on website homepage,Produktet që do të shfaqet në faqen e internetit
 DocType: HR Settings,Password Policy,Politika e fjalëkalimit
 apps/erpnext/erpnext/setup/doctype/customer_group/customer_group.js,This is a root customer group and cannot be edited.,Ky është një grup të konsumatorëve rrënjë dhe nuk mund të redaktohen.
@@ -4719,6 +4726,7 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py,Row {0}: Advance against Customer must be credit,Row {0}: Advance kundër Customer duhet të jetë krediti
 DocType: Quality Meeting,Quality Meeting,Takim cilësor
 apps/erpnext/erpnext/accounts/doctype/account/account.js,Non-Group to Group,Non-Group Grupit
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,Ju lutemi vendosni Seritë e Emërtimit për {0} përmes Konfigurimit&gt; Cilësimet&gt; Seritë e Emrave
 DocType: Employee,ERPNext User,Përdoruesi ERPNext
 apps/erpnext/erpnext/education/doctype/student_group_creation_tool/student_group_creation_tool.py,Batch is mandatory in row {0},Grumbull është i detyrueshëm në rradhë {0}
 apps/erpnext/erpnext/education/doctype/student_group_creation_tool/student_group_creation_tool.py,Batch is mandatory in row {0},Grumbull është i detyrueshëm në rradhë {0}
@@ -5016,6 +5024,7 @@
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py,No {0} found for Inter Company Transactions.,Jo {0} u gjet për Transaksionet e Ndërmarrjeve Ndër.
 DocType: Travel Itinerary,Rented Car,Makinë me qera
 apps/erpnext/erpnext/public/js/hub/components/profile_dialog.js,About your Company,Për kompaninë tuaj
+apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.js,Show Stock Ageing Data,Shfaq të dhënat e plakjes së aksioneve
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py,Credit To account must be a Balance Sheet account,Kredi në llogarinë duhet të jetë një llogari Bilanci i Gjendjes
 DocType: Donor,Donor,dhurues
 DocType: Global Defaults,Disable In Words,Disable Në fjalë
@@ -5029,8 +5038,10 @@
 DocType: Patient,Patient ID,ID e pacientit
 DocType: Practitioner Schedule,Schedule Name,Orari Emri
 DocType: Currency Exchange,For Buying,Për blerjen
+apps/erpnext/erpnext/setup/default_energy_point_rules.py,On Purchase Order Submission,Për dorëzimin e urdhrit të blerjes
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js,Add All Suppliers,Shto të Gjithë Furnizuesit
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py,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/accounts/doctype/pricing_rule/pricing_rule.js,Customer &gt; Customer Group &gt; Territory,Klienti&gt; Grupi i Klientëve&gt; Territori
 DocType: Tally Migration,Parties,palët
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js,Browse BOM,Shfleto bom
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py,Secured Loans,Kredi të siguruara
@@ -5062,6 +5073,7 @@
 apps/erpnext/erpnext/stock/doctype/item_alternative/item_alternative.py,Not allow to set alternative item for the item {0},Mos lejoni të vendosni elementin alternativ për artikullin {0}
 apps/erpnext/erpnext/hr/doctype/leave_block_list/leave_block_list.py,Date is repeated,Data përsëritet
 apps/erpnext/erpnext/accounts/print_format/payment_receipt_voucher/payment_receipt_voucher.html,Authorized Signatory,Nënshkrues i autorizuar
+apps/erpnext/erpnext/education/doctype/instructor/instructor.py,Please setup Instructor Naming System in Education &gt; Education Settings,Ju lutemi vendosni Sistemin e Emërtimit të Instruktorëve në Arsim&gt; Cilësimet e arsimit
 apps/erpnext/erpnext/regional/doctype/gstr_3b_report/gstr_3b_report.html,Net ITC Available(A) - (B),ITC Neto i disponueshëm (A) - (B)
 apps/erpnext/erpnext/education/doctype/fee_schedule/fee_schedule.js,Create Fees,Krijo tarifa
 DocType: Project,Total Purchase Cost (via Purchase Invoice),Gjithsej Kosto Blerje (nëpërmjet Blerje Faturës)
@@ -5081,6 +5093,7 @@
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.js,Message Sent,Mesazh dërguar
 apps/erpnext/erpnext/accounts/doctype/account/account.py,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/assets/report/fixed_asset_register/fixed_asset_register.py,Vendor Name,Emri i shitësit
 DocType: Quiz Result,Wrong,i gabuar
 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)
@@ -5321,6 +5334,7 @@
 DocType: Stock Settings,Auto Material Request,Auto materiale Kërkesë
 DocType: Woocommerce Settings,API consumer secret,Sekreti i konsumatorit API
 DocType: Delivery Note Item,Available Batch Qty at From Warehouse,Në dispozicion Qty Batch në nga depo
+,Received Qty Amount,Mori shumën sasi
 DocType: Salary Slip,Gross Pay - Total Deduction - Loan Repayment,Gross Pay - Zbritja Total - shlyerjen e kredisë
 DocType: Bank Account,Last Integration Date,Data e fundit e integrimit
 DocType: Expense Claim,Expense Taxes and Charges,Taksat e shpenzimeve dhe tarifat
@@ -5774,6 +5788,8 @@
 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,Please select Qty against item {0},Ju lutem zgjidhni Qty kundër sendit {0}
+apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py,Latest Age,Mosha e fundit
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js,Transfer Material to Supplier,Transferimi materiale të Furnizuesit
 apps/erpnext/erpnext/hr/report/loan_repayment/loan_repayment.py,EMI,EMI
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py,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
@@ -5796,7 +5812,6 @@
 apps/erpnext/erpnext/hr/doctype/employee_benefit_application/employee_benefit_application.py,"An amount of {0} already claimed for the component {1},\
 						 set the amount equal or greater than {2}","Një shumë prej {0} që tashmë kërkohet për komponentin {1}, \ vendosni shumën e barabartë ose më të madhe se {2}"
 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
 DocType: BOM Update Tool,The new BOM after replacement,BOM ri pas zëvendësimit
 ,Point of Sale,Pika e Shitjes
@@ -5915,7 +5930,6 @@
 DocType: Purchase Order Item,Blanket Order Rate,Shkalla e Renditjes së Blankeve
 ,Customer Ledger Summary,Përmbledhja e Librit të Konsumatorëve
 apps/erpnext/erpnext/hooks.py,Certification,vërtetim
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js,Are you sure you want to make debit note?,A jeni i sigurt që doni të bëni shënim debiti?
 DocType: Bank Guarantee,Clauses and Conditions,Klauzola dhe Kushtet
 DocType: Serial No,Creation Document Type,Krijimi Dokumenti Type
 DocType: Amazon MWS Settings,ES,ES
@@ -5953,8 +5967,6 @@
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py,Financial Services,Shërbimet Financiare
 DocType: Student Sibling,Student ID,ID Student
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.js,For Quantity must be greater than zero,Për Sasia duhet të jetë më e madhe se zero
-apps/erpnext/erpnext/hr/doctype/employee_transfer/employee_transfer.py,"Please delete the Employee <a href=""#Form/Employee/{0}"">{0}</a>\
-					to cancel this document","Ju lutemi fshini punonjësin <a href=""#Form/Employee/{0}"">{0}</a> \ për të anulluar këtë dokument"
 apps/erpnext/erpnext/config/projects.py,Types of activities for Time Logs,Llojet e aktiviteteve për Koha Shkrime
 DocType: Opening Invoice Creation Tool,Sales,Shitjet
 DocType: Stock Entry Detail,Basic Amount,Shuma bazë
@@ -6033,6 +6045,7 @@
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py,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,Send Supplier Emails,Dërgo email furnizuesi
+DocType: Asset Movement,ACC-ASM-.YYYY.-,ACC-ASM-.YYYY.-
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py,"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
 apps/erpnext/erpnext/hr/doctype/employee_onboarding/employee_onboarding.py,Submit this to create the Employee record,Dërgo këtë për të krijuar rekordin e Punonjësit
@@ -6110,7 +6123,6 @@
 DocType: Sales Team,Contact No.,Kontakt Nr
 apps/erpnext/erpnext/templates/includes/cart/cart_address.html,Billing Address is same as Shipping Address,Adresa e Faturimit është e njëjtë me Adresa e Transportit
 DocType: Bank Reconciliation,Payment Entries,Entries pagesës
-apps/erpnext/erpnext/erpnext_integrations/doctype/shopify_settings/shopify_settings.py,Access token or Shopify URL missing,Qasja e shenjës ose Shopify URL mungon
 DocType: Location,Latitude,gjerësi
 DocType: Work Order,Scrap Warehouse,Scrap Magazina
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py,"Warehouse required at Row No {0}, please set default warehouse for the item {1} for the company {2}","Magazina e kërkuar në Rreshtin Nr {0}, ju lutemi vendosni magazinën e parazgjedhur për artikullin {1} për kompaninë {2}"
@@ -6152,7 +6164,6 @@
 DocType: Job Offer Term,Value / Description,Vlera / Përshkrim
 apps/erpnext/erpnext/controllers/accounts_controller.py,"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
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js,Are you sure you want to make credit note?,A jeni i sigurt që doni të bëni shënim krediti?
 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,Debit and Credit not equal for {0} #{1}. Difference is {2}.,Debi dhe Kredi jo të barabartë për {0} # {1}. Dallimi është {2}.
@@ -6275,6 +6286,7 @@
 DocType: Purchase Invoice,Taxes and Charges Added,Taksat dhe Tarifat Shtuar
 apps/erpnext/erpnext/assets/doctype/asset/asset.py,Depreciation Row {0}: Next Depreciation Date cannot be before Available-for-use Date,Rënia e zhvlerësimit {0}: Data e zhvlerësimit tjetër nuk mund të jetë para datës së disponueshme për përdorim
 ,Sales Funnel,Gyp Sales
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Item Code &gt; Item Group &gt; Brand,Kodi i Artikullit&gt; Grupi i Artikujve&gt; Marka
 apps/erpnext/erpnext/setup/doctype/company/company.py,Abbreviation is mandatory,Shkurtim është i detyrueshëm
 DocType: Project,Task Progress,Task Progress
 apps/erpnext/erpnext/templates/includes/navbar/navbar_items.html,Cart,Qerre
@@ -6515,6 +6527,7 @@
 DocType: Employee Grade,Employee Grade,Shkalla e punonjësve
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py,Piecework,Punë me copë
 DocType: GSTR 3B Report,June,qershor
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Supplier &gt; Supplier Type,Furnizuesi&gt; Lloji i furnizuesit
 DocType: Share Balance,From No,Nga Nr
 DocType: Shift Type,Early Exit Grace Period,Periudha e Hirit të Daljes së Hershme
 DocType: Task,Actual Time (in Hours),Koha aktuale (në orë)
@@ -6986,6 +6999,7 @@
 DocType: Quality Inspection Reading,Quality Inspection Reading,Inspektimi Leximi Cilësia
 apps/erpnext/erpnext/stock/doctype/stock_settings/stock_settings.py,`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/stock/report/stock_balance/stock_balance.py,Earliest Age,Mosha e hershme
 apps/erpnext/erpnext/utilities/user_progress.py,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.
 DocType: Quality Goal,Revision,rishikim
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js,Healthcare Services,Sherbime Shendetesore
@@ -7029,6 +7043,7 @@
 apps/erpnext/erpnext/healthcare/doctype/patient_encounter/patient_encounter.js,Schedule Discharge,Orari Shkarkimi
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py,Cheques and Deposits incorrectly cleared,Çeqet dhe Depozitat pastruar gabimisht
 DocType: Homepage Section Card,Homepage Section Card,Karta e Seksionit të Faqes
+,Amount To Be Billed,Shuma që do të faturohet
 apps/erpnext/erpnext/accounts/doctype/account/account.py,Account {0}: You can not assign itself as parent account,Llogaria {0}: Ju nuk mund të caktojë veten si llogari prind
 DocType: Purchase Invoice Item,Price List Rate,Lista e Çmimeve Rate
 apps/erpnext/erpnext/utilities/activation.py,Create customer quotes,Krijo kuotat konsumatorëve
@@ -7081,6 +7096,7 @@
 DocType: Supplier Scorecard Criteria,Supplier Scorecard Criteria,Kriteret e Scorecard Furnizuesit
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py,Please select Start Date and End Date for Item {0},"Ju lutem, përzgjidhni Data e Fillimit Data e Përfundimit Kohëzgjatja për Item {0}"
 DocType: Maintenance Schedule,MAT-MSH-.YYYY.-,MAT-MSH-.YYYY.-
+,Amount to Receive,Shuma për të marrë
 apps/erpnext/erpnext/education/doctype/student_group_creation_tool/student_group_creation_tool.py,Course is mandatory in row {0},Kursi është i detyrueshëm në rresht {0}
 apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py,From date can not be greater than than To date,Nga data nuk mund të jetë më e madhe se ajo deri më sot
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py,To date cannot be before from date,Deri më sot nuk mund të jetë e para nga data e
@@ -7530,6 +7546,7 @@
 DocType: Delivery Note,Print Without Amount,Print Pa Shuma
 apps/erpnext/erpnext/accounts/report/asset_depreciation_ledger/asset_depreciation_ledger.py,Depreciation Date,Zhvlerësimi Date
 ,Work Orders in Progress,Rendi i punës në vazhdim
+DocType: Customer Credit Limit,Bypass Credit Limit Check,Kontrolli i Kufirit të Kreditit të Bypass-it
 DocType: Issue,Support Team,Mbështetje Ekipi
 apps/erpnext/erpnext/stock/report/batch_item_expiry_status/batch_item_expiry_status.py,Expiry (In Days),Skadimit (në ditë)
 DocType: Appraisal,Total Score (Out of 5),Rezultati i përgjithshëm (nga 5)
@@ -7713,6 +7730,7 @@
 DocType: Sales Invoice,Customer GSTIN,GSTIN Customer
 DocType: Crop Cycle,List of diseases detected on the field. When selected it'll automatically add a list of tasks to deal with the disease ,"Lista e sëmundjeve të zbuluara në terren. Kur zgjidhet, do të shtojë automatikisht një listë të detyrave për t&#39;u marrë me sëmundjen"
 apps/erpnext/erpnext/manufacturing/page/bom_comparison_tool/bom_comparison_tool.js,BOM 1,BOM 1
+apps/erpnext/erpnext/assets/report/fixed_asset_register/fixed_asset_register.py,Asset Id,Id e pasurisë
 apps/erpnext/erpnext/healthcare/doctype/healthcare_service_unit/healthcare_service_unit.js,This is a root healthcare service unit and cannot be edited.,Kjo është njësi e shërbimit të kujdesit shëndetësor dhe nuk mund të redaktohet.
 DocType: Asset Repair,Repair Status,Gjendja e Riparimit
 apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.js,"Requested Qty: Quantity requested for purchase, but not ordered.","Sasia e kërkuar: Sasia e kërkuar për blerje, por jo e porositur."
diff --git a/erpnext/translations/sr.csv b/erpnext/translations/sr.csv
index 6f9ab83..4bb3c26 100644
--- a/erpnext/translations/sr.csv
+++ b/erpnext/translations/sr.csv
@@ -289,7 +289,6 @@
 DocType: Loan,Repay Over Number of Periods,Отплатити Овер број периода
 apps/erpnext/erpnext/manufacturing/report/bom_stock_report/bom_stock_report.py,Quantity to Produce can not be less than Zero,Количина за производњу не може бити мања од нуле
 DocType: Stock Entry,Additional Costs,Додатни трошкови
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Customer &gt; Customer Group &gt; Territory,Купац&gt; Група купаца&gt; Територија
 apps/erpnext/erpnext/accounts/doctype/account/account.py,Account with existing transaction can not be converted to group.,Счет с существующей сделки не могут быть преобразованы в группы .
 DocType: Lead,Product Enquiry,Производ Енкуири
 DocType: Education Settings,Validate Batch for Students in Student Group,Потврди Батцх за студенте у Студентском Групе
@@ -587,6 +586,7 @@
 DocType: Healthcare Settings,Create documents for sample collection,Креирајте документе за сакупљање узорка
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py,Payment against {0} {1} cannot be greater than Outstanding Amount {2},Плаћање по {0} {1} не може бити већи од преосталог износа {2}
 apps/erpnext/erpnext/patches/v11_0/add_healthcare_service_unit_tree_root.py,All Healthcare Service Units,Све јединице за здравствену заштиту
+apps/erpnext/erpnext/setup/default_energy_point_rules.py,On Converting Opportunity,О претварању могућности
 DocType: Bank Account,Address HTML,Адреса ХТМЛ
 DocType: Lead,Mobile No.,Мобиле Но
 apps/erpnext/erpnext/selling/doctype/pos_closing_voucher/closing_voucher_details.html,Mode of Payments,Начин плаћања
@@ -651,7 +651,6 @@
 DocType: Accounting Dimension,Dimension Name,Име димензије
 apps/erpnext/erpnext/healthcare/setup.py,Resistant,Отпорно
 apps/erpnext/erpnext/hotels/doctype/hotel_room_reservation/hotel_room_reservation.py,Please set Hotel Room Rate on {},Молимо подесите Хотел Роом Рате на {}
-apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py,Please setup numbering series for Attendance via Setup &gt; Numbering Series,Молимо вас да подесите серију нумерирања за Аттенданце путем Подешавање&gt; Серија нумерирања
 DocType: Journal Entry,Multi Currency,Тема Валута
 DocType: Bank Statement Transaction Invoice Item,Invoice Type,Фактура Тип
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py,Valid from date must be less than valid upto date,Важи од датума мора бити мање од важећег до датума
@@ -769,6 +768,7 @@
 apps/erpnext/erpnext/accounts/page/pos/pos.js,Create a new Customer,Креирајте нови клијента
 apps/erpnext/erpnext/non_profit/report/expiring_memberships/expiring_memberships.py,Expiring On,Истиче се
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,"If multiple Pricing Rules continue to prevail, users are asked to set Priority manually to resolve conflict.","Ако више Цене Правила наставити да превлада, корисници су упитани да подесите приоритет ручно да реши конфликт."
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js,Purchase Return,Куповина Ретурн
 apps/erpnext/erpnext/utilities/activation.py,Create Purchase Orders,Створити куповини Ордерс
 ,Purchase Register,Куповина Регистрација
 apps/erpnext/erpnext/healthcare/doctype/patient/patient.py,Patient not found,Пацијент није пронађен
@@ -784,7 +784,6 @@
 DocType: Location,Area UOM,Област УОМ
 apps/erpnext/erpnext/manufacturing/doctype/workstation/workstation.py,Workstation is closed on the following dates as per Holiday List: {0},Радна станица је затворена на следеће датуме по Холидаи Лист: {0}
 apps/erpnext/erpnext/selling/page/sales_funnel/sales_funnel.py,Opportunities,Могућности
-apps/erpnext/erpnext/www/all-products/index.html,Clear filters,Избриши филтере
 DocType: Lab Test Template,Single,Самац
 DocType: Compensatory Leave Request,Work From Date,Рад са датума
 DocType: Salary Slip,Total Loan Repayment,Укупно Отплата кредита
@@ -828,6 +827,7 @@
 apps/erpnext/erpnext/education/doctype/program_enrollment_tool/program_enrollment_tool.py,Mandatory field - Academic Year,Обавезно поље - школска година
 apps/erpnext/erpnext/education/doctype/program_enrollment_tool/program_enrollment_tool.py,Mandatory field - Academic Year,Обавезно поље - школска година
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py,{0} {1} is not associated with {2} {3},{0} {1} није повезан са {2} {3}
+DocType: Opportunity,Converted By,Цонвертед Би
 apps/erpnext/erpnext/public/js/hub/components/ReviewArea.vue,You need to login as a Marketplace User before you can add any reviews.,"Да бисте могли да додате било коју рецензију, морате се пријавити као корисник Маркетплацеа."
 apps/erpnext/erpnext/manufacturing/doctype/job_card/job_card.py,Row {0} : Operation is required against the raw material item {1},Ред {0}: Операција је неопходна према елементу сировог материјала {1}
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py,Please set default payable account for the company {0},Молимо поставите подразумевани се плаћају рачун за предузећа {0}
@@ -853,6 +853,8 @@
 DocType: BOM,Work Order,Радни налог
 DocType: Sales Invoice,Total Qty,Укупно ком
 apps/erpnext/erpnext/education/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py,Guardian2 Email ID,Гуардиан2 маил ИД
+apps/erpnext/erpnext/hr/doctype/employee_transfer/employee_transfer.py,"Please delete the Employee <a href=""#Form/Employee/{0}"">{0}</a>\
+					to cancel this document","Избришите запосленика <a href=""#Form/Employee/{0}"">{0}</a> \ да бисте отказали овај документ"
 DocType: Item,Show in Website (Variant),Схов на сајту (Варијанта)
 DocType: Employee,Health Concerns,Здравље Забринутост
 DocType: Payroll Entry,Select Payroll Period,Изабери периода исплате
@@ -913,7 +915,6 @@
 DocType: Codification Table,Codification Table,Табела кодификације
 DocType: Timesheet Detail,Hrs,хрс
 apps/erpnext/erpnext/manufacturing/page/bom_comparison_tool/bom_comparison_tool.js,Changes in {0},Измене у {0}
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js,Please select Company,Молимо изаберите Цомпани
 DocType: Employee Skill,Employee Skill,Вештина запослених
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.js,Difference Account,Разлика налог
 DocType: Pricing Rule,Discount on Other Item,Попуст на други артикл
@@ -982,6 +983,7 @@
 DocType: BOM,Operating Cost,Оперативни трошкови
 DocType: Crop,Produced Items,Произведене ставке
 DocType: Bank Statement Transaction Entry,Match Transaction to Invoices,Матцх Трансацтион то Инвоицес
+apps/erpnext/erpnext/erpnext_integrations/exotel_integration.py,Error in Exotel incoming call,Грешка у долазном позиву у Екотел
 DocType: Sales Order Item,Gross Profit,Укупан профит
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js,Unblock Invoice,Одблокирај фактуру
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py,Increment cannot be 0,Повећање не може бити 0
@@ -1196,6 +1198,7 @@
 DocType: Activity Cost,Activity Type,Активност Тип
 DocType: Request for Quotation,For individual supplier,За вршиоца
 DocType: BOM Operation,Base Hour Rate(Company Currency),База час курс (Фирма валута)
+,Qty To Be Billed,Количина за наплату
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py,Delivered Amount,Деливеред Износ
 apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.js,Reserved Qty for Production: Raw materials quantity to make manufacturing items.,Количина резервисаног за производњу: Количина сировина за израду производних предмета.
 DocType: Loyalty Point Entry Redemption,Redemption Date,Датум откупљења
@@ -1317,7 +1320,7 @@
 apps/erpnext/erpnext/education/doctype/student_group/student_group.py,Please select Program,Молимо одаберите програм
 apps/erpnext/erpnext/education/doctype/student_group/student_group.py,Please select Program,Молимо одаберите програм
 DocType: Project,Estimated Cost,Процењени трошкови
-DocType: Request for Quotation,Link to material requests,Линк материјалним захтевима
+DocType: Supplier Quotation,Link to material requests,Линк материјалним захтевима
 apps/erpnext/erpnext/public/js/hub/pages/Publish.vue,Publish,Објави
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py,Aerospace,ваздушно-космички простор
 ,Fichier des Ecritures Comptables [FEC],Фицхиер дес Ецритурес Цомптаблес [ФЕЦ]
@@ -1330,6 +1333,7 @@
 apps/erpnext/erpnext/utilities/transaction_base.py,Invalid Posting Time,Неисправно време слања порука
 DocType: Salary Component,Condition and Formula,Услов и формула
 DocType: Lead,Campaign Name,Назив кампање
+apps/erpnext/erpnext/setup/default_energy_point_rules.py,On Task Completion,По завршетку задатка
 apps/erpnext/erpnext/hr/doctype/compensatory_leave_request/compensatory_leave_request.py,There is no leave period in between {0} and {1},Нема периода одласка између {0} и {1}
 DocType: Fee Validity,Healthcare Practitioner,Здравствени лекар
 DocType: Hotel Room,Capacity,Капацитет
@@ -1694,7 +1698,6 @@
 DocType: Quality Feedback Template,Quality Feedback Template,Квалитетни образац за повратне информације
 apps/erpnext/erpnext/config/education.py,LMS Activity,ЛМС активност
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py,Internet Publishing,Интернет издаваштво
-DocType: Prescription Duration,Number,Број
 apps/erpnext/erpnext/accounts/doctype/opening_invoice_creation_tool/opening_invoice_creation_tool.js,Creating {0} Invoice,Креирање {0} фактуре
 DocType: Medical Code,Medical Code Standard,Медицал Цоде Стандард
 DocType: Soil Texture,Clay Composition (%),Глина састав (%)
@@ -1769,6 +1772,7 @@
 DocType: Support Settings,Get Started Sections,Започните секције
 DocType: Lead,CRM-LEAD-.YYYY.-,ЦРМ-ЛЕАД-.ИИИИ.-
 DocType: Invoice Discounting,Sanctioned,санкционисан
+,Base Amount,Основни износ
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.js,Total Contribution Amount: {0},Укупан износ доприноса: {0}
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py,Row #{0}: Please specify Serial No for Item {1},Ред # {0}: Наведите Сериал но за пункт {1}
 DocType: Payroll Entry,Salary Slips Submitted,Посланице за плате
@@ -1991,6 +1995,7 @@
 DocType: Accounting Dimension,Dimension Defaults,Подразумеване димензије
 apps/erpnext/erpnext/crm/report/prospects_engaged_but_not_converted/prospects_engaged_but_not_converted.js,Minimum Lead Age (Days),Минималну предност (дани)
 apps/erpnext/erpnext/crm/report/prospects_engaged_but_not_converted/prospects_engaged_but_not_converted.js,Minimum Lead Age (Days),Минималну предност (дани)
+apps/erpnext/erpnext/assets/report/fixed_asset_register/fixed_asset_register.py,Available For Use Date,Датум употребе
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py,All BOMs,sve БОМ
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js,Create Inter Company Journal Entry,Направите унос часописа Интер Цомпани
 DocType: Company,Parent Company,Матична компанија
@@ -2055,6 +2060,7 @@
 ,IRS 1099,ИРС 1099
 DocType: Salary Slip,Leave Without Pay,Оставите Без плате
 DocType: Payment Request,Outward,Напољу
+apps/erpnext/erpnext/setup/default_energy_point_rules.py,On {0} Creation,На {0} Стварање
 apps/erpnext/erpnext/regional/doctype/gstr_3b_report/gstr_3b_report.html,State/UT Tax,Порез на државну територију
 ,Trial Balance for Party,Претресно Разлика за странке
 ,Gross and Net Profit Report,Извештај о бруто и нето добити
@@ -2172,6 +2178,7 @@
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js,Make Stock Entry,Унесите залихе
 DocType: Hotel Room Reservation,Hotel Reservation User,Резервација корисника хотела
 apps/erpnext/erpnext/projects/doctype/project/project.js,Set Status,Подесите статус
+apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py,Please setup numbering series for Attendance via Setup &gt; Numbering Series,Молимо вас да подесите серију нумерирања за Аттенданце путем Подешавање&gt; Серија бројања
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py,Please select prefix first,"Пожалуйста, выберите префикс первым"
 DocType: Contract,Fulfilment Deadline,Рок испуњења
 apps/erpnext/erpnext/public/js/hub/pages/Home.vue,Near you,Близу вас
@@ -2187,6 +2194,7 @@
 DocType: Announcement,All Students,Сви студенти
 apps/erpnext/erpnext/assets/doctype/asset/asset.py,Item {0} must be a non-stock item,Итем {0} мора бити нон-лагеру предмета
 apps/erpnext/erpnext/stock/doctype/batch/batch.js,View Ledger,Погледај Леџер
+DocType: Cost Center,Lft,ЛФТ
 DocType: Grading Scale,Intervals,интервали
 DocType: Bank Statement Transaction Entry,Reconciled Transactions,Усклађене трансакције
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py,Earliest,Најраније
@@ -2302,6 +2310,7 @@
 apps/erpnext/erpnext/hr/doctype/employee_benefit_application/employee_benefit_application.py,As per your assigned Salary Structure you cannot apply for benefits,Према вашој додељеној структури зарада не можете се пријавити за накнаде
 apps/erpnext/erpnext/stock/doctype/item/item.py,Website Image should be a public file or website URL,Сајт Слика треба да буде јавни фајл или УРЛ веб-сајта
 DocType: Purchase Invoice Item,BOM,БОМ
+apps/erpnext/erpnext/stock/doctype/item/item.py,Duplicate entry in Manufacturers table,Дупликат уноса у табели произвођача
 apps/erpnext/erpnext/setup/doctype/item_group/item_group.js,This is a root item group and cannot be edited.,То јекорен ставка група и не може се мењати .
 apps/erpnext/erpnext/accounts/doctype/account/account.js,Merge,Споји се
 DocType: Journal Entry Account,Purchase Order,Налог за куповину
@@ -2447,7 +2456,6 @@
 DocType: Asset,Depreciation Schedules,Амортизација Распоред
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.js,Create Sales Invoice,Направите фактуру продаје
 apps/erpnext/erpnext/regional/doctype/gstr_3b_report/gstr_3b_report.html,Ineligible ITC,Неподобан ИТЦ
-apps/erpnext/erpnext/erpnext_integrations/doctype/shopify_settings/shopify_settings.py,"Support for public app is deprecated. Please setup private app, for more details refer user manual","Подршка за јавну апликацију је застарјела. Молимо да подесите приватну апликацију, за више детаља погледајте корисничко упутство"
 DocType: Task,Dependent Tasks,Зависни задаци
 apps/erpnext/erpnext/regional/report/gstr_1/gstr_1.py,Following accounts might be selected in GST Settings:,Следећи налоги могу бити изабрани у ГСТ Подешавања:
 apps/erpnext/erpnext/manufacturing/report/bom_stock_report/bom_stock_report.js,Quantity to Produce,Количина за производњу
@@ -2700,6 +2708,7 @@
 DocType: Water Analysis,Container,Контејнер
 apps/erpnext/erpnext/regional/report/gstr_1/gstr_1.py,Please set valid GSTIN No. in Company Address,Молимо вас да подесите важећи ГСТИН број на адреси компаније
 apps/erpnext/erpnext/education/utils.py,Student {0} - {1} appears Multiple times in row {2} & {3},Студент {0} - {1} Изгледа више пута у низу {2} &amp; {3}
+apps/erpnext/erpnext/selling/doctype/customer/customer.py,Following fields are mandatory to create address:,Следећа поља су обавезна за креирање адресе:
 DocType: Item Alternative,Two-way,Двосмерно
 DocType: Item,Manufacturers,Произвођачи
 apps/erpnext/erpnext/accounts/deferred_revenue.py,Error while processing deferred accounting for {0},Грешка током обраде одгођеног рачуноводства за {0}
@@ -2775,9 +2784,9 @@
 DocType: Employee,HR-EMP-,ХР-ЕМП-
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py,User {0} doesn't have any default POS Profile. Check Default at Row {1} for this User.,Корисник {0} нема подразумевани ПОС профил. Провјерите подразумевану вредност у редоследу {1} за овог корисника.
 DocType: Quality Meeting Minutes,Quality Meeting Minutes,Записници са квалитетом састанка
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Supplier &gt; Supplier Type,Добављач&gt; врста добављача
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py,Employee Referral,Упућивање запослених
 DocType: Student Group,Set 0 for no limit,Сет 0 без ограничења
+DocType: Cost Center,rgt,ргт
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py,The day(s) on which you are applying for leave are holidays. You need not apply for leave.,Дан (и) на коју се пријављујете за дозволу су празници. Не морате пријавити за одмор.
 DocType: Customer,Primary Address and Contact Detail,Примарна адреса и контакт детаљи
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.js,Resend Payment Email,Поново плаћања Емаил
@@ -2887,7 +2896,6 @@
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py,Against Supplier Invoice {0} dated {1},Против добављача Фактура {0} {1} од
 DocType: Customer,Default Price List,Уобичајено Ценовник
 apps/erpnext/erpnext/assets/doctype/asset/asset.py,Asset Movement record {0} created,Кретање средство запис {0} је направљена
-apps/erpnext/erpnext/utilities/page/leaderboard/leaderboard.js,No items found.,Нема пронађених предмета.
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py,You cannot delete Fiscal Year {0}. Fiscal Year {0} is set as default in Global Settings,Ви не можете брисати Фискална година {0}. Фискална {0} Година је постављен као подразумевани у глобалним поставкама
 DocType: Share Transfer,Equity/Liability Account,Рачун капитала / обавеза
 apps/erpnext/erpnext/setup/doctype/customer_group/customer_group.py,A customer with the same name already exists,Клијент са истим именом већ постоји
@@ -2903,6 +2911,7 @@
 apps/erpnext/erpnext/selling/doctype/customer/customer.py,Credit limit has been crossed for customer {0} ({1}/{2}),Кредитни лимит је прешао за клијента {0} ({1} / {2})
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py,Customer required for 'Customerwise Discount',"Клиент требуется для "" Customerwise Скидка """
 apps/erpnext/erpnext/config/accounting.py,Update bank payment dates with journals.,Ажурирање банка плаћање датира са часописима.
+,Billed Qty,Количина рачуна
 apps/erpnext/erpnext/stock/doctype/item/item_dashboard.py,Pricing,Цене
 DocType: Employee,Attendance Device ID (Biometric/RF tag ID),ИД уређаја посетилаца (ИД биометријске / РФ ознаке)
 DocType: Quotation,Term Details,Орочена Детаљи
@@ -2926,6 +2935,7 @@
 DocType: Share Transfer,Asset Account,Рачун имовине
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js,New release date should be in the future,Нови датум изласка требао би бити у будућности
 DocType: Purchase Invoice,End date of current invoice's period,Крајњи датум периода актуелне фактуре за
+apps/erpnext/erpnext/hr/doctype/employee/employee.py,Please setup Employee Naming System in Human Resource &gt; HR Settings,Молимо поставите систем именовања запосленика у људским ресурсима&gt; ХР подешавања
 DocType: Lab Test,Technician Name,Име техничара
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py,"Cannot ensure delivery by Serial No as \
 					Item {0} is added with and without Ensure Delivery by \
@@ -2933,6 +2943,7 @@
 DocType: Accounts Settings,Unlink Payment on Cancellation of Invoice,Унлинк плаћања о отказивању рачуна
 DocType: Bank Reconciliation,From Date,Од датума
 apps/erpnext/erpnext/hr/doctype/vehicle_log/vehicle_log.py,Current Odometer reading entered should be greater than initial Vehicle Odometer {0},Тренутни читање Пробег ушао треба да буде већа од почетне километраже возила {0}
+,Purchase Order Items To Be Received or Billed,Купите ставке налога за примање или наплату
 DocType: Restaurant Reservation,No Show,Но Схов
 apps/erpnext/erpnext/regional/india/utils.py,You must be a registered supplier to generate e-Way Bill,Морате бити регистровани добављач да бисте могли да генеришете е-Ваи Билл
 DocType: Shipping Rule Country,Shipping Rule Country,Достава Правило Земља
@@ -2975,6 +2986,7 @@
 apps/erpnext/erpnext/templates/generators/item/item_add_to_cart.html,View in Cart,Погледај у корпу
 DocType: Employee Checkin,Shift Actual Start,Стварни почетак промјене
 DocType: Tally Migration,Is Day Book Data Imported,Увоз података о дневној књизи
+,Purchase Order Items To Be Received or Billed1,Купопродајне ставке које треба примити или наплатити1
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py,Marketing Expenses,Маркетинговые расходы
 apps/erpnext/erpnext/stock/doctype/pick_list/pick_list.py,{0} units of {1} is not available.,{0} јединица од {1} није доступна.
 ,Item Shortage Report,Ставка о несташици извештај
@@ -3201,7 +3213,6 @@
 apps/erpnext/erpnext/public/js/call_popup/call_popup.js,View all issues from {0},Прикажи сва издања од {0}
 DocType: Quality Inspection,MAT-QA-.YYYY.-,МАТ-КА-ИИИИ.-
 DocType: Quality Meeting Table,Quality Meeting Table,Стол за састанке квалитета
-apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,Молимо поставите Наминг Сериес за {0} путем Подешавање&gt; Подешавања&gt; Именовање серије
 apps/erpnext/erpnext/templates/pages/help.html,Visit the forums,Посетите форум
 DocType: Student,Student Mobile Number,Студент Број мобилног телефона
 DocType: Item,Has Variants,Хас Варијанте
@@ -3345,6 +3356,7 @@
 ,Campaign Efficiency,kampanja Ефикасност
 ,Campaign Efficiency,kampanja Ефикасност
 DocType: Discussion,Discussion,дискусија
+apps/erpnext/erpnext/setup/default_energy_point_rules.py,On Sales Order Submission,Подношење налога за продају
 DocType: Bank Transaction,Transaction ID,ИД трансакције
 DocType: Payroll Entry,Deduct Tax For Unsubmitted Tax Exemption Proof,Порез на одбитку за неоснован доказ о ослобађању од пореза
 DocType: Volunteer,Anytime,Увек
@@ -3352,7 +3364,6 @@
 DocType: Employee Tax Exemption Proof Submission,Employee Tax Exemption Proof Submission,Поднесак доказа ослобађања од пореза на раднике
 DocType: Patient,Surgical History,Хируршка историја
 DocType: Bank Statement Settings Item,Mapped Header,Маппед Хеадер
-apps/erpnext/erpnext/hr/doctype/employee/employee.py,Please setup Employee Naming System in Human Resource &gt; HR Settings,Молимо поставите систем именовања запосленика у људским ресурсима&gt; ХР подешавања
 DocType: Employee,Resignation Letter Date,Оставка Писмо Датум
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Pricing Rules are further filtered based on quantity.,Цене Правила се даље филтрира на основу количине.
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py,Please set the Date Of Joining for employee {0},Подесите датум приступања за запосленог {0}
@@ -3367,6 +3378,7 @@
 DocType: Bank Statement Settings,Mapped Items,Маппед Итемс
 DocType: Amazon MWS Settings,IT,ТО
 DocType: Chapter,Chapter,Поглавље
+,Fixed Asset Register,Регистар фиксне имовине
 apps/erpnext/erpnext/utilities/user_progress.py,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,Select BOM and Qty for Production,Изабери БОМ и Кти за производњу
@@ -3502,7 +3514,6 @@
 apps/erpnext/erpnext/templates/emails/reorder_item.html,Following Material Requests have been raised automatically based on Item's re-order level,Следећи материјал захтеви су аутоматски подигнута на основу нивоа поновног реда ставке
 apps/erpnext/erpnext/controllers/accounts_controller.py,Account {0} is invalid. Account Currency must be {1},Рачун {0} је неважећа. Рачун валута мора да буде {1}
 apps/erpnext/erpnext/hr/doctype/salary_structure_assignment/salary_structure_assignment.py,From Date {0} cannot be after employee's relieving Date {1},Од Датум {0} не може бити након отпуштања запосленог Датум {1}
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py,Debit Note {0} has been created automatically,Напомена о задужењу {0} креирана је аутоматски
 apps/erpnext/erpnext/accounts/doctype/payment_order/payment_order.js,Create Payment Entries,Креирајте уплате за плаћање
 DocType: Supplier,Is Internal Supplier,Је унутрашњи добављач
 DocType: Employee,Create User Permission,Креирајте дозволу корисника
@@ -4064,7 +4075,6 @@
 DocType: Project User,Project Status,Статус пројекта
 DocType: UOM,Check this to disallow fractions. (for Nos),Проверите то тако да одбаци фракција. (За НОС)
 DocType: Student Admission Program,Naming Series (for Student Applicant),Именовање серије (за Студент подносиоца захтева)
-apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.py,UOM Conversion factor ({0} -&gt; {1}) not found for item: {2},Фактор конверзије УОМ ({0} -&gt; {1}) није пронађен за ставку: {2}
 apps/erpnext/erpnext/hr/doctype/retention_bonus/retention_bonus.py,Bonus Payment Date cannot be a past date,Датум плаћања бонуса не може бити прошњи датум
 DocType: Travel Request,Copy of Invitation/Announcement,Копија позива / обавештења
 DocType: Practitioner Service Unit Schedule,Practitioner Service Unit Schedule,Распоред јединица службе лекара
@@ -4233,6 +4243,7 @@
 apps/erpnext/erpnext/utilities/user_progress.py,Setup Company,Сетуп Цомпани
 ,Lab Test Report,Извештај лабораторије
 DocType: Employee Benefit Application,Employee Benefit Application,Апплицатион Емплоиее Бенефит
+apps/erpnext/erpnext/accounts/doctype/invoice_discounting/invoice_discounting.py,Row({0}): {1} is already discounted in {2},Ред ({0}): {1} је већ снижен у {2}
 apps/erpnext/erpnext/hr/doctype/additional_salary/additional_salary.py,Additional Salary Component Exists.,Постоје додатне компоненте зараде.
 DocType: Purchase Invoice,Unregistered,Нерегистровано
 DocType: Student Applicant,Application Date,Датум апликација
@@ -4312,7 +4323,6 @@
 DocType: Journal Entry,Accounting Entries,Аццоунтинг уноси
 DocType: Job Card Time Log,Job Card Time Log,Временски дневник радне картице
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,"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;."
-apps/erpnext/erpnext/education/doctype/instructor/instructor.py,Please setup Instructor Naming System in Education &gt; Education Settings,Поставите систем именовања инструктора у Образовање&gt; Подешавања образовања
 DocType: Journal Entry,Paid Loan,Паид Лоан
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py,Duplicate Entry. Please check Authorization Rule {0},"Дублировать запись. Пожалуйста, проверьте Авторизация Правило {0}"
 DocType: Journal Entry Account,Reference Due Date,Референтни датум рока
@@ -4329,7 +4339,6 @@
 apps/erpnext/erpnext/templates/pages/projects.html,No time sheets,Но Тиме листова
 DocType: GoCardless Mandate,GoCardless Customer,ГоЦардлесс купац
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py,Leave Type {0} cannot be carry-forwarded,Оставите Типе {0} не може носити-прослеђен
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Item Code &gt; Item Group &gt; Brand,Код артикла&gt; Група артикала&gt; Марка
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py,Maintenance Schedule is not generated for all the items. Please click on 'Generate Schedule',"График обслуживания не генерируется для всех элементов . Пожалуйста, нажмите на кнопку "" Generate Расписание """
 ,To Produce,за производњу
 DocType: Leave Encashment,Payroll,платни списак
@@ -4445,7 +4454,6 @@
 DocType: Stock Ledger Entry,Actual Qty After Transaction,Стварна Кол Након трансакције
 ,Pending SO Items For Purchase Request,Чекању СО Артикли за куповину захтеву
 apps/erpnext/erpnext/education/doctype/student_admission/student_admission.py,Student Admissions,Студент Пријемни
-apps/erpnext/erpnext/accounts/party.py,{0} {1} is disabled,{0} {1} је онемогућен
 DocType: Supplier,Billing Currency,Обрачун Валута
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py,Extra Large,Екстра велики
 DocType: Loan,Loan Application,Кредитног захтева
@@ -4522,7 +4530,6 @@
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py,Only Leave Applications with status 'Approved' and 'Rejected' can be submitted,Остави само Апликације које имају статус &quot;Одобрено&quot; и &quot;Одбијен&quot; могу се доставити
 apps/erpnext/erpnext/accounts/doctype/accounting_dimension/accounting_dimension.py,Creating Dimensions...,Стварање димензија ...
 apps/erpnext/erpnext/education/doctype/student_group_creation_tool/student_group_creation_tool.py,Student Group Name is mandatory in row {0},Студент Име групе је обавезно у реду {0}
-DocType: Customer Credit Limit,Bypass credit limit_check,Заобиђите лимит_цхецк кредита
 DocType: Homepage,Products to be shown on website homepage,Производи који се приказује на интернет страницама
 DocType: HR Settings,Password Policy,Политика лозинке
 apps/erpnext/erpnext/setup/doctype/customer_group/customer_group.js,This is a root customer group and cannot be edited.,То јекорен група купац и не може се мењати .
@@ -4828,6 +4835,7 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py,Row {0}: Advance against Customer must be credit,Ред {0}: Унапред против Купца мора бити кредит
 DocType: Quality Meeting,Quality Meeting,Састанак квалитета
 apps/erpnext/erpnext/accounts/doctype/account/account.js,Non-Group to Group,Нон-групе до групе
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,Молимо поставите Наминг Сериес за {0} путем Подешавање&gt; Подешавања&gt; Именовање серије
 DocType: Employee,ERPNext User,ЕРПНект Усер
 apps/erpnext/erpnext/education/doctype/student_group_creation_tool/student_group_creation_tool.py,Batch is mandatory in row {0},Серија је обавезна у реду {0}
 apps/erpnext/erpnext/education/doctype/student_group_creation_tool/student_group_creation_tool.py,Batch is mandatory in row {0},Серија је обавезна у реду {0}
@@ -5127,6 +5135,7 @@
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py,No {0} found for Inter Company Transactions.,Не {0} пронађено за трансакције компаније Интер.
 DocType: Travel Itinerary,Rented Car,Рентед Цар
 apps/erpnext/erpnext/public/js/hub/components/profile_dialog.js,About your Company,О вашој Компанији
+apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.js,Show Stock Ageing Data,Прикажи податке о старењу залиха
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py,Credit To account must be a Balance Sheet account,Кредит на рачун мора да буде биланса стања
 DocType: Donor,Donor,Донор
 DocType: Global Defaults,Disable In Words,Онемогућити У Вордс
@@ -5141,8 +5150,10 @@
 DocType: Practitioner Schedule,Schedule Name,Распоред Име
 apps/erpnext/erpnext/regional/doctype/gstr_3b_report/gstr_3b_report.py,Please enter GSTIN and state for the Company Address {0},Унесите ГСТИН и напишите адресу компаније {0}
 DocType: Currency Exchange,For Buying,За куповину
+apps/erpnext/erpnext/setup/default_energy_point_rules.py,On Purchase Order Submission,На основу наруџбине
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js,Add All Suppliers,Додај све добављаче
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py,Row #{0}: Allocated Amount cannot be greater than outstanding amount.,Ред # {0}: Додељени износ не може бити већи од преостали износ.
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Customer &gt; Customer Group &gt; Territory,Купац&gt; Група купаца&gt; Територија
 DocType: Tally Migration,Parties,Журке
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js,Browse BOM,Бровсе БОМ
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py,Secured Loans,Обеспеченные кредиты
@@ -5174,6 +5185,7 @@
 apps/erpnext/erpnext/stock/doctype/item_alternative/item_alternative.py,Not allow to set alternative item for the item {0},Не дозволите да поставите алтернативу за ставку {0}
 apps/erpnext/erpnext/hr/doctype/leave_block_list/leave_block_list.py,Date is repeated,Датум се понавља
 apps/erpnext/erpnext/accounts/print_format/payment_receipt_voucher/payment_receipt_voucher.html,Authorized Signatory,Овлашћени потписник
+apps/erpnext/erpnext/education/doctype/instructor/instructor.py,Please setup Instructor Naming System in Education &gt; Education Settings,Поставите систем именовања инструктора у Образовање&gt; Подешавања образовања
 apps/erpnext/erpnext/regional/doctype/gstr_3b_report/gstr_3b_report.html,Net ITC Available(A) - (B),Нето расположиви ИТЦ (А) - (Б)
 apps/erpnext/erpnext/education/doctype/fee_schedule/fee_schedule.js,Create Fees,Креирај накнаде
 DocType: Project,Total Purchase Cost (via Purchase Invoice),Укупно набавној вредности (преко фактури)
@@ -5194,6 +5206,7 @@
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.js,Message Sent,Порука је послата
 apps/erpnext/erpnext/accounts/doctype/account/account.py,Account with child nodes cannot be set as ledger,Рачун са дететом чворова не може да се подеси као књиге
 DocType: C-Form,II,ИИИ
+apps/erpnext/erpnext/assets/report/fixed_asset_register/fixed_asset_register.py,Vendor Name,Име продавца
 DocType: Quiz Result,Wrong,Погрешно
 DocType: Sales Invoice,Rate at which Price list currency is converted to customer's base currency,Стопа по којој се Ценовник валута претвара у основну валуту купца
 DocType: Purchase Invoice Item,Net Amount (Company Currency),Нето износ (Фирма валута)
@@ -5438,6 +5451,7 @@
 DocType: Stock Settings,Auto Material Request,Ауто Материјал Захтев
 DocType: Woocommerce Settings,API consumer secret,Потрошачка тајна АПИ-ја
 DocType: Delivery Note Item,Available Batch Qty at From Warehouse,Доступно Серија ком на Од Варехоусе
+,Received Qty Amount,Количина примљене количине
 DocType: Salary Slip,Gross Pay - Total Deduction - Loan Repayment,Бруто плате - Укупно Одузимање - Отплата кредита
 DocType: Bank Account,Last Integration Date,Последњи датум интеграције
 DocType: Expense Claim,Expense Taxes and Charges,Порези и таксе за трошење
@@ -5902,6 +5916,8 @@
 DocType: Drug Prescription,Hour,час
 DocType: Restaurant Order Entry,Last Sales Invoice,Последња продаја фактура
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py,Please select Qty against item {0},Молимо вас да изаберете Кти против ставке {0}
+apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py,Latest Age,Касно фаза
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js,Transfer Material to Supplier,Пребаци Материјал добављачу
 apps/erpnext/erpnext/hr/report/loan_repayment/loan_repayment.py,EMI,ЕМИ
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py,New Serial No cannot have Warehouse. Warehouse must be set by Stock Entry or Purchase Receipt,Новый Серийный номер не может быть Склад . Склад должен быть установлен на фондовой Вступил или приобрести получении
 DocType: Lead,Lead Type,Олово Тип
@@ -5925,7 +5941,6 @@
 apps/erpnext/erpnext/hr/doctype/employee_benefit_application/employee_benefit_application.py,"An amount of {0} already claimed for the component {1},\
 						 set the amount equal or greater than {2}","Количина {0} која је већ захтевана за компоненту {1}, \ поставите количину једнака или већа од {2}"
 DocType: Shipping Rule,Shipping Rule Conditions,Правило услови испоруке
-DocType: Purchase Invoice,Export Type,Тип извоза
 DocType: Salary Slip Loan,Salary Slip Loan,Зараду за плате
 DocType: BOM Update Tool,The new BOM after replacement,Нови БОМ након замене
 ,Point of Sale,Поинт оф Сале
@@ -6047,7 +6062,6 @@
 DocType: Purchase Order Item,Blanket Order Rate,Стопа поруџбине робе
 ,Customer Ledger Summary,Резиме клијента
 apps/erpnext/erpnext/hooks.py,Certification,Сертификација
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js,Are you sure you want to make debit note?,Јесте ли сигурни да желите да напишете задужницу?
 DocType: Bank Guarantee,Clauses and Conditions,Клаузуле и услови
 DocType: Serial No,Creation Document Type,Документ регистрације Тип
 DocType: Amazon MWS Settings,ES,ЕС
@@ -6085,8 +6099,6 @@
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py,Financial Services,Финансијске услуге
 DocType: Student Sibling,Student ID,студентска
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.js,For Quantity must be greater than zero,За количину мора бити већа од нуле
-apps/erpnext/erpnext/hr/doctype/employee_transfer/employee_transfer.py,"Please delete the Employee <a href=""#Form/Employee/{0}"">{0}</a>\
-					to cancel this document","Избришите запосленика <a href=""#Form/Employee/{0}"">{0}</a> \ да бисте отказали овај документ"
 apps/erpnext/erpnext/config/projects.py,Types of activities for Time Logs,Врсте активности за време Логс
 DocType: Opening Invoice Creation Tool,Sales,Продајни
 DocType: Stock Entry Detail,Basic Amount,Основни Износ
@@ -6165,6 +6177,7 @@
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py,Print and Stationery,Принт и Папирна
 DocType: Stock Settings,Show Barcode Field,Схов Баркод Поље
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js,Send Supplier Emails,Пошаљи Супплиер Емаилс
+DocType: Asset Movement,ACC-ASM-.YYYY.-,АЦЦ-АСМ-.ИИИИ.-
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py,"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,Ауто Цреатед
 apps/erpnext/erpnext/hr/doctype/employee_onboarding/employee_onboarding.py,Submit this to create the Employee record,Пошаљите ово да бисте креирали запис Запосленог
@@ -6245,7 +6258,6 @@
 DocType: Sales Team,Contact No.,Контакт број
 apps/erpnext/erpnext/templates/includes/cart/cart_address.html,Billing Address is same as Shipping Address,Адреса за наплату једнака је адреси за доставу
 DocType: Bank Reconciliation,Payment Entries,плаћања прилога
-apps/erpnext/erpnext/erpnext_integrations/doctype/shopify_settings/shopify_settings.py,Access token or Shopify URL missing,Није доступан токен или Схопифи УРЛ
 DocType: Location,Latitude,Географска ширина
 DocType: Work Order,Scrap Warehouse,отпад Магацин
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py,"Warehouse required at Row No {0}, please set default warehouse for the item {1} for the company {2}","Складиште је потребно на редоследу {0}, молимо поставите подразумевано складиште за ставку {1} за компанију {2}"
@@ -6290,7 +6302,6 @@
 DocType: Job Offer Term,Value / Description,Вредност / Опис
 apps/erpnext/erpnext/controllers/accounts_controller.py,"Row #{0}: Asset {1} cannot be submitted, it is already {2}","Ред # {0}: имовине {1} не може се поднети, већ је {2}"
 DocType: Tax Rule,Billing Country,Zemlja naplate
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js,Are you sure you want to make credit note?,Јесте ли сигурни да желите да направите кредитну белешку?
 DocType: Purchase Order Item,Expected Delivery Date,Очекивани Датум испоруке
 DocType: Restaurant Order Entry,Restaurant Order Entry,Ордер Ордер Ентри
 apps/erpnext/erpnext/accounts/general_ledger.py,Debit and Credit not equal for {0} #{1}. Difference is {2}.,Дебитне и кредитне није једнака за {0} # {1}. Разлика је {2}.
@@ -6415,6 +6426,7 @@
 DocType: Purchase Invoice,Taxes and Charges Added,Порези и накнаде додавања
 apps/erpnext/erpnext/assets/doctype/asset/asset.py,Depreciation Row {0}: Next Depreciation Date cannot be before Available-for-use Date,Амортизацијски ред {0}: Следећи датум амортизације не може бити пре Датум расположивог за употребу
 ,Sales Funnel,Продаја Левак
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Item Code &gt; Item Group &gt; Brand,Код артикла&gt; Група артикала&gt; Марка
 apps/erpnext/erpnext/setup/doctype/company/company.py,Abbreviation is mandatory,Држава је обавезна
 DocType: Project,Task Progress,zadatak Напредак
 apps/erpnext/erpnext/templates/includes/navbar/navbar_items.html,Cart,Колица
@@ -6661,6 +6673,7 @@
 DocType: Employee Grade,Employee Grade,Разред запослених
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py,Piecework,рад плаћен на акорд
 DocType: GSTR 3B Report,June,Јуна
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Supplier &gt; Supplier Type,Добављач&gt; врста добављача
 DocType: Share Balance,From No,Од бр
 DocType: Shift Type,Early Exit Grace Period,Период раног изласка из милости
 DocType: Task,Actual Time (in Hours),Тренутно време (у сатима)
@@ -6945,6 +6958,7 @@
 DocType: Warehouse,Warehouse Name,Магацин Име
 DocType: Naming Series,Select Transaction,Изаберите трансакцију
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py,Please enter Approving Role or Approving User,"Пожалуйста, введите утверждении роли или утверждении Пользователь"
+apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.py,UOM Conversion factor ({0} -&gt; {1}) not found for item: {2},Фактор конверзије УОМ ({0} -&gt; {1}) није пронађен за ставку: {2}
 apps/erpnext/erpnext/support/doctype/service_level_agreement/service_level_agreement.py,Service Level Agreement with Entity Type {0} and Entity {1} already exists.,Уговор о нивоу услуге са типом ентитета {0} и ентитетом {1} већ постоји.
 DocType: Journal Entry,Write Off Entry,Отпис Ентри
 DocType: BOM,Rate Of Materials Based On,Стопа материјала на бази
@@ -7136,6 +7150,7 @@
 DocType: Quality Inspection Reading,Quality Inspection Reading,Провера квалитета Рединг
 apps/erpnext/erpnext/stock/doctype/stock_settings/stock_settings.py,`Freeze Stocks Older Than` should be smaller than %d days.,"""Замрзни акције старије од"" треба да буде мање од %d дана."
 DocType: Tax Rule,Purchase Tax Template,Порез на промет Темплате
+apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py,Earliest Age,Најраније доба
 apps/erpnext/erpnext/utilities/user_progress.py,Set a sales goal you'd like to achieve for your company.,Поставите циљ продаје који желите остварити за своју компанију.
 DocType: Quality Goal,Revision,Ревизија
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js,Healthcare Services,Здравствене услуге
@@ -7179,6 +7194,7 @@
 apps/erpnext/erpnext/healthcare/doctype/patient_encounter/patient_encounter.js,Schedule Discharge,Распоређивање распореда
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py,Cheques and Deposits incorrectly cleared,Чекови и депозити погрешно ситуацију
 DocType: Homepage Section Card,Homepage Section Card,Картица за почетну страницу
+,Amount To Be Billed,Износ који треба да се наплати
 apps/erpnext/erpnext/accounts/doctype/account/account.py,Account {0}: You can not assign itself as parent account,Рачун {0}: Не може да се доделити као родитељ налог
 DocType: Purchase Invoice Item,Price List Rate,Ценовник Оцени
 apps/erpnext/erpnext/utilities/activation.py,Create customer quotes,Створити цитате купаца
@@ -7231,6 +7247,7 @@
 DocType: Supplier Scorecard Criteria,Supplier Scorecard Criteria,Критеријуми за оцењивање добављача
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py,Please select Start Date and End Date for Item {0},"Пожалуйста, выберите дату начала и дату окончания Пункт {0}"
 DocType: Maintenance Schedule,MAT-MSH-.YYYY.-,МАТ-МСХ-ИИИИ.-
+,Amount to Receive,Износ за примање
 apps/erpnext/erpnext/education/doctype/student_group_creation_tool/student_group_creation_tool.py,Course is mandatory in row {0},Наравно обавезна је у реду {0}
 apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py,From date can not be greater than than To date,Од датума не може бити већи од До данас
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py,To date cannot be before from date,До данас не може бити раније од датума
@@ -7482,7 +7499,6 @@
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js,BOM and Manufacturing Quantity are required,БОМ и Производња Количина се тражи
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js,Ageing Range 2,Старење Опсег 2
 DocType: SG Creation Tool Course,Max Strength,мак Снага
-apps/erpnext/erpnext/accounts/doctype/account/account.py,"Account {0} already exists in child company {1}. The following fields have different values, they should be same:<ul><li>{2}</li></ul>","Рачун {0} већ постоји у дечијем предузећу {1}. Следећа поља имају различите вредности, треба да буду иста: <ul><li> {2} </li></ul>"
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py,Installing presets,Инсталирање подешавања
 DocType: Fee Schedule,EDU-FSH-.YYYY.-,ЕДУ-ФСХ-ИИИИ.-
 apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js,No Delivery Note selected for Customer {},Није одабрана белешка за испоруку за купца {}
@@ -7692,6 +7708,7 @@
 DocType: Delivery Note,Print Without Amount,Принт Без Износ
 apps/erpnext/erpnext/accounts/report/asset_depreciation_ledger/asset_depreciation_ledger.py,Depreciation Date,Амортизација Датум
 ,Work Orders in Progress,Радни налоги у току
+DocType: Customer Credit Limit,Bypass Credit Limit Check,Заобиђите проверу кредитног лимита
 DocType: Issue,Support Team,Тим за подршку
 apps/erpnext/erpnext/stock/report/batch_item_expiry_status/batch_item_expiry_status.py,Expiry (In Days),Истека (у данима)
 DocType: Appraisal,Total Score (Out of 5),Укупна оцена (Оут оф 5)
@@ -7877,6 +7894,7 @@
 DocType: Sales Invoice,Customer GSTIN,Кориснички ГСТИН
 DocType: Crop Cycle,List of diseases detected on the field. When selected it'll automatically add a list of tasks to deal with the disease ,"Списак откривених болести на терену. Када је изабран, аутоматски ће додати листу задатака који ће се бавити болести"
 apps/erpnext/erpnext/manufacturing/page/bom_comparison_tool/bom_comparison_tool.js,BOM 1,БОМ 1
+apps/erpnext/erpnext/assets/report/fixed_asset_register/fixed_asset_register.py,Asset Id,Ид средства
 apps/erpnext/erpnext/healthcare/doctype/healthcare_service_unit/healthcare_service_unit.js,This is a root healthcare service unit and cannot be edited.,Ово је коренска служба здравствене заштите и не може се уређивати.
 DocType: Asset Repair,Repair Status,Статус поправке
 apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.js,"Requested Qty: Quantity requested for purchase, but not ordered.","Тражени Кол : Количина тражио за куповину , али не нареди ."
diff --git a/erpnext/translations/sv.csv b/erpnext/translations/sv.csv
index bd7005a..bcd3129 100644
--- a/erpnext/translations/sv.csv
+++ b/erpnext/translations/sv.csv
@@ -289,7 +289,6 @@
 DocType: Loan,Repay Over Number of Periods,Repay Över Antal perioder
 apps/erpnext/erpnext/manufacturing/report/bom_stock_report/bom_stock_report.py,Quantity to Produce can not be less than Zero,Antalet att producera kan inte vara mindre än noll
 DocType: Stock Entry,Additional Costs,Merkostnader
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Customer &gt; Customer Group &gt; Territory,Kund&gt; Kundgrupp&gt; Territorium
 apps/erpnext/erpnext/accounts/doctype/account/account.py,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 batch för studenter i studentgruppen
@@ -587,6 +586,7 @@
 DocType: Healthcare Settings,Create documents for sample collection,Skapa dokument för provinsamling
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py,Payment against {0} {1} cannot be greater than Outstanding Amount {2},Betalning mot {0} {1} inte kan vara större än utestående beloppet {2}
 apps/erpnext/erpnext/patches/v11_0/add_healthcare_service_unit_tree_root.py,All Healthcare Service Units,Alla hälsovårdstjänster
+apps/erpnext/erpnext/setup/default_energy_point_rules.py,On Converting Opportunity,Om konvertering av möjlighet
 DocType: Bank Account,Address HTML,Adress HTML
 DocType: Lead,Mobile No.,Mobilnummer.
 apps/erpnext/erpnext/selling/doctype/pos_closing_voucher/closing_voucher_details.html,Mode of Payments,Betalningssätt
@@ -651,7 +651,6 @@
 DocType: Accounting Dimension,Dimension Name,Dimension Namn
 apps/erpnext/erpnext/healthcare/setup.py,Resistant,Resistent
 apps/erpnext/erpnext/hotels/doctype/hotel_room_reservation/hotel_room_reservation.py,Please set Hotel Room Rate on {},Ange hotellets rumspris på {}
-apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py,Please setup numbering series for Attendance via Setup &gt; Numbering Series,Ställ in numreringsserien för närvaro via Setup&gt; Numbering Series
 DocType: Journal Entry,Multi Currency,Flera valutor
 DocType: Bank Statement Transaction Invoice Item,Invoice Type,Faktura Typ
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py,Valid from date must be less than valid upto date,Giltigt från datum måste vara mindre än giltigt fram till datum
@@ -769,6 +768,7 @@
 apps/erpnext/erpnext/accounts/page/pos/pos.js,Create a new Customer,Skapa en ny kund
 apps/erpnext/erpnext/non_profit/report/expiring_memberships/expiring_memberships.py,Expiring On,Förfaller på
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,"If multiple Pricing Rules continue to prevail, users are asked to set Priority manually to resolve conflict.","Om flera prissättningsregler fortsätta att gälla, kan användarna uppmanas att ställa Prioritet manuellt för att lösa konflikten."
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js,Purchase Return,bara Return
 apps/erpnext/erpnext/utilities/activation.py,Create Purchase Orders,Skapa inköpsorder
 ,Purchase Register,Inköpsregistret
 apps/erpnext/erpnext/healthcare/doctype/patient/patient.py,Patient not found,Patienten hittades inte
@@ -784,7 +784,6 @@
 DocType: Location,Area UOM,Område UOM
 apps/erpnext/erpnext/manufacturing/doctype/workstation/workstation.py,Workstation is closed on the following dates as per Holiday List: {0},Arbetsstation är stängd på följande datum enligt kalender: {0}
 apps/erpnext/erpnext/selling/page/sales_funnel/sales_funnel.py,Opportunities,Möjligheter
-apps/erpnext/erpnext/www/all-products/index.html,Clear filters,Rensa filter
 DocType: Lab Test Template,Single,Singel
 DocType: Compensatory Leave Request,Work From Date,Arbeta från datum
 DocType: Salary Slip,Total Loan Repayment,Totala låne Återbetalning
@@ -827,6 +826,7 @@
 DocType: Account,Old Parent,Gammalt mål
 apps/erpnext/erpnext/education/doctype/program_enrollment_tool/program_enrollment_tool.py,Mandatory field - Academic Year,Obligatoriskt fält - Academic Year
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py,{0} {1} is not associated with {2} {3},{0} {1} är inte associerad med {2} {3}
+DocType: Opportunity,Converted By,Konverterad av
 apps/erpnext/erpnext/public/js/hub/components/ReviewArea.vue,You need to login as a Marketplace User before you can add any reviews.,Du måste logga in som Marketplace-användare innan du kan lägga till några recensioner.
 apps/erpnext/erpnext/manufacturing/doctype/job_card/job_card.py,Row {0} : Operation is required against the raw material item {1},Rad {0}: Drift krävs mot råvaruposten {1}
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py,Please set default payable account for the company {0},Vänligen ange det betalda kontot för företaget {0}
@@ -853,6 +853,8 @@
 DocType: Sales Invoice,Total Qty,Totalt Antal
 apps/erpnext/erpnext/education/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py,Guardian2 Email ID,Guardian2 E-post-ID
 apps/erpnext/erpnext/education/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py,Guardian2 Email ID,Guardian2 E-post-ID
+apps/erpnext/erpnext/hr/doctype/employee_transfer/employee_transfer.py,"Please delete the Employee <a href=""#Form/Employee/{0}"">{0}</a>\
+					to cancel this document","Radera anställden <a href=""#Form/Employee/{0}"">{0}</a> \ för att avbryta detta dokument"
 DocType: Item,Show in Website (Variant),Visa på webbplatsen (Variant)
 DocType: Employee,Health Concerns,Hälsoproblem
 DocType: Payroll Entry,Select Payroll Period,Välj Payroll Period
@@ -913,7 +915,6 @@
 DocType: Codification Table,Codification Table,Kodifierings tabell
 DocType: Timesheet Detail,Hrs,H
 apps/erpnext/erpnext/manufacturing/page/bom_comparison_tool/bom_comparison_tool.js,Changes in {0},Förändringar i {0}
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js,Please select Company,Välj Företag
 DocType: Employee Skill,Employee Skill,Anställdas skicklighet
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.js,Difference Account,Differenskonto
 DocType: Pricing Rule,Discount on Other Item,Rabatt på annan artikel
@@ -982,6 +983,7 @@
 DocType: BOM,Operating Cost,Rörelse Kostnad
 DocType: Crop,Produced Items,Producerade produkter
 DocType: Bank Statement Transaction Entry,Match Transaction to Invoices,Matchtransaktion till fakturor
+apps/erpnext/erpnext/erpnext_integrations/exotel_integration.py,Error in Exotel incoming call,Fel i Exotel-inkommande samtal
 DocType: Sales Order Item,Gross Profit,Bruttoförtjänst
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js,Unblock Invoice,Avblockera faktura
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py,Increment cannot be 0,Inkrement kan inte vara 0
@@ -1196,6 +1198,7 @@
 DocType: Activity Cost,Activity Type,Aktivitetstyp
 DocType: Request for Quotation,For individual supplier,För individuell leverantör
 DocType: BOM Operation,Base Hour Rate(Company Currency),Base Hour Rate (Company valuta)
+,Qty To Be Billed,Antal som ska faktureras
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py,Delivered Amount,Levererad Mängd
 apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.js,Reserved Qty for Production: Raw materials quantity to make manufacturing items.,Reserverad antal för produktion: Råvarukvantitet för tillverkning av tillverkningsartiklar.
 DocType: Loyalty Point Entry Redemption,Redemption Date,Inlösendatum
@@ -1317,7 +1320,7 @@
 apps/erpnext/erpnext/education/doctype/student_group/student_group.py,Please select Program,Var god välj Program
 apps/erpnext/erpnext/education/doctype/student_group/student_group.py,Please select Program,Var god välj Program
 DocType: Project,Estimated Cost,Beräknad kostnad
-DocType: Request for Quotation,Link to material requests,Länk till material förfrågningar
+DocType: Supplier Quotation,Link to material requests,Länk till material förfrågningar
 apps/erpnext/erpnext/public/js/hub/pages/Publish.vue,Publish,Publicera
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py,Aerospace,Aerospace
 ,Fichier des Ecritures Comptables [FEC],Fichier des Ecritures Comptables [FEC]
@@ -1330,6 +1333,7 @@
 apps/erpnext/erpnext/utilities/transaction_base.py,Invalid Posting Time,Ogiltig inläggstid
 DocType: Salary Component,Condition and Formula,Skick och formel
 DocType: Lead,Campaign Name,Kampanjens namn
+apps/erpnext/erpnext/setup/default_energy_point_rules.py,On Task Completion,På uppdragets slutförande
 apps/erpnext/erpnext/hr/doctype/compensatory_leave_request/compensatory_leave_request.py,There is no leave period in between {0} and {1},Det finns ingen ledighet mellan {0} och {1}
 DocType: Fee Validity,Healthcare Practitioner,Hälso- och sjukvårdspersonal
 DocType: Hotel Room,Capacity,Kapacitet
@@ -1674,7 +1678,6 @@
 DocType: Quality Feedback Template,Quality Feedback Template,Kvalitetsåterkopplingsmall
 apps/erpnext/erpnext/config/education.py,LMS Activity,LMS-aktivitet
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py,Internet Publishing,Internet Publishing
-DocType: Prescription Duration,Number,siffra
 apps/erpnext/erpnext/accounts/doctype/opening_invoice_creation_tool/opening_invoice_creation_tool.js,Creating {0} Invoice,Skapa {0} faktura
 DocType: Medical Code,Medical Code Standard,Medicinsk kod Standard
 DocType: Soil Texture,Clay Composition (%),Lerkomposition (%)
@@ -1749,6 +1752,7 @@
 DocType: Support Settings,Get Started Sections,Kom igång sektioner
 DocType: Lead,CRM-LEAD-.YYYY.-,CRM-bly-.YYYY.-
 DocType: Invoice Discounting,Sanctioned,sanktionerade
+,Base Amount,Basbelopp
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.js,Total Contribution Amount: {0},Totala bidragsbeloppet: {0}
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py,Row #{0}: Please specify Serial No for Item {1},Rad # {0}: Ange Löpnummer för punkt {1}
 DocType: Payroll Entry,Salary Slips Submitted,Löneskikt skickas in
@@ -1971,6 +1975,7 @@
 DocType: Accounting Dimension,Dimension Defaults,Dimension Standardvärden
 apps/erpnext/erpnext/crm/report/prospects_engaged_but_not_converted/prospects_engaged_but_not_converted.js,Minimum Lead Age (Days),Minimal ledningsålder (dagar)
 apps/erpnext/erpnext/crm/report/prospects_engaged_but_not_converted/prospects_engaged_but_not_converted.js,Minimum Lead Age (Days),Minimal ledningsålder (dagar)
+apps/erpnext/erpnext/assets/report/fixed_asset_register/fixed_asset_register.py,Available For Use Date,Tillgängligt för användningsdatum
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py,All BOMs,alla stycklistor
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js,Create Inter Company Journal Entry,Skapa intresse för företagets dagbok
 DocType: Company,Parent Company,Moderbolag
@@ -2035,6 +2040,7 @@
 ,IRS 1099,IRS 1099
 DocType: Salary Slip,Leave Without Pay,Lämna utan lön
 DocType: Payment Request,Outward,Utåt
+apps/erpnext/erpnext/setup/default_energy_point_rules.py,On {0} Creation,På {0} skapelse
 apps/erpnext/erpnext/regional/doctype/gstr_3b_report/gstr_3b_report.html,State/UT Tax,Stat / UT-skatt
 ,Trial Balance for Party,Trial Balance för Party
 ,Gross and Net Profit Report,Brutto- och nettovinstrapport
@@ -2152,6 +2158,7 @@
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js,Make Stock Entry,Gör lagerinmatning
 DocType: Hotel Room Reservation,Hotel Reservation User,Hotellbokningsanvändare
 apps/erpnext/erpnext/projects/doctype/project/project.js,Set Status,Ställ in status
+apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py,Please setup numbering series for Attendance via Setup &gt; Numbering Series,Ställ in numreringsserien för närvaro via Setup&gt; Numbering Series
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py,Please select prefix first,Välj prefix först
 DocType: Contract,Fulfilment Deadline,Uppfyllnadsfristen
 apps/erpnext/erpnext/public/js/hub/pages/Home.vue,Near you,Nära dig
@@ -2167,6 +2174,7 @@
 DocType: Announcement,All Students,Alla studenter
 apps/erpnext/erpnext/assets/doctype/asset/asset.py,Item {0} must be a non-stock item,Objektet {0} måste vara en icke-lagervara
 apps/erpnext/erpnext/stock/doctype/batch/batch.js,View Ledger,Se journal
+DocType: Cost Center,Lft,Lft
 DocType: Grading Scale,Intervals,intervaller
 DocType: Bank Statement Transaction Entry,Reconciled Transactions,Avstämda transaktioner
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py,Earliest,Tidigast
@@ -2282,6 +2290,7 @@
 apps/erpnext/erpnext/hr/doctype/employee_benefit_application/employee_benefit_application.py,As per your assigned Salary Structure you cannot apply for benefits,Enligt din tilldelade lönestruktur kan du inte ansöka om förmåner
 apps/erpnext/erpnext/stock/doctype/item/item.py,Website Image should be a public file or website URL,Website Bild bör vara en offentlig fil eller webbadress
 DocType: Purchase Invoice Item,BOM,BOM
+apps/erpnext/erpnext/stock/doctype/item/item.py,Duplicate entry in Manufacturers table,Duplicerad post i tillverkartabellen
 apps/erpnext/erpnext/setup/doctype/item_group/item_group.js,This is a root item group and cannot be edited.,Detta är en rot varugrupp och kan inte ändras.
 apps/erpnext/erpnext/accounts/doctype/account/account.js,Merge,Sammanfoga
 DocType: Journal Entry Account,Purchase Order,Inköpsorder
@@ -2427,7 +2436,6 @@
 DocType: Asset,Depreciation Schedules,avskrivningstider
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.js,Create Sales Invoice,Skapa försäljningsfaktura
 apps/erpnext/erpnext/regional/doctype/gstr_3b_report/gstr_3b_report.html,Ineligible ITC,Icke kvalificerad ITC
-apps/erpnext/erpnext/erpnext_integrations/doctype/shopify_settings/shopify_settings.py,"Support for public app is deprecated. Please setup private app, for more details refer user manual","Stöd för allmän app är borttagen. Var god installera privat app, för mer information se användarhandboken"
 DocType: Task,Dependent Tasks,Beroende uppgifter
 apps/erpnext/erpnext/regional/report/gstr_1/gstr_1.py,Following accounts might be selected in GST Settings:,Följande konton kan väljas i GST-inställningar:
 apps/erpnext/erpnext/manufacturing/report/bom_stock_report/bom_stock_report.js,Quantity to Produce,Kvantitet att producera
@@ -2679,6 +2687,7 @@
 DocType: Water Analysis,Container,Behållare
 apps/erpnext/erpnext/regional/report/gstr_1/gstr_1.py,Please set valid GSTIN No. in Company Address,Ange giltigt GSTIN-nummer i företagets adress
 apps/erpnext/erpnext/education/utils.py,Student {0} - {1} appears Multiple times in row {2} & {3},Student {0} - {1} visas flera gånger i rad {2} &amp; {3}
+apps/erpnext/erpnext/selling/doctype/customer/customer.py,Following fields are mandatory to create address:,Följande fält är obligatoriska för att skapa adress:
 DocType: Item Alternative,Two-way,Tvåvägs
 DocType: Item,Manufacturers,tillverkare
 apps/erpnext/erpnext/accounts/deferred_revenue.py,Error while processing deferred accounting for {0},Fel vid bearbetning av uppskjuten redovisning för {0}
@@ -2754,9 +2763,9 @@
 DocType: Employee,HR-EMP-,HR-EMP
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py,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: Quality Meeting Minutes,Quality Meeting Minutes,Mötesprotokoll av kvalitet
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Supplier &gt; Supplier Type,Leverantör&gt; Leverantörstyp
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py,Employee Referral,Anställningsreferens
 DocType: Student Group,Set 0 for no limit,Set 0 för ingen begränsning
+DocType: Cost Center,rgt,RGT
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py,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.
 DocType: Customer,Primary Address and Contact Detail,Primär adress och kontaktdetaljer
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.js,Resend Payment Email,Skicka om Betalning E
@@ -2866,7 +2875,6 @@
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py,Against Supplier Invoice {0} dated {1},Mot leverantörsfakturor {0} den {1}
 DocType: Customer,Default Price List,Standard Prislista
 apps/erpnext/erpnext/assets/doctype/asset/asset.py,Asset Movement record {0} created,Asset Rörelse rekord {0} skapades
-apps/erpnext/erpnext/utilities/page/leaderboard/leaderboard.js,No items found.,Inga föremål hittades.
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py,You cannot delete Fiscal Year {0}. Fiscal Year {0} is set as default in Global Settings,Du kan inte ta bort Räkenskapsårets {0}. Räkenskapsårets {0} är satt som standard i Globala inställningar
 DocType: Share Transfer,Equity/Liability Account,Eget kapital / Ansvarskonto
 apps/erpnext/erpnext/setup/doctype/customer_group/customer_group.py,A customer with the same name already exists,En kund med samma namn finns redan
@@ -2882,6 +2890,7 @@
 apps/erpnext/erpnext/selling/doctype/customer/customer.py,Credit limit has been crossed for customer {0} ({1}/{2}),Kreditgränsen har överskridits för kund {0} ({1} / {2})
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py,Customer required for 'Customerwise Discount',"Kunder krävs för ""Kundrabatt"""
 apps/erpnext/erpnext/config/accounting.py,Update bank payment dates with journals.,Uppdatera bankbetalningsdagar med tidskrifter.
+,Billed Qty,Fakturerad kvantitet
 apps/erpnext/erpnext/stock/doctype/item/item_dashboard.py,Pricing,Prissättning
 DocType: Employee,Attendance Device ID (Biometric/RF tag ID),Deltagande enhets-ID (biometrisk / RF-tag-ID)
 DocType: Quotation,Term Details,Term Detaljer
@@ -2905,6 +2914,7 @@
 DocType: Share Transfer,Asset Account,Tillgångskonto
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js,New release date should be in the future,Nytt släppdatum borde vara i framtiden
 DocType: Purchase Invoice,End date of current invoice's period,Slutdatum för aktuell faktura period
+apps/erpnext/erpnext/hr/doctype/employee/employee.py,Please setup Employee Naming System in Human Resource &gt; HR Settings,Installera anställdes namngivningssystem i personalresurser&gt; HR-inställningar
 DocType: Lab Test,Technician Name,Tekniker namn
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py,"Cannot ensure delivery by Serial No as \
 					Item {0} is added with and without Ensure Delivery by \
@@ -2912,6 +2922,7 @@
 DocType: Accounts Settings,Unlink Payment on Cancellation of Invoice,Bort länken Betalning på Indragning av faktura
 DocType: Bank Reconciliation,From Date,Från Datum
 apps/erpnext/erpnext/hr/doctype/vehicle_log/vehicle_log.py,Current Odometer reading entered should be greater than initial Vehicle Odometer {0},Nuvarande vägmätare läsning deltagare bör vara större än initial Vägmätarvärde {0}
+,Purchase Order Items To Be Received or Billed,Beställningsobjekt som ska tas emot eller faktureras
 DocType: Restaurant Reservation,No Show,Icke infinnande
 apps/erpnext/erpnext/regional/india/utils.py,You must be a registered supplier to generate e-Way Bill,Du måste vara en registrerad leverantör för att generera e-Way Bill
 DocType: Shipping Rule Country,Shipping Rule Country,Frakt Regel Land
@@ -2954,6 +2965,7 @@
 apps/erpnext/erpnext/templates/generators/item/item_add_to_cart.html,View in Cart,Visa i varukorgen
 DocType: Employee Checkin,Shift Actual Start,Skift faktisk start
 DocType: Tally Migration,Is Day Book Data Imported,Är dagbokdata importerade
+,Purchase Order Items To Be Received or Billed1,Beställningsobjekt som ska tas emot eller faktureras1
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py,Marketing Expenses,Marknadsföringskostnader
 apps/erpnext/erpnext/stock/doctype/pick_list/pick_list.py,{0} units of {1} is not available.,{0} enheter på {1} är inte tillgängliga.
 ,Item Shortage Report,Produkt Brist Rapportera
@@ -3182,7 +3194,6 @@
 apps/erpnext/erpnext/public/js/call_popup/call_popup.js,View all issues from {0},Visa alla utgåvor från {0}
 DocType: Quality Inspection,MAT-QA-.YYYY.-,MAT-QA-.YYYY.-
 DocType: Quality Meeting Table,Quality Meeting Table,Mötesbord för kvalitet
-apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,Ange Naming Series för {0} via Setup&gt; Inställningar&gt; Naming Series
 apps/erpnext/erpnext/templates/pages/help.html,Visit the forums,Besök forumet
 DocType: Student,Student Mobile Number,Student Mobilnummer
 DocType: Item,Has Variants,Har Varianter
@@ -3325,6 +3336,7 @@
 DocType: Homepage Section,Section Cards,Avsnittskort
 ,Campaign Efficiency,Kampanjseffektivitet
 DocType: Discussion,Discussion,Diskussion
+apps/erpnext/erpnext/setup/default_energy_point_rules.py,On Sales Order Submission,På inlämning av orderorder
 DocType: Bank Transaction,Transaction ID,Transaktions ID
 DocType: Payroll Entry,Deduct Tax For Unsubmitted Tax Exemption Proof,Avdragsskatt för ej inlämnad skattebefrielse bevis
 DocType: Volunteer,Anytime,när som helst
@@ -3332,7 +3344,6 @@
 DocType: Employee Tax Exemption Proof Submission,Employee Tax Exemption Proof Submission,Anmälan om anställningsskattbefrielse
 DocType: Patient,Surgical History,Kirurgisk historia
 DocType: Bank Statement Settings Item,Mapped Header,Mapped Header
-apps/erpnext/erpnext/hr/doctype/employee/employee.py,Please setup Employee Naming System in Human Resource &gt; HR Settings,Installera anställdes namngivningssystem i mänskliga resurser&gt; HR-inställningar
 DocType: Employee,Resignation Letter Date,Avskedsbrev Datum
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Pricing Rules are further filtered based on quantity.,Prissättning Regler ytterligare filtreras baserat på kvantitet.
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py,Please set the Date Of Joining for employee {0},Ange datum för anslutning till anställd {0}
@@ -3347,6 +3358,7 @@
 DocType: Bank Statement Settings,Mapped Items,Mappade objekt
 DocType: Amazon MWS Settings,IT,DET
 DocType: Chapter,Chapter,Kapitel
+,Fixed Asset Register,Fast tillgångsregister
 apps/erpnext/erpnext/utilities/user_progress.py,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,Select BOM and Qty for Production,Välj BOM och Antal för produktion
@@ -3482,7 +3494,6 @@
 apps/erpnext/erpnext/templates/emails/reorder_item.html,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å
 apps/erpnext/erpnext/controllers/accounts_controller.py,Account {0} is invalid. Account Currency must be {1},Konto {0} är ogiltig. Konto Valuta måste vara {1}
 apps/erpnext/erpnext/hr/doctype/salary_structure_assignment/salary_structure_assignment.py,From Date {0} cannot be after employee's relieving Date {1},Från datum {0} kan inte vara efter arbetstagarens avlastningsdatum {1}
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py,Debit Note {0} has been created automatically,Debitanteckning {0} har skapats automatiskt
 apps/erpnext/erpnext/accounts/doctype/payment_order/payment_order.js,Create Payment Entries,Skapa betalningsuppgifter
 DocType: Supplier,Is Internal Supplier,Är Intern Leverantör
 DocType: Employee,Create User Permission,Skapa användarbehörighet
@@ -4046,7 +4057,6 @@
 DocType: Project User,Project Status,Projektstatus
 DocType: UOM,Check this to disallow fractions. (for Nos),Markera att tillåta bråkdelar. (För NOS)
 DocType: Student Admission Program,Naming Series (for Student Applicant),Naming Series (för Student Sökande)
-apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.py,UOM Conversion factor ({0} -&gt; {1}) not found for item: {2},UOM-omvandlingsfaktor ({0} -&gt; {1}) hittades inte för artikeln: {2}
 apps/erpnext/erpnext/hr/doctype/retention_bonus/retention_bonus.py,Bonus Payment Date cannot be a past date,Bonusbetalningsdatum kan inte vara ett förflutet datum
 DocType: Travel Request,Copy of Invitation/Announcement,Kopia av inbjudan / tillkännagivande
 DocType: Practitioner Service Unit Schedule,Practitioner Service Unit Schedule,Utövaren Service Unit Schedule
@@ -4195,6 +4205,7 @@
 apps/erpnext/erpnext/utilities/user_progress.py,Setup Company,Setup Company
 ,Lab Test Report,Lab Test Report
 DocType: Employee Benefit Application,Employee Benefit Application,Anställningsförmånsansökan
+apps/erpnext/erpnext/accounts/doctype/invoice_discounting/invoice_discounting.py,Row({0}): {1} is already discounted in {2},Rad ({0}): {1} är redan rabatterad i {2}
 apps/erpnext/erpnext/hr/doctype/additional_salary/additional_salary.py,Additional Salary Component Exists.,Det finns ytterligare lönekomponenter.
 DocType: Purchase Invoice,Unregistered,Oregistrerad
 DocType: Student Applicant,Application Date,Ansökningsdatum
@@ -4274,7 +4285,6 @@
 DocType: Journal Entry,Accounting Entries,Bokföringsposter
 DocType: Job Card Time Log,Job Card Time Log,Jobbkortets tidlogg
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,"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."
-apps/erpnext/erpnext/education/doctype/instructor/instructor.py,Please setup Instructor Naming System in Education &gt; Education Settings,Installera instruktörens namngivningssystem i utbildning&gt; Utbildningsinställningar
 DocType: Journal Entry,Paid Loan,Betalt lån
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py,Duplicate Entry. Please check Authorization Rule {0},Duplicera post. Kontrollera autentiseringsregel {0}
 DocType: Journal Entry Account,Reference Due Date,Referens förfallodatum
@@ -4291,7 +4301,6 @@
 apps/erpnext/erpnext/templates/pages/projects.html,No time sheets,Inga tidrapporter
 DocType: GoCardless Mandate,GoCardless Customer,GoCardless kund
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py,Leave Type {0} cannot be carry-forwarded,Lämna typ {0} kan inte bära vidarebefordrade
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Item Code &gt; Item Group &gt; Brand,Produktkod&gt; Produktgrupp&gt; Märke
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py,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
 DocType: Leave Encashment,Payroll,Löner
@@ -4407,7 +4416,6 @@
 DocType: Stock Ledger Entry,Actual Qty After Transaction,Faktiska Antal Efter transaktion
 ,Pending SO Items For Purchase Request,I avvaktan på SO Artiklar till inköpsanmodan
 apps/erpnext/erpnext/education/doctype/student_admission/student_admission.py,Student Admissions,Student Antagning
-apps/erpnext/erpnext/accounts/party.py,{0} {1} is disabled,{0} {1} är inaktiverad
 DocType: Supplier,Billing Currency,Faktureringsvaluta
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py,Extra Large,Extra Stor
 DocType: Loan,Loan Application,Låneansökan
@@ -4484,7 +4492,6 @@
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py,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/accounts/doctype/accounting_dimension/accounting_dimension.py,Creating Dimensions...,Skapar dimensioner ...
 apps/erpnext/erpnext/education/doctype/student_group_creation_tool/student_group_creation_tool.py,Student Group Name is mandatory in row {0},Student gruppnamn är obligatorisk i rad {0}
-DocType: Customer Credit Limit,Bypass credit limit_check,Omkoppla kreditgräns_check
 DocType: Homepage,Products to be shown on website homepage,Produkter som ska visas på startsidan för webbplatsen
 DocType: HR Settings,Password Policy,Lösenordspolicy
 apps/erpnext/erpnext/setup/doctype/customer_group/customer_group.js,This is a root customer group and cannot be edited.,Detta är en rot kundgrupp och kan inte ändras.
@@ -4778,6 +4785,7 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py,Row {0}: Advance against Customer must be credit,Rad {0}: Advance mot Kunden måste vara kredit
 DocType: Quality Meeting,Quality Meeting,Kvalitetsmöte
 apps/erpnext/erpnext/accounts/doctype/account/account.js,Non-Group to Group,Icke-grupp till grupp
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,Ange Naming Series för {0} via Setup&gt; Inställningar&gt; Naming Series
 DocType: Employee,ERPNext User,ERPNext User
 apps/erpnext/erpnext/education/doctype/student_group_creation_tool/student_group_creation_tool.py,Batch is mandatory in row {0},Batch är obligatorisk i rad {0}
 apps/erpnext/erpnext/education/doctype/student_group_creation_tool/student_group_creation_tool.py,Batch is mandatory in row {0},Batch är obligatorisk i rad {0}
@@ -5077,6 +5085,7 @@
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py,No {0} found for Inter Company Transactions.,Nej {0} hittades för Inter Company Transactions.
 DocType: Travel Itinerary,Rented Car,Hyrbil
 apps/erpnext/erpnext/public/js/hub/components/profile_dialog.js,About your Company,Om ditt företag
+apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.js,Show Stock Ageing Data,Visa lagringsalternativ
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py,Credit To account must be a Balance Sheet account,Tack till kontot måste vara ett balanskonto
 DocType: Donor,Donor,Givare
 DocType: Global Defaults,Disable In Words,Inaktivera uttrycker in
@@ -5091,8 +5100,10 @@
 DocType: Practitioner Schedule,Schedule Name,Schema namn
 apps/erpnext/erpnext/regional/doctype/gstr_3b_report/gstr_3b_report.py,Please enter GSTIN and state for the Company Address {0},Ange GSTIN och ange för företagets adress {0}
 DocType: Currency Exchange,For Buying,För köp
+apps/erpnext/erpnext/setup/default_energy_point_rules.py,On Purchase Order Submission,Vid inlämning av inköpsorder
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js,Add All Suppliers,Lägg till alla leverantörer
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py,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/accounts/doctype/pricing_rule/pricing_rule.js,Customer &gt; Customer Group &gt; Territory,Kund&gt; Kundgrupp&gt; Territorium
 DocType: Tally Migration,Parties,parterna
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js,Browse BOM,Bläddra BOM
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py,Secured Loans,Säkrade lån
@@ -5124,6 +5135,7 @@
 apps/erpnext/erpnext/stock/doctype/item_alternative/item_alternative.py,Not allow to set alternative item for the item {0},Tillåt inte att ange alternativ objekt för objektet {0}
 apps/erpnext/erpnext/hr/doctype/leave_block_list/leave_block_list.py,Date is repeated,Datum upprepas
 apps/erpnext/erpnext/accounts/print_format/payment_receipt_voucher/payment_receipt_voucher.html,Authorized Signatory,Firmatecknare
+apps/erpnext/erpnext/education/doctype/instructor/instructor.py,Please setup Instructor Naming System in Education &gt; Education Settings,Installera instruktörens namngivningssystem i utbildning&gt; Utbildningsinställningar
 apps/erpnext/erpnext/regional/doctype/gstr_3b_report/gstr_3b_report.html,Net ITC Available(A) - (B),Net ITC tillgängligt (A) - (B)
 apps/erpnext/erpnext/education/doctype/fee_schedule/fee_schedule.js,Create Fees,Skapa avgifter
 DocType: Project,Total Purchase Cost (via Purchase Invoice),Totala inköpskostnaden (via inköpsfaktura)
@@ -5144,6 +5156,7 @@
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.js,Message Sent,Meddelande Skickat
 apps/erpnext/erpnext/accounts/doctype/account/account.py,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/assets/report/fixed_asset_register/fixed_asset_register.py,Vendor Name,Leverantörsnamn
 DocType: Quiz Result,Wrong,Fel
 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)
@@ -5389,6 +5402,7 @@
 DocType: Stock Settings,Auto Material Request,Automaterialförfrågan
 DocType: Woocommerce Settings,API consumer secret,API konsumenthemlighet
 DocType: Delivery Note Item,Available Batch Qty at From Warehouse,Finns Batch Antal på From Warehouse
+,Received Qty Amount,Mottaget antal belopp
 DocType: Salary Slip,Gross Pay - Total Deduction - Loan Repayment,Gross Pay - Summa Avdrag - Loan Återbetalning
 DocType: Bank Account,Last Integration Date,Sista integrationsdatum
 DocType: Expense Claim,Expense Taxes and Charges,Kostnadsskatter och avgifter
@@ -5852,6 +5866,8 @@
 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,Please select Qty against item {0},Var god välj Antal mot objekt {0}
+apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py,Latest Age,Sent skede
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js,Transfer Material to Supplier,Överföra material till leverantören
 apps/erpnext/erpnext/hr/report/loan_repayment/loan_repayment.py,EMI,EMI
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py,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
@@ -5875,7 +5891,6 @@
 apps/erpnext/erpnext/hr/doctype/employee_benefit_application/employee_benefit_application.py,"An amount of {0} already claimed for the component {1},\
 						 set the amount equal or greater than {2}","En mängd {0} som redan hävdats för komponenten {1}, \ anger summan lika med eller större än {2}"
 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
 DocType: BOM Update Tool,The new BOM after replacement,Den nya BOM efter byte
 ,Point of Sale,Butiksförsäljning
@@ -5997,7 +6012,6 @@
 DocType: Purchase Order Item,Blanket Order Rate,Blankett Order Rate
 ,Customer Ledger Summary,Sammanfattning av kundbok
 apps/erpnext/erpnext/hooks.py,Certification,certifiering
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js,Are you sure you want to make debit note?,Är du säker på att du vill göra en debetnot?
 DocType: Bank Guarantee,Clauses and Conditions,Klausuler och villkor
 DocType: Serial No,Creation Document Type,Skapande Dokumenttyp
 DocType: Amazon MWS Settings,ES,ES
@@ -6035,8 +6049,6 @@
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py,Financial Services,Finansiella Tjänster
 DocType: Student Sibling,Student ID,Student-ID
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.js,For Quantity must be greater than zero,För kvantitet måste vara större än noll
-apps/erpnext/erpnext/hr/doctype/employee_transfer/employee_transfer.py,"Please delete the Employee <a href=""#Form/Employee/{0}"">{0}</a>\
-					to cancel this document","Radera anställden <a href=""#Form/Employee/{0}"">{0}</a> \ för att avbryta detta dokument"
 apps/erpnext/erpnext/config/projects.py,Types of activities for Time Logs,Olika typer av aktiviteter för Time Loggar
 DocType: Opening Invoice Creation Tool,Sales,Försäljning
 DocType: Stock Entry Detail,Basic Amount,BASBELOPP
@@ -6115,6 +6127,7 @@
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py,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,Send Supplier Emails,Skicka e-post Leverantörs
+DocType: Asset Movement,ACC-ASM-.YYYY.-,ACC-ASM-.YYYY.-
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py,"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
 apps/erpnext/erpnext/hr/doctype/employee_onboarding/employee_onboarding.py,Submit this to create the Employee record,Skicka in det här för att skapa anställningsrekordet
@@ -6195,7 +6208,6 @@
 DocType: Sales Team,Contact No.,Kontakt nr
 apps/erpnext/erpnext/templates/includes/cart/cart_address.html,Billing Address is same as Shipping Address,Faktureringsadress är samma som fraktadress
 DocType: Bank Reconciliation,Payment Entries,betalningsAnteckningar
-apps/erpnext/erpnext/erpnext_integrations/doctype/shopify_settings/shopify_settings.py,Access token or Shopify URL missing,Access token eller Shopify URL saknas
 DocType: Location,Latitude,Latitud
 DocType: Work Order,Scrap Warehouse,skrot Warehouse
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py,"Warehouse required at Row No {0}, please set default warehouse for the item {1} for the company {2}","Lager som krävs vid rad nr {0}, ange standardlager för objektet {1} för företaget {2}"
@@ -6240,7 +6252,6 @@
 DocType: Job Offer Term,Value / Description,Värde / Beskrivning
 apps/erpnext/erpnext/controllers/accounts_controller.py,"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
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js,Are you sure you want to make credit note?,Är du säker på att du vill göra kreditnota?
 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,Debit and Credit not equal for {0} #{1}. Difference is {2}.,Debet och kredit inte är lika för {0} # {1}. Skillnaden är {2}.
@@ -6365,6 +6376,7 @@
 DocType: Purchase Invoice,Taxes and Charges Added,Skatter och avgifter Added
 apps/erpnext/erpnext/assets/doctype/asset/asset.py,Depreciation Row {0}: Next Depreciation Date cannot be before Available-for-use Date,Avskrivningsraden {0}: Nästa avskrivningsdatum kan inte vara före tillgängliga datum
 ,Sales Funnel,Försäljning tratt
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Item Code &gt; Item Group &gt; Brand,Produktkod&gt; Produktgrupp&gt; Märke
 apps/erpnext/erpnext/setup/doctype/company/company.py,Abbreviation is mandatory,Förkortning är obligatorisk
 DocType: Project,Task Progress,Task framsteg
 apps/erpnext/erpnext/templates/includes/navbar/navbar_items.html,Cart,Kundvagn
@@ -6610,6 +6622,7 @@
 DocType: Employee Grade,Employee Grade,Anställd grad
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py,Piecework,Ackord
 DocType: GSTR 3B Report,June,juni
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Supplier &gt; Supplier Type,Leverantör&gt; Leverantörstyp
 DocType: Share Balance,From No,Från nr
 DocType: Shift Type,Early Exit Grace Period,Period för tidig utgång
 DocType: Task,Actual Time (in Hours),Faktisk tid (i timmar)
@@ -6895,6 +6908,7 @@
 DocType: Warehouse,Warehouse Name,Lager Namn
 DocType: Naming Series,Select Transaction,Välj transaktion
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py,Please enter Approving Role or Approving User,Ange Godkännande roll eller godkänna Användare
+apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.py,UOM Conversion factor ({0} -&gt; {1}) not found for item: {2},UOM-omvandlingsfaktor ({0} -&gt; {1}) hittades inte för artikeln: {2}
 apps/erpnext/erpnext/support/doctype/service_level_agreement/service_level_agreement.py,Service Level Agreement with Entity Type {0} and Entity {1} already exists.,Servicenivåavtal med entitetstyp {0} och enhet {1} finns redan.
 DocType: Journal Entry,Write Off Entry,Avskrivningspost
 DocType: BOM,Rate Of Materials Based On,Hastighet av material baserade på
@@ -7085,6 +7099,7 @@
 DocType: Quality Inspection Reading,Quality Inspection Reading,Kvalitetskontroll Läsning
 apps/erpnext/erpnext/stock/doctype/stock_settings/stock_settings.py,`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/stock/report/stock_balance/stock_balance.py,Earliest Age,Tidigaste ålder
 apps/erpnext/erpnext/utilities/user_progress.py,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.
 DocType: Quality Goal,Revision,Revision
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js,Healthcare Services,Hälsovårdstjänster
@@ -7128,6 +7143,7 @@
 apps/erpnext/erpnext/healthcare/doctype/patient_encounter/patient_encounter.js,Schedule Discharge,Schemaläggningsavgift
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py,Cheques and Deposits incorrectly cleared,Checkar och Insättningar rensas felaktigt
 DocType: Homepage Section Card,Homepage Section Card,Hemsida avsnitt kort
+,Amount To Be Billed,Belopp som ska faktureras
 apps/erpnext/erpnext/accounts/doctype/account/account.py,Account {0}: You can not assign itself as parent account,Konto {0}: Du kan inte tilldela sig själv som förälder konto
 DocType: Purchase Invoice Item,Price List Rate,Prislista värde
 apps/erpnext/erpnext/utilities/activation.py,Create customer quotes,Skapa kund citat
@@ -7180,6 +7196,7 @@
 DocType: Supplier Scorecard Criteria,Supplier Scorecard Criteria,Leverantörs Scorecard Criteria
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py,Please select Start Date and End Date for Item {0},Välj startdatum och slutdatum för punkt {0}
 DocType: Maintenance Schedule,MAT-MSH-.YYYY.-,MAT-MSH-.YYYY.-
+,Amount to Receive,Belopp som ska tas emot
 apps/erpnext/erpnext/education/doctype/student_group_creation_tool/student_group_creation_tool.py,Course is mandatory in row {0},Kursen är obligatorisk i rad {0}
 apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py,From date can not be greater than than To date,Från datum kan inte vara större än till datum
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py,To date cannot be before from date,Hittills inte kan vara före startdatum
@@ -7429,7 +7446,6 @@
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js,BOM and Manufacturing Quantity are required,BOM och tillverkningskvantitet krävs
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js,Ageing Range 2,Åldringsräckvidd 2
 DocType: SG Creation Tool Course,Max Strength,max Styrka
-apps/erpnext/erpnext/accounts/doctype/account/account.py,"Account {0} already exists in child company {1}. The following fields have different values, they should be same:<ul><li>{2}</li></ul>","Kontot {0} finns redan i barnföretaget {1}. Följande fält har olika värden, de bör vara samma: <ul><li> {2} </li></ul>"
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py,Installing presets,Installera förinställningar
 DocType: Fee Schedule,EDU-FSH-.YYYY.-,EDU-FSH-.YYYY.-
 apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js,No Delivery Note selected for Customer {},Ingen leveransnotering vald för kund {}
@@ -7641,6 +7657,7 @@
 DocType: Delivery Note,Print Without Amount,Skriv ut utan Belopp
 apps/erpnext/erpnext/accounts/report/asset_depreciation_ledger/asset_depreciation_ledger.py,Depreciation Date,avskrivnings Datum
 ,Work Orders in Progress,Arbetsorder pågår
+DocType: Customer Credit Limit,Bypass Credit Limit Check,Omkoppling kreditgräns kontroll
 DocType: Issue,Support Team,Support Team
 apps/erpnext/erpnext/stock/report/batch_item_expiry_status/batch_item_expiry_status.py,Expiry (In Days),Ut (i dagar)
 DocType: Appraisal,Total Score (Out of 5),Totalt Betyg (Out of 5)
@@ -7827,6 +7844,7 @@
 DocType: Sales Invoice,Customer GSTIN,Kund GSTIN
 DocType: Crop Cycle,List of diseases detected on the field. When selected it'll automatically add a list of tasks to deal with the disease ,Lista över sjukdomar som upptäckts på fältet. När den väljs kommer den automatiskt att lägga till en lista över uppgifter för att hantera sjukdomen
 apps/erpnext/erpnext/manufacturing/page/bom_comparison_tool/bom_comparison_tool.js,BOM 1,BOM 1
+apps/erpnext/erpnext/assets/report/fixed_asset_register/fixed_asset_register.py,Asset Id,Tillgångs-id
 apps/erpnext/erpnext/healthcare/doctype/healthcare_service_unit/healthcare_service_unit.js,This is a root healthcare service unit and cannot be edited.,Detta är en root healthcare service enhet och kan inte redigeras.
 DocType: Asset Repair,Repair Status,Reparationsstatus
 apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.js,"Requested Qty: Quantity requested for purchase, but not ordered.","Antal efterfrågade: Antal som begärs för köp, men inte beställt."
diff --git a/erpnext/translations/sw.csv b/erpnext/translations/sw.csv
index e4a6361..fcc0c12 100644
--- a/erpnext/translations/sw.csv
+++ b/erpnext/translations/sw.csv
@@ -288,7 +288,6 @@
 DocType: Loan,Repay Over Number of Periods,Rejesha Zaidi ya Kipindi cha Kipindi
 apps/erpnext/erpnext/manufacturing/report/bom_stock_report/bom_stock_report.py,Quantity to Produce can not be less than Zero,Wingi wa Kutengeneza hauwezi kuwa chini ya Zero
 DocType: Stock Entry,Additional Costs,Gharama za ziada
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Customer &gt; Customer Group &gt; Territory,Mteja&gt; Kikundi cha Wateja&gt; Wilaya
 apps/erpnext/erpnext/accounts/doctype/account/account.py,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
@@ -585,6 +584,7 @@
 DocType: Healthcare Settings,Create documents for sample collection,Unda nyaraka za ukusanyaji wa sampuli
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py,Payment against {0} {1} cannot be greater than Outstanding Amount {2},Malipo dhidi ya {0} {1} haiwezi kuwa kubwa zaidi kuliko Kiasi Kikubwa {2}
 apps/erpnext/erpnext/patches/v11_0/add_healthcare_service_unit_tree_root.py,All Healthcare Service Units,Huduma zote za huduma za afya
+apps/erpnext/erpnext/setup/default_energy_point_rules.py,On Converting Opportunity,Juu ya Kubadilisha Fursa
 DocType: Bank Account,Address HTML,Weka HTML
 DocType: Lead,Mobile No.,Simu ya Simu
 apps/erpnext/erpnext/selling/doctype/pos_closing_voucher/closing_voucher_details.html,Mode of Payments,Hali ya Malipo
@@ -649,7 +649,6 @@
 DocType: Accounting Dimension,Dimension Name,Jina la Vipimo
 apps/erpnext/erpnext/healthcare/setup.py,Resistant,Wanakabiliwa
 apps/erpnext/erpnext/hotels/doctype/hotel_room_reservation/hotel_room_reservation.py,Please set Hotel Room Rate on {},Tafadhali weka Kiwango cha Chumba cha Hoteli kwenye {}
-apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py,Please setup numbering series for Attendance via Setup &gt; Numbering Series,Tafadhali sasisha safu za nambari za Kuhudhuria kupitia Usanidi&gt; Mfululizo wa hesabu
 DocType: Journal Entry,Multi Currency,Fedha nyingi
 DocType: Bank Statement Transaction Invoice Item,Invoice Type,Aina ya ankara
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py,Valid from date must be less than valid upto date,Inayotumika kutoka tarehe lazima iwe chini ya tarehe halali halali
@@ -764,6 +763,7 @@
 apps/erpnext/erpnext/accounts/page/pos/pos.js,Create a new Customer,Unda Wateja wapya
 apps/erpnext/erpnext/non_profit/report/expiring_memberships/expiring_memberships.py,Expiring On,Kuzimia
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,"If multiple Pricing Rules continue to prevail, users are asked to set Priority manually to resolve conflict.","Ikiwa Sheria nyingi za bei zinaendelea kushinda, watumiaji wanaombwa kuweka Kipaumbele kwa mikono ili kutatua migogoro."
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js,Purchase Return,Ununuzi wa Kurudisha
 apps/erpnext/erpnext/utilities/activation.py,Create Purchase Orders,Unda Amri ya Ununuzi
 ,Purchase Register,Daftari ya Ununuzi
 apps/erpnext/erpnext/healthcare/doctype/patient/patient.py,Patient not found,Mgonjwa haipatikani
@@ -779,7 +779,6 @@
 DocType: Location,Area UOM,Simu ya UOM
 apps/erpnext/erpnext/manufacturing/doctype/workstation/workstation.py,Workstation is closed on the following dates as per Holiday List: {0},Kazi imefungwa kwenye tarehe zifuatazo kama kwa orodha ya likizo: {0}
 apps/erpnext/erpnext/selling/page/sales_funnel/sales_funnel.py,Opportunities,Fursa
-apps/erpnext/erpnext/www/all-products/index.html,Clear filters,Futa vichungi
 DocType: Lab Test Template,Single,Mmoja
 DocType: Compensatory Leave Request,Work From Date,Kazi Kutoka Tarehe
 DocType: Salary Slip,Total Loan Repayment,Ulipaji wa Mkopo wa Jumla
@@ -822,6 +821,7 @@
 DocType: Account,Old Parent,Mzazi wa Kale
 apps/erpnext/erpnext/education/doctype/program_enrollment_tool/program_enrollment_tool.py,Mandatory field - Academic Year,Sehemu ya lazima - Mwaka wa Elimu
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py,{0} {1} is not associated with {2} {3},{0} {1} haihusiani na {2} {3}
+DocType: Opportunity,Converted By,Imegeuzwa na
 apps/erpnext/erpnext/public/js/hub/components/ReviewArea.vue,You need to login as a Marketplace User before you can add any reviews.,Unahitaji kuingia kama Mtumiaji wa Soko kabla ya kuongeza maoni yoyote.
 apps/erpnext/erpnext/manufacturing/doctype/job_card/job_card.py,Row {0} : Operation is required against the raw material item {1},Row {0}: Uendeshaji unahitajika dhidi ya bidhaa za malighafi {1}
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py,Please set default payable account for the company {0},Tafadhali weka akaunti ya malipo yenye malipo ya kampuni {0}
@@ -847,6 +847,8 @@
 DocType: BOM,Work Order,Kazi ya Kazi
 DocType: Sales Invoice,Total Qty,Uchina wa jumla
 apps/erpnext/erpnext/education/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py,Guardian2 Email ID,Guardian2 Barua ya barua pepe
+apps/erpnext/erpnext/hr/doctype/employee_transfer/employee_transfer.py,"Please delete the Employee <a href=""#Form/Employee/{0}"">{0}</a>\
+					to cancel this document","Tafadhali futa Mfanyikazi <a href=""#Form/Employee/{0}"">{0}</a> \ ili kughairi hati hii"
 DocType: Item,Show in Website (Variant),Onyesha kwenye tovuti (Tofauti)
 DocType: Employee,Health Concerns,Mateso ya Afya
 DocType: Payroll Entry,Select Payroll Period,Chagua Kipindi cha Mishahara
@@ -906,7 +908,6 @@
 DocType: Codification Table,Codification Table,Jedwali la Ushauri
 DocType: Timesheet Detail,Hrs,Hrs
 apps/erpnext/erpnext/manufacturing/page/bom_comparison_tool/bom_comparison_tool.js,Changes in {0},Mabadiliko katika {0}
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js,Please select Company,Tafadhali chagua Kampuni
 DocType: Employee Skill,Employee Skill,Ujuzi wa Mfanyikazi
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.js,Difference Account,Akaunti ya Tofauti
 DocType: Pricing Rule,Discount on Other Item,Punguzo kwa Bidhaa nyingine
@@ -973,6 +974,7 @@
 DocType: BOM,Operating Cost,Gharama za uendeshaji
 DocType: Crop,Produced Items,Vitu vinavyotengenezwa
 DocType: Bank Statement Transaction Entry,Match Transaction to Invoices,Mchanganyiko wa mechi kwa ankara
+apps/erpnext/erpnext/erpnext_integrations/exotel_integration.py,Error in Exotel incoming call,Kosa katika Exotel simu inayoingia
 DocType: Sales Order Item,Gross Profit,Faida Pato
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js,Unblock Invoice,Fungua ankara
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py,Increment cannot be 0,Uingizaji hauwezi kuwa 0
@@ -1186,6 +1188,7 @@
 DocType: Activity Cost,Activity Type,Aina ya Shughuli
 DocType: Request for Quotation,For individual supplier,Kwa muuzaji binafsi
 DocType: BOM Operation,Base Hour Rate(Company Currency),Kiwango cha saa ya msingi (Fedha la Kampuni)
+,Qty To Be Billed,Qty Kujazwa
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py,Delivered Amount,Kiasi kilichotolewa
 apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.js,Reserved Qty for Production: Raw materials quantity to make manufacturing items.,Qty iliyohifadhiwa kwa Uzalishaji: Wingi wa malighafi kutengeneza vitu vya utengenezaji.
 DocType: Loyalty Point Entry Redemption,Redemption Date,Tarehe ya ukombozi
@@ -1304,7 +1307,7 @@
 DocType: Sales Invoice,Commission Rate (%),Kiwango cha Tume (%)
 apps/erpnext/erpnext/education/doctype/student_group/student_group.py,Please select Program,Tafadhali chagua Programu
 DocType: Project,Estimated Cost,Gharama zilizohesabiwa
-DocType: Request for Quotation,Link to material requests,Unganisha maombi ya vifaa
+DocType: Supplier Quotation,Link to material requests,Unganisha maombi ya vifaa
 apps/erpnext/erpnext/public/js/hub/pages/Publish.vue,Publish,Kuchapisha
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py,Aerospace,Mazingira
 ,Fichier des Ecritures Comptables [FEC],Faili la Maandiko ya Comptables [FEC]
@@ -1317,6 +1320,7 @@
 apps/erpnext/erpnext/utilities/transaction_base.py,Invalid Posting Time,Muda usio sahihi wa Kuchapa
 DocType: Salary Component,Condition and Formula,Hali na Mfumo
 DocType: Lead,Campaign Name,Jina la Kampeni
+apps/erpnext/erpnext/setup/default_energy_point_rules.py,On Task Completion,Kwenye Kukamilika kwa Kazi
 apps/erpnext/erpnext/hr/doctype/compensatory_leave_request/compensatory_leave_request.py,There is no leave period in between {0} and {1},Hakuna kipindi cha kuondoka kati ya {0} na {1}
 DocType: Fee Validity,Healthcare Practitioner,Daktari wa Afya
 DocType: Hotel Room,Capacity,Uwezo
@@ -1661,7 +1665,6 @@
 DocType: Quality Feedback Template,Quality Feedback Template,Kiolezo cha Maoni ya Ubora
 apps/erpnext/erpnext/config/education.py,LMS Activity,Shughuli ya LMS
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py,Internet Publishing,Kuchapisha mtandao
-DocType: Prescription Duration,Number,Nambari
 apps/erpnext/erpnext/accounts/doctype/opening_invoice_creation_tool/opening_invoice_creation_tool.js,Creating {0} Invoice,Kujenga {0} ankara
 DocType: Medical Code,Medical Code Standard,Kanuni ya Matibabu ya Kiwango
 DocType: Soil Texture,Clay Composition (%),Muundo wa Clay (%)
@@ -1736,6 +1739,7 @@
 DocType: Support Settings,Get Started Sections,Fungua Sehemu
 DocType: Lead,CRM-LEAD-.YYYY.-,MKAZI-MWEZI - YYYY.-
 DocType: Invoice Discounting,Sanctioned,Imeteuliwa
+,Base Amount,Kiasi cha msingi
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.js,Total Contribution Amount: {0},Kiasi cha Ugawaji Jumla: {0}
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py,Row #{0}: Please specify Serial No for Item {1},Row # {0}: Tafadhali taja Serial Hakuna kwa Bidhaa {1}
 DocType: Payroll Entry,Salary Slips Submitted,Slips za Mshahara Iliombwa
@@ -1953,6 +1957,7 @@
 apps/erpnext/erpnext/utilities/user_progress.py,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.
 DocType: Accounting Dimension,Dimension Defaults,Mapungufu ya Vipimo
 apps/erpnext/erpnext/crm/report/prospects_engaged_but_not_converted/prospects_engaged_but_not_converted.js,Minimum Lead Age (Days),Umri wa Kiongozi wa Chini (Siku)
+apps/erpnext/erpnext/assets/report/fixed_asset_register/fixed_asset_register.py,Available For Use Date,Inapatikana Kwa Tarehe ya Matumizi
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py,All BOMs,BOM zote
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js,Create Inter Company Journal Entry,Unda Kiingilio cha Kijarida cha Kampuni
 DocType: Company,Parent Company,Kampuni mama
@@ -2017,6 +2022,7 @@
 ,IRS 1099,IRS 1099
 DocType: Salary Slip,Leave Without Pay,Acha bila Bila Kulipa
 DocType: Payment Request,Outward,Nje
+apps/erpnext/erpnext/setup/default_energy_point_rules.py,On {0} Creation,Kwenye {0} Ubunifu
 apps/erpnext/erpnext/regional/doctype/gstr_3b_report/gstr_3b_report.html,State/UT Tax,Ushuru wa Jimbo / UT
 ,Trial Balance for Party,Mizani ya majaribio kwa Chama
 ,Gross and Net Profit Report,Pato la jumla na faida ya Net
@@ -2132,6 +2138,7 @@
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js,Make Stock Entry,Fanya Uingilio wa Hisa
 DocType: Hotel Room Reservation,Hotel Reservation User,User Reservation User
 apps/erpnext/erpnext/projects/doctype/project/project.js,Set Status,Weka Hali
+apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py,Please setup numbering series for Attendance via Setup &gt; Numbering Series,Tafadhali sasisha safu za nambari za Kuhudhuria kupitia Usanidi&gt; Mfululizo wa hesabu
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py,Please select prefix first,Tafadhali chagua kiambatisho kwanza
 DocType: Contract,Fulfilment Deadline,Utekelezaji wa Mwisho
 apps/erpnext/erpnext/public/js/hub/pages/Home.vue,Near you,Karibu na wewe
@@ -2147,6 +2154,7 @@
 DocType: Announcement,All Students,Wanafunzi wote
 apps/erpnext/erpnext/assets/doctype/asset/asset.py,Item {0} must be a non-stock item,Kipengee {0} lazima iwe kipengee cha hisa
 apps/erpnext/erpnext/stock/doctype/batch/batch.js,View Ledger,Tazama kizuizi
+DocType: Cost Center,Lft,Karibu
 DocType: Grading Scale,Intervals,Mapumziko
 DocType: Bank Statement Transaction Entry,Reconciled Transactions,Shughuli zilizounganishwa
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py,Earliest,Mapema kabisa
@@ -2262,6 +2270,7 @@
 apps/erpnext/erpnext/hr/doctype/employee_benefit_application/employee_benefit_application.py,As per your assigned Salary Structure you cannot apply for benefits,Kwa mujibu wa Mfumo wa Mshahara uliopangwa huwezi kuomba faida
 apps/erpnext/erpnext/stock/doctype/item/item.py,Website Image should be a public file or website URL,Image ya tovuti lazima iwe faili ya umma au URL ya tovuti
 DocType: Purchase Invoice Item,BOM,BOM
+apps/erpnext/erpnext/stock/doctype/item/item.py,Duplicate entry in Manufacturers table,Kuingia marudio katika meza ya Watengenezaji
 apps/erpnext/erpnext/setup/doctype/item_group/item_group.js,This is a root item group and cannot be edited.,Hii ni kikundi cha bidhaa cha mizizi na haiwezi kuhaririwa.
 apps/erpnext/erpnext/accounts/doctype/account/account.js,Merge,Unganisha
 DocType: Journal Entry Account,Purchase Order,Amri ya Utunzaji
@@ -2404,7 +2413,6 @@
 DocType: Asset,Depreciation Schedules,Ratiba ya kushuka kwa thamani
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.js,Create Sales Invoice,Unda ankara ya Uuzaji
 apps/erpnext/erpnext/regional/doctype/gstr_3b_report/gstr_3b_report.html,Ineligible ITC,ITC isiyoweza kufikiwa
-apps/erpnext/erpnext/erpnext_integrations/doctype/shopify_settings/shopify_settings.py,"Support for public app is deprecated. Please setup private app, for more details refer user manual","Msaada kwa programu ya umma imepunguzwa. Tafadhali kuanzisha programu binafsi, kwa maelezo zaidi rejea mwongozo wa mtumiaji"
 DocType: Task,Dependent Tasks,Kazi za wategemezi
 apps/erpnext/erpnext/regional/report/gstr_1/gstr_1.py,Following accounts might be selected in GST Settings:,Kufuatia akaunti inaweza kuchaguliwa katika Mipangilio ya GST:
 apps/erpnext/erpnext/manufacturing/report/bom_stock_report/bom_stock_report.js,Quantity to Produce,Kiasi cha Kutengeneza
@@ -2656,6 +2664,7 @@
 DocType: Water Analysis,Container,Chombo
 apps/erpnext/erpnext/regional/report/gstr_1/gstr_1.py,Please set valid GSTIN No. in Company Address,Tafadhali weka halali GSTIN No katika Anwani ya Kampuni
 apps/erpnext/erpnext/education/utils.py,Student {0} - {1} appears Multiple times in row {2} & {3},Mwanafunzi {0} - {1} inaonekana mara nyingi mfululizo {2} &amp; {3}
+apps/erpnext/erpnext/selling/doctype/customer/customer.py,Following fields are mandatory to create address:,Sehemu zifuatazo ni lazima kuunda anwani:
 DocType: Item Alternative,Two-way,Njia mbili
 DocType: Item,Manufacturers,Watengenezaji
 apps/erpnext/erpnext/accounts/deferred_revenue.py,Error while processing deferred accounting for {0},Kosa wakati wa kushughulikia uhasibu uliocheleweshwa kwa {0}
@@ -2730,9 +2739,9 @@
 DocType: Employee,HR-EMP-,HR-EMP-
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py,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: Quality Meeting Minutes,Quality Meeting Minutes,Dakika za Mkutano wa Ubora
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Supplier &gt; Supplier Type,Mtoaji&gt; Aina ya wasambazaji
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py,Employee Referral,Kuhamishwa kwa Waajiriwa
 DocType: Student Group,Set 0 for no limit,Weka 0 bila kikomo
+DocType: Cost Center,rgt,rgt
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py,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.
 DocType: Customer,Primary Address and Contact Detail,Anwani ya Msingi na Maelezo ya Mawasiliano
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.js,Resend Payment Email,Tuma barua pepe ya malipo
@@ -2842,7 +2851,6 @@
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py,Against Supplier Invoice {0} dated {1},Dhidi ya Invoice ya Wasambazaji {0} dated {1}
 DocType: Customer,Default Price List,Orodha ya Bei ya Hitilafu
 apps/erpnext/erpnext/assets/doctype/asset/asset.py,Asset Movement record {0} created,Rekodi ya Movement ya Malipo {0} imeundwa
-apps/erpnext/erpnext/utilities/page/leaderboard/leaderboard.js,No items found.,Hakuna vitu vilivyopatikana.
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py,You cannot delete Fiscal Year {0}. Fiscal Year {0} is set as default in Global Settings,Huwezi kufuta Mwaka wa Fedha {0}. Mwaka wa Fedha {0} umewekwa kama default katika Mipangilio ya Global
 DocType: Share Transfer,Equity/Liability Account,Akaunti ya Equity / Dhima
 apps/erpnext/erpnext/setup/doctype/customer_group/customer_group.py,A customer with the same name already exists,Mteja mwenye jina sawa tayari yupo
@@ -2858,6 +2866,7 @@
 apps/erpnext/erpnext/selling/doctype/customer/customer.py,Credit limit has been crossed for customer {0} ({1}/{2}),Kizuizi cha mkopo kimevuka kwa wateja {0} ({1} / {2})
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py,Customer required for 'Customerwise Discount',Wateja wanahitajika kwa &#39;Msaada wa Wateja&#39;
 apps/erpnext/erpnext/config/accounting.py,Update bank payment dates with journals.,Sasisha tarehe za malipo ya benki na majarida.
+,Billed Qty,Bty Qty
 apps/erpnext/erpnext/stock/doctype/item/item_dashboard.py,Pricing,Bei
 DocType: Employee,Attendance Device ID (Biometric/RF tag ID),Kitambulisho cha Kiongozi wa Mahudhurio (Kitambulisho cha biometriska / kitambulisho cha RF)
 DocType: Quotation,Term Details,Maelezo ya muda
@@ -2879,6 +2888,7 @@
 DocType: Share Transfer,Asset Account,Akaunti ya Mali
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js,New release date should be in the future,Tarehe mpya ya kutolewa inapaswa kuwa katika siku zijazo
 DocType: Purchase Invoice,End date of current invoice's period,Tarehe ya mwisho ya kipindi cha ankara ya sasa
+apps/erpnext/erpnext/hr/doctype/employee/employee.py,Please setup Employee Naming System in Human Resource &gt; HR Settings,Tafadhali sasisha Mfumo wa Kumtaja Mfanyikazi katika Rasilimali Watu&gt; Mipangilio ya HR
 DocType: Lab Test,Technician Name,Jina la mafundi
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py,"Cannot ensure delivery by Serial No as \
 					Item {0} is added with and without Ensure Delivery by \
@@ -2886,6 +2896,7 @@
 DocType: Accounts Settings,Unlink Payment on Cancellation of Invoice,Unlink Malipo ya Kuondoa Invoice
 DocType: Bank Reconciliation,From Date,Kutoka Tarehe
 apps/erpnext/erpnext/hr/doctype/vehicle_log/vehicle_log.py,Current Odometer reading entered should be greater than initial Vehicle Odometer {0},Orodha ya Odometer ya sasa imewekwa inapaswa kuwa kubwa kuliko Odometer ya awali ya Gari {0}
+,Purchase Order Items To Be Received or Billed,Vitu vya Agizo la Ununuzi Upate au Kupwa
 DocType: Restaurant Reservation,No Show,Hakuna Onyesha
 apps/erpnext/erpnext/regional/india/utils.py,You must be a registered supplier to generate e-Way Bill,Lazima uwe muuzaji aliyesajiliwa ili kuunda Muswada wa e-Way
 DocType: Shipping Rule Country,Shipping Rule Country,Nchi ya Maagizo ya Utoaji
@@ -2928,6 +2939,7 @@
 apps/erpnext/erpnext/templates/generators/item/item_add_to_cart.html,View in Cart,Angalia katika Kifaa
 DocType: Employee Checkin,Shift Actual Start,Mwanzo wa Shift
 DocType: Tally Migration,Is Day Book Data Imported,Je! Data ya Kitabu cha Siku imehitajika
+,Purchase Order Items To Be Received or Billed1,Vitu vya Agizo la Ununuzi Ili Kupokelewa au Bili1
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py,Marketing Expenses,Malipo ya Masoko
 apps/erpnext/erpnext/stock/doctype/pick_list/pick_list.py,{0} units of {1} is not available.,Sehemu za {0} za {1} hazipatikani.
 ,Item Shortage Report,Ripoti ya uhaba wa habari
@@ -3152,7 +3164,6 @@
 apps/erpnext/erpnext/public/js/call_popup/call_popup.js,View all issues from {0},Angalia maswala yote kutoka {0}
 DocType: Quality Inspection,MAT-QA-.YYYY.-,MAT-QA -YYYY.-
 DocType: Quality Meeting Table,Quality Meeting Table,Jedwali la Mkutano wa Ubora
-apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,Tafadhali weka Mfululizo wa Jina la {0} kupitia Kusanidi&gt; Mipangilio&gt; Mfululizo wa Kumtaja
 apps/erpnext/erpnext/templates/pages/help.html,Visit the forums,Tembelea vikao
 DocType: Student,Student Mobile Number,Namba ya Simu ya Wanafunzi
 DocType: Item,Has Variants,Ina tofauti
@@ -3294,6 +3305,7 @@
 DocType: Homepage Section,Section Cards,Kadi za Sehemu
 ,Campaign Efficiency,Ufanisi wa Kampeni
 DocType: Discussion,Discussion,Majadiliano
+apps/erpnext/erpnext/setup/default_energy_point_rules.py,On Sales Order Submission,Kwenye Uwasilishaji wa Agizo la Uuzaji
 DocType: Bank Transaction,Transaction ID,Kitambulisho cha Shughuli
 DocType: Payroll Entry,Deduct Tax For Unsubmitted Tax Exemption Proof,Kutoa Ushuru kwa Uthibitishaji wa Ushuru wa Unsubmitted
 DocType: Volunteer,Anytime,Wakati wowote
@@ -3301,7 +3313,6 @@
 DocType: Employee Tax Exemption Proof Submission,Employee Tax Exemption Proof Submission,Ushuru wa Waajiri wa Ushuru wa Ushahidi
 DocType: Patient,Surgical History,Historia ya upasuaji
 DocType: Bank Statement Settings Item,Mapped Header,Kichwa cha Mapped
-apps/erpnext/erpnext/hr/doctype/employee/employee.py,Please setup Employee Naming System in Human Resource &gt; HR Settings,Tafadhali wasanidi Mfumo wa Kumtaja Mfanyikazi katika Rasilimali Watu&gt; Mipangilio ya HR
 DocType: Employee,Resignation Letter Date,Barua ya Kuondoa Tarehe
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Pricing Rules are further filtered based on quantity.,Kanuni za bei ni zilizochujwa zaidi kulingana na wingi.
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py,Please set the Date Of Joining for employee {0},Tafadhali weka tarehe ya kujiunga na mfanyakazi {0}
@@ -3315,6 +3326,7 @@
 DocType: Bank Statement Settings,Mapped Items,Vipengee Vipengeke
 DocType: Amazon MWS Settings,IT,IT
 DocType: Chapter,Chapter,Sura
+,Fixed Asset Register,Rejista ya Mali isiyohamishika
 apps/erpnext/erpnext/utilities/user_progress.py,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,Select BOM and Qty for Production,Chagua BOM na Uchina kwa Uzalishaji
@@ -3449,7 +3461,6 @@
 apps/erpnext/erpnext/templates/emails/reorder_item.html,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
 apps/erpnext/erpnext/controllers/accounts_controller.py,Account {0} is invalid. Account Currency must be {1},Akaunti {0} ni batili. Fedha ya Akaunti lazima iwe {1}
 apps/erpnext/erpnext/hr/doctype/salary_structure_assignment/salary_structure_assignment.py,From Date {0} cannot be after employee's relieving Date {1},Kutoka tarehe {0} haiwezi kuwa baada ya Tarehe ya kuondokana na mfanyakazi {1}
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py,Debit Note {0} has been created automatically,Ujumbe wa Debit {0} umeundwa kiotomatiki
 apps/erpnext/erpnext/accounts/doctype/payment_order/payment_order.js,Create Payment Entries,Unda Wasilisho wa Malipo
 DocType: Supplier,Is Internal Supplier,Ni wauzaji wa ndani
 DocType: Employee,Create User Permission,Unda Ruhusa ya Mtumiaji
@@ -4007,7 +4018,6 @@
 DocType: Project User,Project Status,Hali ya Mradi
 DocType: UOM,Check this to disallow fractions. (for Nos),Angalia hii ili kupinga marufuku. (kwa Nos)
 DocType: Student Admission Program,Naming Series (for Student Applicant),Mfululizo wa majina (kwa Msaidizi wa Mwanafunzi)
-apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.py,UOM Conversion factor ({0} -&gt; {1}) not found for item: {2},Sababu ya ubadilishaji wa UOM ({0} -&gt; {1}) haipatikani kwa kipengee: {2}
 apps/erpnext/erpnext/hr/doctype/retention_bonus/retention_bonus.py,Bonus Payment Date cannot be a past date,Tarehe ya Malipo ya Bonus haiwezi kuwa tarehe iliyopita
 DocType: Travel Request,Copy of Invitation/Announcement,Nakala ya Mwaliko / Matangazo
 DocType: Practitioner Service Unit Schedule,Practitioner Service Unit Schedule,Ratiba ya Kitengo cha Utumishi
@@ -4155,6 +4165,7 @@
 apps/erpnext/erpnext/utilities/user_progress.py,Setup Company,Kampuni ya Kuweka
 ,Lab Test Report,Ripoti ya Mtihani wa Lab
 DocType: Employee Benefit Application,Employee Benefit Application,Maombi ya Faida ya Wafanyakazi
+apps/erpnext/erpnext/accounts/doctype/invoice_discounting/invoice_discounting.py,Row({0}): {1} is already discounted in {2},Njia ({0}): {1} tayari imepunguzwa katika {2}
 apps/erpnext/erpnext/hr/doctype/additional_salary/additional_salary.py,Additional Salary Component Exists.,Vidokezo vya Sehemu ya Mshahara.
 DocType: Purchase Invoice,Unregistered,Iliyosajiliwa
 DocType: Student Applicant,Application Date,Tarehe ya Maombi
@@ -4233,7 +4244,6 @@
 DocType: Journal Entry,Accounting Entries,Uingizaji wa Uhasibu
 DocType: Job Card Time Log,Job Card Time Log,Kadi ya Kazi wakati wa Log
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,"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;"
-apps/erpnext/erpnext/education/doctype/instructor/instructor.py,Please setup Instructor Naming System in Education &gt; Education Settings,Tafadhali wasanidi Mfumo wa Kumtaja Mtaalam katika Elimu&gt; Mipangilio ya elimu
 DocType: Journal Entry,Paid Loan,Mikopo iliyolipwa
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py,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
@@ -4250,7 +4260,6 @@
 apps/erpnext/erpnext/templates/pages/projects.html,No time sheets,Hakuna karatasi za wakati
 DocType: GoCardless Mandate,GoCardless Customer,Wateja wa GoCardless
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py,Leave Type {0} cannot be carry-forwarded,Acha Aina {0} haiwezi kubeba
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Item Code &gt; Item Group &gt; Brand,Nambari ya Bidhaa&gt; Kikundi cha bidhaa&gt; Brand
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py,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
 DocType: Leave Encashment,Payroll,Mishahara
@@ -4365,7 +4374,6 @@
 DocType: Stock Ledger Entry,Actual Qty After Transaction,Uhakika halisi baada ya Shughuli
 ,Pending SO Items For Purchase Request,Inasubiri vitu vya SO Kwa Ununuzi wa Ombi
 apps/erpnext/erpnext/education/doctype/student_admission/student_admission.py,Student Admissions,Uingizaji wa Wanafunzi
-apps/erpnext/erpnext/accounts/party.py,{0} {1} is disabled,{0} {1} imezimwa
 DocType: Supplier,Billing Currency,Fedha ya kulipia
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py,Extra Large,Ziada kubwa
 DocType: Loan,Loan Application,Maombi ya Mikopo
@@ -4442,7 +4450,6 @@
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py,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/accounts/doctype/accounting_dimension/accounting_dimension.py,Creating Dimensions...,Inaunda vipimo ...
 apps/erpnext/erpnext/education/doctype/student_group_creation_tool/student_group_creation_tool.py,Student Group Name is mandatory in row {0},Jina la Kikundi cha Wanafunzi ni lazima katika mstari {0}
-DocType: Customer Credit Limit,Bypass credit limit_check,Mpakaji wa mkopo wa Bypass
 DocType: Homepage,Products to be shown on website homepage,Bidhaa zinazoonyeshwa kwenye ukurasa wa nyumbani wa tovuti
 DocType: HR Settings,Password Policy,Sera ya nywila
 apps/erpnext/erpnext/setup/doctype/customer_group/customer_group.js,This is a root customer group and cannot be edited.,Huu ni kikundi cha wateja wa mizizi na hauwezi kuhaririwa.
@@ -4734,6 +4741,7 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py,Row {0}: Advance against Customer must be credit,Row {0}: Upendeleo dhidi ya Wateja lazima uwe mkopo
 DocType: Quality Meeting,Quality Meeting,Mkutano wa Ubora
 apps/erpnext/erpnext/accounts/doctype/account/account.js,Non-Group to Group,Siyo Kikundi kwa Kundi
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,Tafadhali weka Mfululizo wa Jina la {0} kupitia Kusanidi&gt; Mipangilio&gt; Mfululizo wa Kumtaja
 DocType: Employee,ERPNext User,ERPNext User
 apps/erpnext/erpnext/education/doctype/student_group_creation_tool/student_group_creation_tool.py,Batch is mandatory in row {0},Kundi ni lazima katika mstari {0}
 DocType: Company,Default Buying Terms,Masharti ya Kununua chaguo msingi
@@ -5027,6 +5035,7 @@
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py,No {0} found for Inter Company Transactions.,Hakuna {0} kupatikana kwa Shughuli za Inter Company.
 DocType: Travel Itinerary,Rented Car,Imesajiliwa Gari
 apps/erpnext/erpnext/public/js/hub/components/profile_dialog.js,About your Company,Kuhusu Kampuni yako
+apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.js,Show Stock Ageing Data,Onyesha data ya uzee wa hisa
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py,Credit To account must be a Balance Sheet account,Mikopo Kwa akaunti lazima iwe Hesabu ya Hesabu ya Hesabu
 DocType: Donor,Donor,Msaidizi
 DocType: Global Defaults,Disable In Words,Zimaza Maneno
@@ -5041,8 +5050,10 @@
 DocType: Practitioner Schedule,Schedule Name,Jina la Ratiba
 apps/erpnext/erpnext/regional/doctype/gstr_3b_report/gstr_3b_report.py,Please enter GSTIN and state for the Company Address {0},Tafadhali ingiza GSTIN na eleza anwani ya Kampuni {0}
 DocType: Currency Exchange,For Buying,Kwa Ununuzi
+apps/erpnext/erpnext/setup/default_energy_point_rules.py,On Purchase Order Submission,Juu ya Uwasilishaji wa Agizo la Ununuzi
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js,Add All Suppliers,Ongeza Wauzaji Wote
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py,Row #{0}: Allocated Amount cannot be greater than outstanding amount.,Mstari # {0}: Kiasi kilichowekwa hawezi kuwa kikubwa zaidi kuliko kiasi kikubwa.
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Customer &gt; Customer Group &gt; Territory,Mteja&gt; Kikundi cha Wateja&gt; Wilaya
 DocType: Tally Migration,Parties,Vyama
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js,Browse BOM,Tafuta BOM
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py,Secured Loans,Mikopo ya Salama
@@ -5074,6 +5085,7 @@
 apps/erpnext/erpnext/stock/doctype/item_alternative/item_alternative.py,Not allow to set alternative item for the item {0},Usiruhusu kuweka kitu mbadala kwa kipengee {0}
 apps/erpnext/erpnext/hr/doctype/leave_block_list/leave_block_list.py,Date is repeated,Tarehe inarudiwa
 apps/erpnext/erpnext/accounts/print_format/payment_receipt_voucher/payment_receipt_voucher.html,Authorized Signatory,Ishara iliyoidhinishwa
+apps/erpnext/erpnext/education/doctype/instructor/instructor.py,Please setup Instructor Naming System in Education &gt; Education Settings,Tafadhali wasanidi Mfumo wa Kumtaja Mtaalam katika Elimu&gt; Mipangilio ya elimu
 apps/erpnext/erpnext/regional/doctype/gstr_3b_report/gstr_3b_report.html,Net ITC Available(A) - (B),ITC Inapatikana (A) - (B)
 apps/erpnext/erpnext/education/doctype/fee_schedule/fee_schedule.js,Create Fees,Unda ada
 DocType: Project,Total Purchase Cost (via Purchase Invoice),Gharama ya Jumla ya Ununuzi (kupitia Invoice ya Ununuzi)
@@ -5094,6 +5106,7 @@
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.js,Message Sent,Ujumbe uliotumwa
 apps/erpnext/erpnext/accounts/doctype/account/account.py,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/assets/report/fixed_asset_register/fixed_asset_register.py,Vendor Name,Jina la muuzaji
 DocType: Quiz Result,Wrong,Mbaya
 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)
@@ -5336,6 +5349,7 @@
 DocType: Stock Settings,Auto Material Request,Ombi la Nyenzo za Auto
 DocType: Woocommerce Settings,API consumer secret,Siri ya watumiaji wa API
 DocType: Delivery Note Item,Available Batch Qty at From Warehouse,Inapatikana Chini ya Baki Kutoka Kwenye Ghala
+,Received Qty Amount,Amepokea Kiasi cha Qty
 DocType: Salary Slip,Gross Pay - Total Deduction - Loan Repayment,Pato la Pato la Jumla - Utoaji Jumla - Ulipaji wa Mikopo
 DocType: Bank Account,Last Integration Date,Tarehe ya mwisho ya Ujumuishaji
 DocType: Expense Claim,Expense Taxes and Charges,Ushuru wa gharama na ada
@@ -5794,6 +5808,8 @@
 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,Please select Qty against item {0},Tafadhali chagua Uchina dhidi ya bidhaa {0}
+apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py,Latest Age,Umri wa hivi karibuni
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js,Transfer Material to Supplier,Transfer Nyenzo kwa Wasambazaji
 apps/erpnext/erpnext/hr/report/loan_repayment/loan_repayment.py,EMI,EMI
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py,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
@@ -5817,7 +5833,6 @@
 apps/erpnext/erpnext/hr/doctype/employee_benefit_application/employee_benefit_application.py,"An amount of {0} already claimed for the component {1},\
 						 set the amount equal or greater than {2}","Kiasi cha {0} tayari kilidai kwa sehemu {1}, \ kuweka kiasi sawa au zaidi kuliko {2}"
 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
 DocType: BOM Update Tool,The new BOM after replacement,BOM mpya baada ya kubadilishwa
 ,Point of Sale,Uhakika wa Uuzaji
@@ -5937,7 +5952,6 @@
 DocType: Purchase Order Item,Blanket Order Rate,Kiwango cha Mpangilio wa Kibatili
 ,Customer Ledger Summary,Muhtasari wa Mteja wa Wateja
 apps/erpnext/erpnext/hooks.py,Certification,Vyeti
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js,Are you sure you want to make debit note?,Je! Una uhakika unataka kuweka dokezo la kwanza?
 DocType: Bank Guarantee,Clauses and Conditions,Makala na Masharti
 DocType: Serial No,Creation Document Type,Aina ya Hati ya Uumbaji
 DocType: Amazon MWS Settings,ES,ES
@@ -5975,8 +5989,6 @@
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py,Financial Services,Huduma za Fedha
 DocType: Student Sibling,Student ID,Kitambulisho cha Mwanafunzi
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.js,For Quantity must be greater than zero,Kwa Wingi lazima uwe mkubwa kuliko sifuri
-apps/erpnext/erpnext/hr/doctype/employee_transfer/employee_transfer.py,"Please delete the Employee <a href=""#Form/Employee/{0}"">{0}</a>\
-					to cancel this document","Tafadhali futa Mfanyikazi <a href=""#Form/Employee/{0}"">{0}</a> \ ili kughairi hati hii"
 apps/erpnext/erpnext/config/projects.py,Types of activities for Time Logs,Aina ya shughuli za Kumbukumbu za Muda
 DocType: Opening Invoice Creation Tool,Sales,Mauzo
 DocType: Stock Entry Detail,Basic Amount,Kiasi cha Msingi
@@ -6055,6 +6067,7 @@
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py,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,Send Supplier Emails,Tuma barua pepe za Wasambazaji
+DocType: Asset Movement,ACC-ASM-.YYYY.-,ACC-ASM-.YYYY--
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py,"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
 apps/erpnext/erpnext/hr/doctype/employee_onboarding/employee_onboarding.py,Submit this to create the Employee record,Tuma hii ili kuunda rekodi ya Wafanyakazi
@@ -6132,7 +6145,6 @@
 DocType: Sales Team,Contact No.,Wasiliana Na.
 apps/erpnext/erpnext/templates/includes/cart/cart_address.html,Billing Address is same as Shipping Address,Anwani ya Bili ni sawa na Anwani ya Usafirishaji
 DocType: Bank Reconciliation,Payment Entries,Entries ya Malipo
-apps/erpnext/erpnext/erpnext_integrations/doctype/shopify_settings/shopify_settings.py,Access token or Shopify URL missing,Pata ishara ya kufikia au Duka la Ufikiaji
 DocType: Location,Latitude,Latitude
 DocType: Work Order,Scrap Warehouse,Ghala la Ghala
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py,"Warehouse required at Row No {0}, please set default warehouse for the item {1} for the company {2}","Ghala inayotakiwa katika Row No {0}, tafadhali tengeneza ghala la msingi kwa kipengee {1} kwa kampuni {2}"
@@ -6175,7 +6187,6 @@
 DocType: Job Offer Term,Value / Description,Thamani / Maelezo
 apps/erpnext/erpnext/controllers/accounts_controller.py,"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
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js,Are you sure you want to make credit note?,Je! Una uhakika unataka kufanya daftari la mkopo?
 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,Debit and Credit not equal for {0} #{1}. Difference is {2}.,Debit na Mikopo si sawa kwa {0} # {1}. Tofauti ni {2}.
@@ -6300,6 +6311,7 @@
 DocType: Purchase Invoice,Taxes and Charges Added,Kodi na Malipo Aliongeza
 apps/erpnext/erpnext/assets/doctype/asset/asset.py,Depreciation Row {0}: Next Depreciation Date cannot be before Available-for-use Date,Upungufu Row {0}: Tarehe ya Utoaji wa Dhamana haiwezi kuwa kabla ya Tarehe ya kupatikana
 ,Sales Funnel,Funnel ya Mauzo
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Item Code &gt; Item Group &gt; Brand,Nambari ya Bidhaa&gt; Kikundi cha bidhaa&gt; Brand
 apps/erpnext/erpnext/setup/doctype/company/company.py,Abbreviation is mandatory,Hali ni lazima
 DocType: Project,Task Progress,Maendeleo ya Kazi
 apps/erpnext/erpnext/templates/includes/navbar/navbar_items.html,Cart,Kadi
@@ -6543,6 +6555,7 @@
 DocType: Employee Grade,Employee Grade,Wafanyakazi wa darasa
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py,Piecework,Piecework
 DocType: GSTR 3B Report,June,Juni
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Supplier &gt; Supplier Type,Mtoaji&gt; Aina ya wasambazaji
 DocType: Share Balance,From No,Kutoka Hapana
 DocType: Shift Type,Early Exit Grace Period,Tarehe ya mapema ya Neema
 DocType: Task,Actual Time (in Hours),Muda halisi (katika Masaa)
@@ -6826,6 +6839,7 @@
 DocType: Warehouse,Warehouse Name,Jina la Ghala
 DocType: Naming Series,Select Transaction,Chagua Shughuli
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py,Please enter Approving Role or Approving User,Tafadhali ingiza Uwezeshaji au Kuidhinisha Mtumiaji
+apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.py,UOM Conversion factor ({0} -&gt; {1}) not found for item: {2},Sababu ya ubadilishaji wa UOM ({0} -&gt; {1}) haipatikani kwa kipengee: {2}
 apps/erpnext/erpnext/support/doctype/service_level_agreement/service_level_agreement.py,Service Level Agreement with Entity Type {0} and Entity {1} already exists.,Mkataba wa Kiwango cha Huduma na Aina ya Taasisi {0} na Taasisi {1} tayari ipo.
 DocType: Journal Entry,Write Off Entry,Andika Entry Entry
 DocType: BOM,Rate Of Materials Based On,Kiwango cha Vifaa vya msingi
@@ -7016,6 +7030,7 @@
 DocType: Quality Inspection Reading,Quality Inspection Reading,Uhakiki wa Uhakiki wa Ubora
 apps/erpnext/erpnext/stock/doctype/stock_settings/stock_settings.py,`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/stock/report/stock_balance/stock_balance.py,Earliest Age,Umri wa mapema
 apps/erpnext/erpnext/utilities/user_progress.py,Set a sales goal you'd like to achieve for your company.,Weka lengo la mauzo ungependa kufikia kwa kampuni yako.
 DocType: Quality Goal,Revision,Marudio
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js,Healthcare Services,Huduma za Huduma za Afya
@@ -7059,6 +7074,7 @@
 apps/erpnext/erpnext/healthcare/doctype/patient_encounter/patient_encounter.js,Schedule Discharge,Ratiba ya Kuondolewa
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py,Cheques and Deposits incorrectly cleared,Cheki na Deposits zimeondolewa kwa usahihi
 DocType: Homepage Section Card,Homepage Section Card,Kadi ya Sehemu ya Tovuti
+,Amount To Be Billed,Kiasi cha Kujazwa
 apps/erpnext/erpnext/accounts/doctype/account/account.py,Account {0}: You can not assign itself as parent account,Akaunti {0}: Huwezi kujitolea kama akaunti ya mzazi
 DocType: Purchase Invoice Item,Price List Rate,Orodha ya Bei ya Bei
 apps/erpnext/erpnext/utilities/activation.py,Create customer quotes,Unda nukuu za wateja
@@ -7111,6 +7127,7 @@
 DocType: Supplier Scorecard Criteria,Supplier Scorecard Criteria,Vigezo vya Scorecard za Wasambazaji
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py,Please select Start Date and End Date for Item {0},Tafadhali chagua tarehe ya kuanza na tarehe ya mwisho ya kipengee {0}
 DocType: Maintenance Schedule,MAT-MSH-.YYYY.-,MAT-MSH -YYYY.-
+,Amount to Receive,Kiasi cha Kupokea
 apps/erpnext/erpnext/education/doctype/student_group_creation_tool/student_group_creation_tool.py,Course is mandatory in row {0},Kozi ni lazima katika mstari {0}
 apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py,From date can not be greater than than To date,Kuanzia tarehe haiwezi kuwa kubwa kuliko leo
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py,To date cannot be before from date,Hadi sasa haiwezi kuwa kabla kabla ya tarehe
@@ -7357,7 +7374,6 @@
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js,BOM and Manufacturing Quantity are required,BOM na Uzalishaji wa Wingi huhitajika
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js,Ageing Range 2,Aina ya kuzeeka 2
 DocType: SG Creation Tool Course,Max Strength,Nguvu ya Max
-apps/erpnext/erpnext/accounts/doctype/account/account.py,"Account {0} already exists in child company {1}. The following fields have different values, they should be same:<ul><li>{2}</li></ul>","Akaunti {0} tayari inapatikana katika kampuni ya watoto {1}. Sehemu zifuatazo zina maadili tofauti, zinapaswa kuwa sawa: <ul><li> {2} </li></ul>"
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py,Installing presets,Inaweka presets
 DocType: Fee Schedule,EDU-FSH-.YYYY.-,EDU-FSH -YYYY.-
 apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js,No Delivery Note selected for Customer {},Hakuna Kumbukumbu ya Utoaji iliyochaguliwa kwa Wateja {}
@@ -7565,6 +7581,7 @@
 DocType: Delivery Note,Print Without Amount,Chapisha bila Bila
 apps/erpnext/erpnext/accounts/report/asset_depreciation_ledger/asset_depreciation_ledger.py,Depreciation Date,Tarehe ya kushuka kwa thamani
 ,Work Orders in Progress,Kazi ya Kazi katika Maendeleo
+DocType: Customer Credit Limit,Bypass Credit Limit Check,Kikomo cha Mkopo wa Bypass Angalia
 DocType: Issue,Support Team,Timu ya Kusaidia
 apps/erpnext/erpnext/stock/report/batch_item_expiry_status/batch_item_expiry_status.py,Expiry (In Days),Mwisho (Katika Siku)
 DocType: Appraisal,Total Score (Out of 5),Jumla ya alama (Kati ya 5)
@@ -7748,6 +7765,7 @@
 DocType: Sales Invoice,Customer GSTIN,GSTIN ya Wateja
 DocType: Crop Cycle,List of diseases detected on the field. When selected it'll automatically add a list of tasks to deal with the disease ,Orodha ya magonjwa wanaona kwenye shamba. Ukichaguliwa itaongeza moja kwa moja orodha ya kazi ili kukabiliana na ugonjwa huo
 apps/erpnext/erpnext/manufacturing/page/bom_comparison_tool/bom_comparison_tool.js,BOM 1,BOM 1
+apps/erpnext/erpnext/assets/report/fixed_asset_register/fixed_asset_register.py,Asset Id,Kitambulisho cha mali
 apps/erpnext/erpnext/healthcare/doctype/healthcare_service_unit/healthcare_service_unit.js,This is a root healthcare service unit and cannot be edited.,Hii ni kitengo cha huduma ya afya ya mizizi na haiwezi kuhaririwa.
 DocType: Asset Repair,Repair Status,Hali ya Ukarabati
 apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.js,"Requested Qty: Quantity requested for purchase, but not ordered.","Qty Iliyoulizwa: Wingi uliomba ununuliwe, lakini haujaamriwa."
diff --git a/erpnext/translations/ta.csv b/erpnext/translations/ta.csv
index 32f6792..56d1681 100644
--- a/erpnext/translations/ta.csv
+++ b/erpnext/translations/ta.csv
@@ -284,7 +284,6 @@
 DocType: Loan,Repay Over Number of Periods,திருப்பி பாடவேளைகள் ஓவர் எண்
 apps/erpnext/erpnext/manufacturing/report/bom_stock_report/bom_stock_report.py,Quantity to Produce can not be less than Zero,உற்பத்தி செய்வதற்கான அளவு பூஜ்ஜியத்தை விட குறைவாக இருக்கக்கூடாது
 DocType: Stock Entry,Additional Costs,கூடுதல் செலவுகள்
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Customer &gt; Customer Group &gt; Territory,வாடிக்கையாளர்&gt; வாடிக்கையாளர் குழு&gt; பிரதேசம்
 apps/erpnext/erpnext/accounts/doctype/account/account.py,Account with existing transaction can not be converted to group.,ஏற்கனவே பரிவர்த்தனை கணக்கு குழு மாற்றப்பட முடியாது .
 DocType: Lead,Product Enquiry,தயாரிப்பு விசாரணை
 DocType: Education Settings,Validate Batch for Students in Student Group,மாணவர் குழுமத்தின் மாணவர்களுக்கான தொகுதி சரிபார்க்கவும்
@@ -582,6 +581,7 @@
 DocType: Healthcare Settings,Create documents for sample collection,மாதிரி சேகரிப்புக்காக ஆவணங்களை உருவாக்கவும்
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py,Payment against {0} {1} cannot be greater than Outstanding Amount {2},எதிராக செலுத்தும் {0} {1} மிகச்சிறந்த காட்டிலும் அதிகமாக இருக்க முடியாது {2}
 apps/erpnext/erpnext/patches/v11_0/add_healthcare_service_unit_tree_root.py,All Healthcare Service Units,அனைத்து சுகாதார சேவை அலகுகள்
+apps/erpnext/erpnext/setup/default_energy_point_rules.py,On Converting Opportunity,வாய்ப்பை மாற்றுவதில்
 DocType: Bank Account,Address HTML,HTML முகவரி
 DocType: Lead,Mobile No.,மொபைல் எண்
 apps/erpnext/erpnext/selling/doctype/pos_closing_voucher/closing_voucher_details.html,Mode of Payments,கொடுப்பனவு முறை
@@ -647,7 +647,6 @@
 DocType: Accounting Dimension,Dimension Name,பரிமாண பெயர்
 apps/erpnext/erpnext/healthcare/setup.py,Resistant,எதிர்ப்பு
 apps/erpnext/erpnext/hotels/doctype/hotel_room_reservation/hotel_room_reservation.py,Please set Hotel Room Rate on {},{@} ஹோட்டல் அறை விகிதத்தை தயவுசெய்து அமைக்கவும்
-apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py,Please setup numbering series for Attendance via Setup &gt; Numbering Series,அமைவு&gt; எண்ணைத் தொடர் வழியாக வருகைக்கான எண்ணைத் தொடரை அமைக்கவும்
 DocType: Journal Entry,Multi Currency,பல நாணய
 DocType: Bank Statement Transaction Invoice Item,Invoice Type,விலைப்பட்டியல் வகை
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py,Valid from date must be less than valid upto date,தேதியிலிருந்து செல்லுபடியாகும் தேதி வரை செல்லுபடியாகும்
@@ -762,6 +761,7 @@
 apps/erpnext/erpnext/accounts/page/pos/pos.js,Create a new Customer,ஒரு புதிய வாடிக்கையாளர் உருவாக்கவும்
 apps/erpnext/erpnext/non_profit/report/expiring_memberships/expiring_memberships.py,Expiring On,காலாவதியாகும்
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,"If multiple Pricing Rules continue to prevail, users are asked to set Priority manually to resolve conflict.","பல விலை விதிகள் நிலவும் தொடர்ந்து இருந்தால், பயனர்கள் முரண்பாட்டை தீர்க்க கைமுறையாக முன்னுரிமை அமைக்க கேட்கப்பட்டது."
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js,Purchase Return,திரும்ப வாங்க
 apps/erpnext/erpnext/utilities/activation.py,Create Purchase Orders,கொள்முதல் ஆணைகள் உருவாக்க
 ,Purchase Register,பதிவு வாங்குவதற்கு
 apps/erpnext/erpnext/healthcare/doctype/patient/patient.py,Patient not found,நோயாளி இல்லை
@@ -776,7 +776,6 @@
 DocType: Location,Area UOM,பகுதி UOM
 apps/erpnext/erpnext/manufacturing/doctype/workstation/workstation.py,Workstation is closed on the following dates as per Holiday List: {0},பணிநிலையம் விடுமுறை பட்டியல் படி பின்வரும் தேதிகளில் மூடப்பட்டுள்ளது {0}
 apps/erpnext/erpnext/selling/page/sales_funnel/sales_funnel.py,Opportunities,வாய்ப்புகள்
-apps/erpnext/erpnext/www/all-products/index.html,Clear filters,வடிப்பான்களை அழி
 DocType: Lab Test Template,Single,ஒற்றை
 DocType: Compensatory Leave Request,Work From Date,தேதி வேலை
 DocType: Salary Slip,Total Loan Repayment,மொத்த கடன் தொகையை திரும்பச் செலுத்துதல்
@@ -820,6 +819,7 @@
 apps/erpnext/erpnext/education/doctype/program_enrollment_tool/program_enrollment_tool.py,Mandatory field - Academic Year,கட்டாய துறையில் - கல்வி ஆண்டு
 apps/erpnext/erpnext/education/doctype/program_enrollment_tool/program_enrollment_tool.py,Mandatory field - Academic Year,கட்டாய துறையில் - கல்வி ஆண்டு
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py,{0} {1} is not associated with {2} {3},{0} {1} {2} உடன் தொடர்புடையது இல்லை {3}
+DocType: Opportunity,Converted By,மூலம் மாற்றப்பட்டது
 apps/erpnext/erpnext/public/js/hub/components/ReviewArea.vue,You need to login as a Marketplace User before you can add any reviews.,நீங்கள் எந்த மதிப்புரைகளையும் சேர்க்கும் முன் சந்தை பயனராக உள்நுழைய வேண்டும்.
 apps/erpnext/erpnext/manufacturing/doctype/job_card/job_card.py,Row {0} : Operation is required against the raw material item {1},வரிசை {0}: மூலப்பொருள் உருப்படிக்கு எதிராக நடவடிக்கை தேவைப்படுகிறது {1}
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py,Please set default payable account for the company {0},நிறுவனம் இயல்புநிலை செலுத்தப்பட கணக்கு அமைக்கவும் {0}
@@ -844,6 +844,8 @@
 DocType: Sales Invoice,Total Qty,மொத்த அளவு
 apps/erpnext/erpnext/education/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py,Guardian2 Email ID,Guardian2 மின்னஞ்சல் ஐடி
 apps/erpnext/erpnext/education/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py,Guardian2 Email ID,Guardian2 மின்னஞ்சல் ஐடி
+apps/erpnext/erpnext/hr/doctype/employee_transfer/employee_transfer.py,"Please delete the Employee <a href=""#Form/Employee/{0}"">{0}</a>\
+					to cancel this document","இந்த ஆவணத்தை ரத்து செய்ய பணியாளர் <a href=""#Form/Employee/{0}"">{0}</a> delete ஐ நீக்கவும்"
 DocType: Item,Show in Website (Variant),இணையதளத்தில் அமைந்துள்ள ஷோ (மாற்று)
 DocType: Employee,Health Concerns,சுகாதார கவலைகள்
 DocType: Payroll Entry,Select Payroll Period,சம்பளப்பட்டியல் காலம் தேர்ந்தெடுக்கவும்
@@ -902,7 +904,6 @@
 apps/erpnext/erpnext/education/doctype/student_group/student_group.py,Please select Course,கோர்ஸ் தேர்ந்தெடுக்கவும்
 DocType: Codification Table,Codification Table,குறியீட்டு அட்டவணை
 DocType: Timesheet Detail,Hrs,மணி
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js,Please select Company,நிறுவனத்தின் தேர்ந்தெடுக்கவும்
 DocType: Employee Skill,Employee Skill,பணியாளர் திறன்
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.js,Difference Account,வித்தியாசம் கணக்கு
 DocType: Pricing Rule,Discount on Other Item,பிற பொருளுக்கு தள்ளுபடி
@@ -969,6 +970,7 @@
 DocType: BOM,Operating Cost,இயக்க செலவு
 DocType: Crop,Produced Items,தயாரிக்கப்பட்ட பொருட்கள்
 DocType: Bank Statement Transaction Entry,Match Transaction to Invoices,பொருள்களுக்கு பரிமாற்றத்தை ஒப்படைத்தல்
+apps/erpnext/erpnext/erpnext_integrations/exotel_integration.py,Error in Exotel incoming call,Exotel உள்வரும் அழைப்பில் பிழை
 DocType: Sales Order Item,Gross Profit,மொத்த இலாபம்
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js,Unblock Invoice,விலைப்பட்டியல் விலக்கு
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py,Increment cannot be 0,சம்பள உயர்வு 0 இருக்க முடியாது
@@ -1176,6 +1178,7 @@
 DocType: Activity Cost,Activity Type,நடவடிக்கை வகை
 DocType: Request for Quotation,For individual supplier,தனிப்பட்ட விநியோகித்து
 DocType: BOM Operation,Base Hour Rate(Company Currency),பேஸ் ஹவர் மதிப்பீடு (நிறுவனத்தின் நாணய)
+,Qty To Be Billed,கட்டணம் செலுத்தப்பட வேண்டும்
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py,Delivered Amount,வழங்கப்படுகிறது தொகை
 apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.js,Reserved Qty for Production: Raw materials quantity to make manufacturing items.,உற்பத்திக்கு ஒதுக்கப்பட்ட அளவு: உற்பத்தி பொருட்களை தயாரிக்க மூலப்பொருட்களின் அளவு.
 DocType: Loyalty Point Entry Redemption,Redemption Date,மீட்பு தேதி
@@ -1294,7 +1297,7 @@
 apps/erpnext/erpnext/education/doctype/student_group/student_group.py,Please select Program,தேர்ந்தெடுக்கவும் திட்டம்
 apps/erpnext/erpnext/education/doctype/student_group/student_group.py,Please select Program,தேர்ந்தெடுக்கவும் திட்டம்
 DocType: Project,Estimated Cost,விலை மதிப்பீடு
-DocType: Request for Quotation,Link to material requests,பொருள் கோரிக்கைகளை இணைப்பு
+DocType: Supplier Quotation,Link to material requests,பொருள் கோரிக்கைகளை இணைப்பு
 apps/erpnext/erpnext/public/js/hub/pages/Publish.vue,Publish,வெளியிடு
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py,Aerospace,வான்வெளி
 ,Fichier des Ecritures Comptables [FEC],ஃபிஷியர் டெஸ் எக்சிரிச்சர் காம்பப்டுகள் [FEC]
@@ -1307,6 +1310,7 @@
 apps/erpnext/erpnext/utilities/transaction_base.py,Invalid Posting Time,தவறான இடுகை நேரம்
 DocType: Salary Component,Condition and Formula,நிபந்தனை மற்றும் சூத்திரம்
 DocType: Lead,Campaign Name,பிரச்சாரம் பெயர்
+apps/erpnext/erpnext/setup/default_energy_point_rules.py,On Task Completion,பணி நிறைவு குறித்து
 apps/erpnext/erpnext/hr/doctype/compensatory_leave_request/compensatory_leave_request.py,There is no leave period in between {0} and {1},{0} மற்றும் {1} இடையில் விடுமுறை காலம் இல்லை
 DocType: Fee Validity,Healthcare Practitioner,ஹெல்த்கேர் பிராக்டிஷனர்
 DocType: Hotel Room,Capacity,கொள்ளளவு
@@ -1665,7 +1669,6 @@
 apps/erpnext/erpnext/config/education.py,LMS Activity,எல்எம்எஸ் செயல்பாடு
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py,Internet Publishing,"இணைய 
 வெளியிடுதல்"
-DocType: Prescription Duration,Number,எண்
 apps/erpnext/erpnext/accounts/doctype/opening_invoice_creation_tool/opening_invoice_creation_tool.js,Creating {0} Invoice,{0} விலைப்பட்டியல் உருவாக்குதல்
 DocType: Medical Code,Medical Code Standard,மருத்துவ குறியீடு தரநிலை
 DocType: Soil Texture,Clay Composition (%),களிமண் கலவை (%)
@@ -1740,6 +1743,7 @@
 DocType: Support Settings,Get Started Sections,தொடங்குதல் பிரிவுகள்
 DocType: Lead,CRM-LEAD-.YYYY.-,சிஆர்எம்-தலைமை-.YYYY.-
 DocType: Invoice Discounting,Sanctioned,ஒப்புதல்
+,Base Amount,அடிப்படை தொகை
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.js,Total Contribution Amount: {0},மொத்த பங்களிப்பு தொகை: {0}
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py,Row #{0}: Please specify Serial No for Item {1},ரோ # {0}: பொருள் சீரியல் இல்லை குறிப்பிடவும் {1}
 DocType: Payroll Entry,Salary Slips Submitted,சம்பளம் ஸ்லிப்ஸ் சமர்ப்பிக்கப்பட்டது
@@ -1959,6 +1963,7 @@
 DocType: Accounting Dimension,Dimension Defaults,பரிமாண இயல்புநிலைகள்
 apps/erpnext/erpnext/crm/report/prospects_engaged_but_not_converted/prospects_engaged_but_not_converted.js,Minimum Lead Age (Days),குறைந்தபட்ச முன்னணி வயது (நாட்கள்)
 apps/erpnext/erpnext/crm/report/prospects_engaged_but_not_converted/prospects_engaged_but_not_converted.js,Minimum Lead Age (Days),குறைந்தபட்ச முன்னணி வயது (நாட்கள்)
+apps/erpnext/erpnext/assets/report/fixed_asset_register/fixed_asset_register.py,Available For Use Date,பயன்பாட்டு தேதிக்கு கிடைக்கிறது
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py,All BOMs,அனைத்து BOM கள்
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js,Create Inter Company Journal Entry,இன்டர் கம்பெனி ஜர்னல் உள்ளீட்டை உருவாக்கவும்
 DocType: Company,Parent Company,பெற்றோர் நிறுவனம்
@@ -2021,6 +2026,7 @@
 ,IRS 1099,ஐஆர்எஸ் 1099
 DocType: Salary Slip,Leave Without Pay,சம்பளமில்லா விடுப்பு
 DocType: Payment Request,Outward,வெளிப்புறமாக
+apps/erpnext/erpnext/setup/default_energy_point_rules.py,On {0} Creation,{0} உருவாக்கத்தில்
 apps/erpnext/erpnext/regional/doctype/gstr_3b_report/gstr_3b_report.html,State/UT Tax,மாநில / யூடி வரி
 ,Trial Balance for Party,கட்சி சோதனை இருப்பு
 ,Gross and Net Profit Report,மொத்த மற்றும் நிகர லாப அறிக்கை
@@ -2134,6 +2140,7 @@
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js,Make Stock Entry,பங்கு நுழைவு செய்யுங்கள்
 DocType: Hotel Room Reservation,Hotel Reservation User,ஹோட்டல் முன்பதிவு பயனர்
 apps/erpnext/erpnext/projects/doctype/project/project.js,Set Status,நிலையை அமைக்கவும்
+apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py,Please setup numbering series for Attendance via Setup &gt; Numbering Series,அமைவு&gt; எண்ணைத் தொடர் வழியாக வருகைக்கான எண்ணைத் தொடரை அமைக்கவும்
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py,Please select prefix first,முதல் முன்னொட்டு தேர்வு செய்க
 DocType: Contract,Fulfilment Deadline,பூர்த்தி நிறைவேற்றுதல்
 apps/erpnext/erpnext/public/js/hub/pages/Home.vue,Near you,உன் அருகே
@@ -2149,6 +2156,7 @@
 DocType: Announcement,All Students,அனைத்து மாணவர்கள்
 apps/erpnext/erpnext/assets/doctype/asset/asset.py,Item {0} must be a non-stock item,பொருள் {0} ஒரு பங்கற்ற பொருளாக இருக்க வேண்டும்
 apps/erpnext/erpnext/stock/doctype/batch/batch.js,View Ledger,காட்சி லெட்ஜர்
+DocType: Cost Center,Lft,LFT
 DocType: Grading Scale,Intervals,இடைவெளிகள்
 DocType: Bank Statement Transaction Entry,Reconciled Transactions,மறுகட்டமைக்கப்பட்ட பரிவர்த்தனைகள்
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py,Earliest,முந்தைய
@@ -2263,6 +2271,7 @@
 apps/erpnext/erpnext/hr/doctype/employee_benefit_application/employee_benefit_application.py,As per your assigned Salary Structure you cannot apply for benefits,உங்கள் ஒதுக்கப்பட்ட சம்பள கட்டமைப்புப்படி நீங்கள் நன்மைக்காக விண்ணப்பிக்க முடியாது
 apps/erpnext/erpnext/stock/doctype/item/item.py,Website Image should be a public file or website URL,இணைய பட ஒரு பொது கோப்பு அல்லது வலைத்தளத்தின் URL இருக்க வேண்டும்
 DocType: Purchase Invoice Item,BOM,பொருட்களின் அளவுக்கான ரசீது(BOM)
+apps/erpnext/erpnext/stock/doctype/item/item.py,Duplicate entry in Manufacturers table,உற்பத்தியாளர்கள் அட்டவணையில் நகல் நுழைவு
 apps/erpnext/erpnext/setup/doctype/item_group/item_group.js,This is a root item group and cannot be edited.,இந்த ஒரு ரூட் உருப்படியை குழு மற்றும் திருத்த முடியாது .
 apps/erpnext/erpnext/accounts/doctype/account/account.js,Merge,Merge
 DocType: Journal Entry Account,Purchase Order,ஆர்டர் வாங்க
@@ -2405,7 +2414,6 @@
 DocType: Asset,Depreciation Schedules,தேய்மானம் கால அட்டவணைகள்
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.js,Create Sales Invoice,விற்பனை விலைப்பட்டியல் உருவாக்கவும்
 apps/erpnext/erpnext/regional/doctype/gstr_3b_report/gstr_3b_report.html,Ineligible ITC,தகுதியற்ற ஐ.டி.சி.
-apps/erpnext/erpnext/erpnext_integrations/doctype/shopify_settings/shopify_settings.py,"Support for public app is deprecated. Please setup private app, for more details refer user manual","பொது பயன்பாட்டிற்கான ஆதரவு நீக்கப்பட்டது. தயவுசெய்து தனிப்பட்ட பயன்பாட்டை அமைத்திடுங்கள், மேலும் விவரங்களுக்கு பயனர் கையேட்டைப் பார்க்கவும்"
 DocType: Task,Dependent Tasks,சார்பு பணிகள்
 apps/erpnext/erpnext/regional/report/gstr_1/gstr_1.py,Following accounts might be selected in GST Settings:,ஜிஎஸ்டி அமைப்புகளில் பின்வரும் கணக்குகள் தேர்ந்தெடுக்கப்படலாம்:
 apps/erpnext/erpnext/manufacturing/report/bom_stock_report/bom_stock_report.js,Quantity to Produce,உற்பத்தி செய்வதற்கான அளவு
@@ -2654,6 +2662,7 @@
 DocType: Water Analysis,Container,கொள்கலன்
 apps/erpnext/erpnext/regional/report/gstr_1/gstr_1.py,Please set valid GSTIN No. in Company Address,நிறுவனத்தின் முகவரியில் செல்லுபடியாகும் ஜி.எஸ்.டி.என் எண்ணை அமைக்கவும்
 apps/erpnext/erpnext/education/utils.py,Student {0} - {1} appears Multiple times in row {2} & {3},மாணவர் {0} - {1} வரிசையில் பல முறை தோன்றும் {2} மற்றும் {3}
+apps/erpnext/erpnext/selling/doctype/customer/customer.py,Following fields are mandatory to create address:,முகவரியை உருவாக்க பின்வரும் புலங்கள் கட்டாயமாகும்:
 DocType: Item Alternative,Two-way,இரு வழி
 DocType: Item,Manufacturers,உற்பத்தியாளர்கள்
 ,Employee Billing Summary,பணியாளர் பில்லிங் சுருக்கம்
@@ -2728,9 +2737,9 @@
 DocType: Employee,HR-EMP-,மனிதவள-EMP-
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py,User {0} doesn't have any default POS Profile. Check Default at Row {1} for this User.,பயனர் {0} எந்த இயல்புநிலை POS சுயவிவரமும் இல்லை. இந்த பயனருக்கு வரிசையில் {1} இயல்புநிலையை சரிபார்க்கவும்.
 DocType: Quality Meeting Minutes,Quality Meeting Minutes,தரமான சந்திப்பு நிமிடங்கள்
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Supplier &gt; Supplier Type,சப்ளையர்&gt; சப்ளையர் வகை
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py,Employee Referral,ஊழியர் பரிந்துரை
 DocType: Student Group,Set 0 for no limit,எந்த எல்லை 0 அமை
+DocType: Cost Center,rgt,rgt
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py,The day(s) on which you are applying for leave are holidays. You need not apply for leave.,நீங்கள் விடுப்பு விண்ணப்பிக்கும் எந்த நாள் (கள்) விடுமுறை. நீங்கள் விடுப்பு விண்ணப்பிக்க வேண்டும்.
 DocType: Customer,Primary Address and Contact Detail,முதன்மை முகவரி மற்றும் தொடர்பு விவரங்கள்
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.js,Resend Payment Email,கொடுப்பனவு மின்னஞ்சலை மீண்டும் அனுப்புக
@@ -2834,7 +2843,6 @@
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py,Against Supplier Invoice {0} dated {1},வழங்குபவர் எதிராக விலைப்பட்டியல் {0} தேதியிட்ட {1}
 DocType: Customer,Default Price List,முன்னிருப்பு விலை பட்டியல்
 apps/erpnext/erpnext/assets/doctype/asset/asset.py,Asset Movement record {0} created,சொத்து இயக்கம் சாதனை {0} உருவாக்கப்பட்ட
-apps/erpnext/erpnext/utilities/page/leaderboard/leaderboard.js,No items found.,உருப்படிகள் எதுவும் இல்லை.
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py,You cannot delete Fiscal Year {0}. Fiscal Year {0} is set as default in Global Settings,நீங்கள் நீக்க முடியாது நிதியாண்டு {0}. நிதியாண்டு {0} உலகளாவிய அமைப்புகள் முன்னிருப்பாக அமைக்க உள்ளது
 DocType: Share Transfer,Equity/Liability Account,பங்கு / பொறுப்பு கணக்கு
 apps/erpnext/erpnext/setup/doctype/customer_group/customer_group.py,A customer with the same name already exists,அதே பெயருடன் ஒரு வாடிக்கையாளர் ஏற்கனவே உள்ளார்
@@ -2850,6 +2858,7 @@
 apps/erpnext/erpnext/selling/doctype/customer/customer.py,Credit limit has been crossed for customer {0} ({1}/{2}),வாடிக்கையாளர் {0} ({1} / {2}) க்கு கடன் வரம்பு கடந்துவிட்டது
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py,Customer required for 'Customerwise Discount',வாடிக்கையாளர் வாரியாக தள்ளுபடி ' தேவையான வாடிக்கையாளர்
 apps/erpnext/erpnext/config/accounting.py,Update bank payment dates with journals.,மேம்படுத்தல் வங்கி பணம் பத்திரிகைகள் மூலம் செல்கிறது.
+,Billed Qty,கட்டணம் வசூலிக்கப்பட்டது
 apps/erpnext/erpnext/stock/doctype/item/item_dashboard.py,Pricing,விலை
 DocType: Employee,Attendance Device ID (Biometric/RF tag ID),வருகை சாதன ஐடி (பயோமெட்ரிக் / ஆர்எஃப் டேக் ஐடி)
 DocType: Quotation,Term Details,கால விவரம்
@@ -2873,6 +2882,7 @@
 DocType: Share Transfer,Asset Account,சொத்து கணக்கு
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js,New release date should be in the future,புதிய வெளியீட்டு தேதி எதிர்காலத்தில் இருக்க வேண்டும்
 DocType: Purchase Invoice,End date of current invoice's period,தற்போதைய விலைப்பட்டியல் நேரத்தில் முடிவு தேதி
+apps/erpnext/erpnext/hr/doctype/employee/employee.py,Please setup Employee Naming System in Human Resource &gt; HR Settings,மனிதவள&gt; மனிதவள அமைப்புகளில் பணியாளர் பெயரிடும் முறையை அமைக்கவும்
 DocType: Lab Test,Technician Name,தொழில்நுட்ப பெயர்
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py,"Cannot ensure delivery by Serial No as \
 					Item {0} is added with and without Ensure Delivery by \
@@ -2880,6 +2890,7 @@
 DocType: Accounts Settings,Unlink Payment on Cancellation of Invoice,விலைப்பட்டியல் ரத்து கட்டணங்களை செலுத்தும் இணைப்பகற்றம்
 DocType: Bank Reconciliation,From Date,தேதி
 apps/erpnext/erpnext/hr/doctype/vehicle_log/vehicle_log.py,Current Odometer reading entered should be greater than initial Vehicle Odometer {0},தற்போதைய ஓடோமீட்டர் வாசிப்பு உள்ளிட்ட ஆரம்ப வாகன ஓடோமீட்டர் விட அதிகமாக இருக்க வேண்டும் {0}
+,Purchase Order Items To Be Received or Billed,பெறப்பட வேண்டிய அல்லது கட்டணம் செலுத்த வேண்டிய ஆர்டர் பொருட்களை வாங்கவும்
 DocType: Restaurant Reservation,No Show,காட்சி இல்லை
 apps/erpnext/erpnext/regional/india/utils.py,You must be a registered supplier to generate e-Way Bill,ஈ-வே மசோதாவை உருவாக்க நீங்கள் பதிவுசெய்யப்பட்ட சப்ளையராக இருக்க வேண்டும்
 DocType: Shipping Rule Country,Shipping Rule Country,கப்பல் விதி நாடு
@@ -2922,6 +2933,7 @@
 apps/erpnext/erpnext/templates/generators/item/item_add_to_cart.html,View in Cart,வண்டியில் காண்க
 DocType: Employee Checkin,Shift Actual Start,உண்மையான தொடக்கத்தை மாற்றவும்
 DocType: Tally Migration,Is Day Book Data Imported,நாள் புத்தக தரவு இறக்குமதி செய்யப்பட்டுள்ளது
+,Purchase Order Items To Be Received or Billed1,பெறப்பட வேண்டிய அல்லது கட்டணம் செலுத்த வேண்டிய ஆர்டர் பொருட்களை வாங்கவும்
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py,Marketing Expenses,மார்க்கெட்டிங் செலவுகள்
 apps/erpnext/erpnext/stock/doctype/pick_list/pick_list.py,{0} units of {1} is not available.,{1} இன் {0} அலகுகள் கிடைக்கவில்லை.
 ,Item Shortage Report,பொருள் பற்றாக்குறை அறிக்கை
@@ -3286,6 +3298,7 @@
 DocType: Homepage Section,Section Cards,பிரிவு அட்டைகள்
 ,Campaign Efficiency,பிரச்சாரத்தின் திறன்
 DocType: Discussion,Discussion,கலந்துரையாடல்
+apps/erpnext/erpnext/setup/default_energy_point_rules.py,On Sales Order Submission,விற்பனை ஆணை சமர்ப்பிப்பில்
 DocType: Bank Transaction,Transaction ID,நடவடிக்கை ஐடி
 DocType: Payroll Entry,Deduct Tax For Unsubmitted Tax Exemption Proof,சமர்ப்பிக்கப்படாத வரி விலக்கு சான்றுக்கு வரி விதிக்க
 DocType: Volunteer,Anytime,எந்த நேரமும்
@@ -3293,7 +3306,6 @@
 DocType: Employee Tax Exemption Proof Submission,Employee Tax Exemption Proof Submission,பணியாளர் வரி விலக்கு சான்று சமர்ப்பிப்பு
 DocType: Patient,Surgical History,அறுவை சிகிச்சை வரலாறு
 DocType: Bank Statement Settings Item,Mapped Header,மேப்பிடு தலைப்பு
-apps/erpnext/erpnext/hr/doctype/employee/employee.py,Please setup Employee Naming System in Human Resource &gt; HR Settings,மனிதவள&gt; மனிதவள அமைப்புகளில் பணியாளர் பெயரிடும் முறையை அமைக்கவும்
 DocType: Employee,Resignation Letter Date,ராஜினாமா கடிதம் தேதி
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Pricing Rules are further filtered based on quantity.,விலை விதிமுறைகள் மேலும் அளவு அடிப்படையில் வடிகட்டப்பட்டு.
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py,Please set the Date Of Joining for employee {0},பணியாளரின் சேர தேதி அமைக்கவும் {0}
@@ -3308,6 +3320,7 @@
 DocType: Bank Statement Settings,Mapped Items,வரைபடப்பட்ட பொருட்கள்
 DocType: Amazon MWS Settings,IT,ஐ.டி
 DocType: Chapter,Chapter,அத்தியாயம்
+,Fixed Asset Register,நிலையான சொத்து பதிவு
 apps/erpnext/erpnext/utilities/user_progress.py,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,Select BOM and Qty for Production,ஆக்கத்துக்கான BOM மற்றும் அளவு தேர்ந்தெடுக்கவும்
@@ -3440,7 +3453,6 @@
 apps/erpnext/erpnext/templates/emails/reorder_item.html,Following Material Requests have been raised automatically based on Item's re-order level,பொருள் கோரிக்கைகள் தொடர்ந்து பொருள் மறு ஒழுங்கு நிலை அடிப்படையில் தானாக எழுப்பினார்
 apps/erpnext/erpnext/controllers/accounts_controller.py,Account {0} is invalid. Account Currency must be {1},கணக்கு {0} தவறானது. கணக்கு நாணய இருக்க வேண்டும் {1}
 apps/erpnext/erpnext/hr/doctype/salary_structure_assignment/salary_structure_assignment.py,From Date {0} cannot be after employee's relieving Date {1},தேதி முதல் {0} பணியாளரின் நிவாரணம் தேதி {1}
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py,Debit Note {0} has been created automatically,பற்று குறிப்பு {0} தானாக உருவாக்கப்பட்டது
 apps/erpnext/erpnext/accounts/doctype/payment_order/payment_order.js,Create Payment Entries,கட்டண உள்ளீடுகளை உருவாக்கவும்
 DocType: Supplier,Is Internal Supplier,இன்டர்நெட் சப்ளையர்
 DocType: Employee,Create User Permission,பயனர் அனுமதி உருவாக்க
@@ -3997,7 +4009,6 @@
 DocType: Project User,Project Status,திட்டம் நிலை
 DocType: UOM,Check this to disallow fractions. (for Nos),அனுமதிப்பதில்லை உராய்வுகள் இந்த சரிபார்க்கவும். (இலக்கங்கள் ஐந்து)
 DocType: Student Admission Program,Naming Series (for Student Applicant),தொடர் பெயரிடும் (மாணவர் விண்ணப்பதாரர்கள்)
-apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.py,UOM Conversion factor ({0} -&gt; {1}) not found for item: {2},உருப்படிக்கு UOM மாற்று காரணி ({0} -&gt; {1}) காணப்படவில்லை: {2}
 apps/erpnext/erpnext/hr/doctype/retention_bonus/retention_bonus.py,Bonus Payment Date cannot be a past date,போனஸ் கொடுக்கும் தேதி பழைய தேதியாக இருக்க முடியாது
 DocType: Travel Request,Copy of Invitation/Announcement,அழைப்பிதழ் / அறிவிப்பு நகல்
 DocType: Practitioner Service Unit Schedule,Practitioner Service Unit Schedule,பயிற்சி சேவை அலகு அட்டவணை
@@ -4240,7 +4251,6 @@
 DocType: Journal Entry,Accounting Entries,கணக்கு பதிவுகள்
 DocType: Job Card Time Log,Job Card Time Log,வேலை அட்டை நேர பதிவு
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,"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; துறையில் கிடைக்கும்."
-apps/erpnext/erpnext/education/doctype/instructor/instructor.py,Please setup Instructor Naming System in Education &gt; Education Settings,கல்வி&gt; கல்வி அமைப்புகளில் பயிற்றுவிப்பாளர் பெயரிடும் முறையை அமைக்கவும்
 DocType: Journal Entry,Paid Loan,பணம் கடன்
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py,Duplicate Entry. Please check Authorization Rule {0},நுழைவு நகல். அங்கீகார விதி சரிபார்க்கவும் {0}
 DocType: Journal Entry Account,Reference Due Date,குறிப்பு தேதி தேதி
@@ -4257,7 +4267,6 @@
 apps/erpnext/erpnext/templates/pages/projects.html,No time sheets,நேரமில் தாள்கள்
 DocType: GoCardless Mandate,GoCardless Customer,GoCardless வாடிக்கையாளர்
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py,Leave Type {0} cannot be carry-forwarded,{0} செயல்படுத்த-முன்னோக்கி இருக்க முடியாது வகை விடவும்
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Item Code &gt; Item Group &gt; Brand,பொருள் குறியீடு&gt; பொருள் குழு&gt; பிராண்ட்
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py,Maintenance Schedule is not generated for all the items. Please click on 'Generate Schedule',"பராமரிப்பு அட்டவணை அனைத்து பொருட்களின் உருவாக்கப்பட்ட உள்ளது . ' உருவாக்குதல் அட்டவணை ' கிளிக் செய்து,"
 ,To Produce,தயாரிப்பாளர்கள்
 DocType: Leave Encashment,Payroll,சம்பளப்பட்டியல்
@@ -4371,7 +4380,6 @@
 DocType: Stock Ledger Entry,Actual Qty After Transaction,பரிவர்த்தனை பிறகு உண்மையான அளவு
 ,Pending SO Items For Purchase Request,கொள்முதல் கோரிக்கை நிலுவையில் எனவே விடயங்கள்
 apps/erpnext/erpnext/education/doctype/student_admission/student_admission.py,Student Admissions,மாணவர் சேர்க்கை
-apps/erpnext/erpnext/accounts/party.py,{0} {1} is disabled,{0} {1} முடக்கப்பட்டுள்ளது
 DocType: Supplier,Billing Currency,பில்லிங் நாணய
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py,Extra Large,மிகப் பெரியது
 DocType: Loan,Loan Application,கடன் விண்ணப்பம்
@@ -4448,7 +4456,6 @@
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py,Only Leave Applications with status 'Approved' and 'Rejected' can be submitted,ஒரே நிலையை கொண்ட பயன்பாடுகள் &#39;நிராகரிக்கப்பட்டது&#39; &#39;அனுமதிபெற்ற&#39; மற்றும் விடவும் சமர்ப்பிக்க முடியும்
 apps/erpnext/erpnext/accounts/doctype/accounting_dimension/accounting_dimension.py,Creating Dimensions...,பரிமாணங்களை உருவாக்குதல் ...
 apps/erpnext/erpnext/education/doctype/student_group_creation_tool/student_group_creation_tool.py,Student Group Name is mandatory in row {0},மாணவர் குழு பெயர் வரிசையில் கட்டாய {0}
-DocType: Customer Credit Limit,Bypass credit limit_check,பைபாஸ் கடன் வரம்பு_ சோதனை
 DocType: Homepage,Products to be shown on website homepage,தயாரிப்புகள் இணைய முகப்பு காட்டப்படுவதற்கு
 DocType: HR Settings,Password Policy,கடவுச்சொல் கொள்கை
 apps/erpnext/erpnext/setup/doctype/customer_group/customer_group.js,This is a root customer group and cannot be edited.,இந்த ஒரு ரூட் வாடிக்கையாளர் குழு மற்றும் திருத்த முடியாது .
@@ -5041,6 +5048,7 @@
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py,No {0} found for Inter Company Transactions.,இண்டர் கம்பனி பரிவர்த்தனைகளுக்கு {0} இல்லை.
 DocType: Travel Itinerary,Rented Car,வாடகைக்கு கார்
 apps/erpnext/erpnext/public/js/hub/components/profile_dialog.js,About your Company,உங்கள் நிறுவனத்தின் பற்றி
+apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.js,Show Stock Ageing Data,பங்கு வயதான தரவைக் காட்டு
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py,Credit To account must be a Balance Sheet account,கணக்கில் பணம் வரவு ஒரு ஐந்தொகை கணக்கில் இருக்க வேண்டும்
 DocType: Donor,Donor,தானம்
 DocType: Global Defaults,Disable In Words,சொற்கள் முடக்கு
@@ -5054,8 +5062,10 @@
 DocType: Patient,Patient ID,நோயாளி ஐடி
 DocType: Practitioner Schedule,Schedule Name,அட்டவணை பெயர்
 DocType: Currency Exchange,For Buying,வாங்குதல்
+apps/erpnext/erpnext/setup/default_energy_point_rules.py,On Purchase Order Submission,கொள்முதல் ஆணை சமர்ப்பிப்பில்
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js,Add All Suppliers,அனைத்து சப்ளையர்களை சேர்க்கவும்
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py,Row #{0}: Allocated Amount cannot be greater than outstanding amount.,ரோ # {0}: ஒதுக்கப்பட்டவை தொகை நிலுவையில் தொகையை விட அதிகமாக இருக்க முடியாது.
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Customer &gt; Customer Group &gt; Territory,வாடிக்கையாளர்&gt; வாடிக்கையாளர் குழு&gt; பிரதேசம்
 DocType: Tally Migration,Parties,கட்சிகள்
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js,Browse BOM,"உலவ BOM,"
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py,Secured Loans,பிணை கடன்கள்
@@ -5086,6 +5096,7 @@
 apps/erpnext/erpnext/stock/doctype/item_alternative/item_alternative.py,Not allow to set alternative item for the item {0},உருப்படிக்கு மாற்று உருப்படியை அமைக்க அனுமதிக்க மாட்டோம் {0}
 apps/erpnext/erpnext/hr/doctype/leave_block_list/leave_block_list.py,Date is repeated,தேதி மீண்டும்
 apps/erpnext/erpnext/accounts/print_format/payment_receipt_voucher/payment_receipt_voucher.html,Authorized Signatory,அங்கீகரிக்கப்பட்ட கையொப்பதாரரால்
+apps/erpnext/erpnext/education/doctype/instructor/instructor.py,Please setup Instructor Naming System in Education &gt; Education Settings,கல்வி&gt; கல்வி அமைப்புகளில் பயிற்றுவிப்பாளர் பெயரிடும் முறையை அமைக்கவும்
 apps/erpnext/erpnext/regional/doctype/gstr_3b_report/gstr_3b_report.html,Net ITC Available(A) - (B),நிகர ஐடிசி கிடைக்கிறது (ஏ) - (பி)
 apps/erpnext/erpnext/education/doctype/fee_schedule/fee_schedule.js,Create Fees,கட்டணம் உருவாக்கவும்
 DocType: Project,Total Purchase Cost (via Purchase Invoice),மொத்த கொள்முதல் விலை (கொள்முதல் விலைப்பட்டியல் வழியாக)
@@ -5105,6 +5116,7 @@
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.js,Message Sent,செய்தி அனுப்பப்பட்டது
 apps/erpnext/erpnext/accounts/doctype/account/account.py,Account with child nodes cannot be set as ledger,குழந்தை முனைகளில் கணக்கு பேரேடு அமைக்க முடியாது
 DocType: C-Form,II,இரண்டாம்
+apps/erpnext/erpnext/assets/report/fixed_asset_register/fixed_asset_register.py,Vendor Name,விற்பனையாளர் பெயர்
 DocType: Quiz Result,Wrong,தவறான
 DocType: Sales Invoice,Rate at which Price list currency is converted to customer's base currency,விலை பட்டியல் நாணய வாடிக்கையாளர் அடிப்படை நாணய மாற்றப்படும் விகிதத்தை
 DocType: Purchase Invoice Item,Net Amount (Company Currency),நிகர விலை (நிறுவனத்தின் நாணயம்)
@@ -5345,6 +5357,7 @@
 DocType: Stock Settings,Auto Material Request,கார் பொருள் கோரிக்கை
 DocType: Woocommerce Settings,API consumer secret,ஏபிஐ நுகர்வோர் ரகசியம்
 DocType: Delivery Note Item,Available Batch Qty at From Warehouse,கிடங்கில் இருந்து கிடைக்கும் தொகுதி அளவு
+,Received Qty Amount,Qty தொகை பெறப்பட்டது
 DocType: Salary Slip,Gross Pay - Total Deduction - Loan Repayment,மொத்த பே - மொத்த பொருத்தியறிதல் - கடனாக தொகையை திரும்பச் செலுத்துதல்
 DocType: Bank Account,Last Integration Date,கடைசி ஒருங்கிணைப்பு தேதி
 DocType: Expense Claim,Expense Taxes and Charges,செலவு வரி மற்றும் கட்டணங்கள்
@@ -5803,6 +5816,8 @@
 DocType: Drug Prescription,Hour,மணி
 DocType: Restaurant Order Entry,Last Sales Invoice,கடைசி விற்பனை விலைப்பட்டியல்
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py,Please select Qty against item {0},உருப்படிக்கு எதிராக {0}
+apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py,Latest Age,சமீபத்திய வயது
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js,Transfer Material to Supplier,சப்ளையர் பொருள் மாற்றுவது
 apps/erpnext/erpnext/hr/report/loan_repayment/loan_repayment.py,EMI,இஎம்ஐ
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py,New Serial No cannot have Warehouse. Warehouse must be set by Stock Entry or Purchase Receipt,புதிய சீரியல் இல்லை கிடங்கு முடியாது . கிடங்கு பங்கு நுழைவு அல்லது கொள்முதல் ரசீது மூலம் அமைக்க வேண்டும்
 DocType: Lead,Lead Type,முன்னணி வகை
@@ -5822,7 +5837,6 @@
 apps/erpnext/erpnext/buying/doctype/supplier_scorecard/supplier_scorecard_list.js,Unknown,தெரியாத
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js,Work Order not created,வேலை ஆணை உருவாக்கப்படவில்லை
 DocType: Shipping Rule,Shipping Rule Conditions,கப்பல் விதி நிபந்தனைகள்
-DocType: Purchase Invoice,Export Type,ஏற்றுமதி வகை
 DocType: Salary Slip Loan,Salary Slip Loan,சம்பள சரிவு கடன்
 DocType: BOM Update Tool,The new BOM after replacement,மாற்று பின்னர் புதிய BOM
 ,Point of Sale,விற்பனை செய்யுமிடம்
@@ -5941,7 +5955,6 @@
 DocType: Purchase Order Item,Blanket Order Rate,பிளாங்கட் ஆர்டர் விகிதம்
 ,Customer Ledger Summary,வாடிக்கையாளர் லெட்ஜர் சுருக்கம்
 apps/erpnext/erpnext/hooks.py,Certification,சான்றிதழ்
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js,Are you sure you want to make debit note?,நீங்கள் நிச்சயமாக டெபிட் குறிப்பை உருவாக்க விரும்புகிறீர்களா?
 DocType: Bank Guarantee,Clauses and Conditions,கிளைகள் மற்றும் நிபந்தனைகள்
 DocType: Serial No,Creation Document Type,உருவாக்கம் ஆவண வகை
 DocType: Amazon MWS Settings,ES,இஎஸ்
@@ -5979,8 +5992,6 @@
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py,Financial Services,நிதி சேவைகள்
 DocType: Student Sibling,Student ID,மாணவர் அடையாளம்
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.js,For Quantity must be greater than zero,அளவுக்கு பூஜ்ஜியத்தை விட அதிகமாக இருக்க வேண்டும்
-apps/erpnext/erpnext/hr/doctype/employee_transfer/employee_transfer.py,"Please delete the Employee <a href=""#Form/Employee/{0}"">{0}</a>\
-					to cancel this document","இந்த ஆவணத்தை ரத்து செய்ய பணியாளர் <a href=""#Form/Employee/{0}"">{0}</a> delete ஐ நீக்கவும்"
 apps/erpnext/erpnext/config/projects.py,Types of activities for Time Logs,நேரம் பதிவேடுகளுக்கு நடவடிக்கைகள் வகைகள்
 DocType: Opening Invoice Creation Tool,Sales,விற்பனை
 DocType: Stock Entry Detail,Basic Amount,அடிப்படை தொகை
@@ -6058,6 +6069,7 @@
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py,Print and Stationery,அச்சு மற்றும் ஸ்டேஷனரி
 DocType: Stock Settings,Show Barcode Field,காட்டு பார்கோடு களம்
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js,Send Supplier Emails,சப்ளையர் மின்னஞ்சல்கள் அனுப்ப
+DocType: Asset Movement,ACC-ASM-.YYYY.-,ஏசிசி-ASM &amp;-.YYYY.-
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py,"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,தானாக உருவாக்கப்பட்டது
 apps/erpnext/erpnext/hr/doctype/employee_onboarding/employee_onboarding.py,Submit this to create the Employee record,பணியாளர் பதிவை உருவாக்க இதைச் சமர்ப்பிக்கவும்
@@ -6137,7 +6149,6 @@
 DocType: Sales Team,Contact No.,தொடர்பு எண்
 apps/erpnext/erpnext/templates/includes/cart/cart_address.html,Billing Address is same as Shipping Address,பில்லிங் முகவரி கப்பல் முகவரி போன்றது
 DocType: Bank Reconciliation,Payment Entries,கொடுப்பனவு பதிவுகள்
-apps/erpnext/erpnext/erpnext_integrations/doctype/shopify_settings/shopify_settings.py,Access token or Shopify URL missing,அணுகல் டோக்கன் அல்லது Shopify URL காணவில்லை
 DocType: Location,Latitude,அட்சரேகை
 DocType: Work Order,Scrap Warehouse,குப்பை கிடங்கு
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py,"Warehouse required at Row No {0}, please set default warehouse for the item {1} for the company {2}","வரிசை எண் {0} இல் தேவையான கிடங்கு, நிறுவனம் {2} க்கான உருப்படிக்கு {1}"
@@ -6181,7 +6192,6 @@
 DocType: Job Offer Term,Value / Description,மதிப்பு / விளக்கம்
 apps/erpnext/erpnext/controllers/accounts_controller.py,"Row #{0}: Asset {1} cannot be submitted, it is already {2}","ரோ # {0}: சொத்து {1} சமர்ப்பிக்க முடியாது, அது ஏற்கனவே {2}"
 DocType: Tax Rule,Billing Country,பில்லிங் நாடு
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js,Are you sure you want to make credit note?,நீங்கள் நிச்சயமாக கடன் குறிப்பு செய்ய விரும்புகிறீர்களா?
 DocType: Purchase Order Item,Expected Delivery Date,எதிர்பார்க்கப்படுகிறது டெலிவரி தேதி
 DocType: Restaurant Order Entry,Restaurant Order Entry,உணவகம் ஆர்டர் நுழைவு
 apps/erpnext/erpnext/accounts/general_ledger.py,Debit and Credit not equal for {0} #{1}. Difference is {2}.,கடன் மற்றும் பற்று {0} # சம அல்ல {1}. வித்தியாசம் இருக்கிறது {2}.
@@ -6305,6 +6315,7 @@
 DocType: Purchase Invoice,Taxes and Charges Added,வரிகள் மற்றும் கட்டணங்கள் சேர்க்கப்பட்டது
 apps/erpnext/erpnext/assets/doctype/asset/asset.py,Depreciation Row {0}: Next Depreciation Date cannot be before Available-for-use Date,தேய்மானம் வரிசை {0}: அடுத்த தேதியிட்ட தேதி கிடைக்கக்கூடிய தேதிக்கு முன்பாக இருக்க முடியாது
 ,Sales Funnel,விற்பனை நீக்க
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Item Code &gt; Item Group &gt; Brand,பொருள் குறியீடு&gt; பொருள் குழு&gt; பிராண்ட்
 apps/erpnext/erpnext/setup/doctype/company/company.py,Abbreviation is mandatory,சுருக்கம் கட்டாயமாகும்
 DocType: Project,Task Progress,டாஸ்க் முன்னேற்றம்
 apps/erpnext/erpnext/templates/includes/navbar/navbar_items.html,Cart,வண்டியில்
@@ -6545,6 +6556,7 @@
 DocType: Employee Grade,Employee Grade,பணியாளர் தரம்
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py,Piecework,சிறுதுண்டு வேலைக்கு
 DocType: GSTR 3B Report,June,ஜூன்
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Supplier &gt; Supplier Type,சப்ளையர்&gt; சப்ளையர் வகை
 DocType: Share Balance,From No,இல்லை
 DocType: Shift Type,Early Exit Grace Period,ஆரம்பகால வெளியேறும் கிரேஸ் காலம்
 DocType: Task,Actual Time (in Hours),(மணிகளில்) உண்மையான நேரம்
@@ -6826,6 +6838,7 @@
 DocType: Warehouse,Warehouse Name,சேமிப்பு கிடங்கு பெயர்
 DocType: Naming Series,Select Transaction,பரிவர்த்தனை தேர்வு
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py,Please enter Approving Role or Approving User,பங்கு அங்கீகரிக்கிறது அல்லது பயனர் அனுமதி உள்ளிடவும்
+apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.py,UOM Conversion factor ({0} -&gt; {1}) not found for item: {2},உருப்படிக்கு UOM மாற்று காரணி ({0} -&gt; {1}) காணப்படவில்லை: {2}
 DocType: Journal Entry,Write Off Entry,நுழைவு ஆஃப் எழுத
 DocType: BOM,Rate Of Materials Based On,ஆனால் அடிப்படையில் பொருட்களின் விகிதம்
 DocType: Education Settings,"If enabled, field Academic Term will be Mandatory in Program Enrollment Tool.","இயக்கப்பட்டிருந்தால், படிப்படியான நுழைவுக் கருவியில் துறையில் கல்வி கட்டாயம் கட்டாயமாக இருக்கும்."
@@ -7013,6 +7026,7 @@
 DocType: Quality Inspection Reading,Quality Inspection Reading,தரமான ஆய்வு படித்தல்
 apps/erpnext/erpnext/stock/doctype/stock_settings/stock_settings.py,`Freeze Stocks Older Than` should be smaller than %d days.,` விட பழைய உறைந்து பங்குகள் ` % d நாட்கள் குறைவாக இருக்க வேண்டும் .
 DocType: Tax Rule,Purchase Tax Template,வரி வார்ப்புரு வாங்க
+apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py,Earliest Age,ஆரம்ப வயது
 apps/erpnext/erpnext/utilities/user_progress.py,Set a sales goal you'd like to achieve for your company.,உங்கள் நிறுவனத்திற்கு நீங்கள் அடைய விரும்பும் விற்பனை இலக்கை அமைக்கவும்.
 DocType: Quality Goal,Revision,மறுபார்வை
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js,Healthcare Services,சுகாதார சேவைகள்
@@ -7055,6 +7069,7 @@
 apps/erpnext/erpnext/healthcare/doctype/patient_encounter/patient_encounter.js,Schedule Discharge,அட்டவணை அறிவிப்பு
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py,Cheques and Deposits incorrectly cleared,காசோலைகள் மற்றும் வைப்பு தவறாக அகற்றப்படும்
 DocType: Homepage Section Card,Homepage Section Card,முகப்புப் பிரிவு அட்டை
+,Amount To Be Billed,கட்டணம் செலுத்த வேண்டிய தொகை
 apps/erpnext/erpnext/accounts/doctype/account/account.py,Account {0}: You can not assign itself as parent account,கணக்கு {0}: நீங்கள் பெற்றோர் கணக்கு தன்னை ஒதுக்க முடியாது
 DocType: Purchase Invoice Item,Price List Rate,விலை பட்டியல் விகிதம்
 apps/erpnext/erpnext/utilities/activation.py,Create customer quotes,வாடிக்கையாளர் மேற்கோள் உருவாக்கவும்
@@ -7107,6 +7122,7 @@
 DocType: Supplier Scorecard Criteria,Supplier Scorecard Criteria,சப்ளையர் ஸ்கோர் கார்ட் க்ரிடீரியா
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py,Please select Start Date and End Date for Item {0},தொடக்க தேதி மற்றும் பொருள் முடிவு தேதி தேர்வு செய்க {0}
 DocType: Maintenance Schedule,MAT-MSH-.YYYY.-,MAT-MSH-.YYYY.-
+,Amount to Receive,பெற வேண்டிய தொகை
 apps/erpnext/erpnext/education/doctype/student_group_creation_tool/student_group_creation_tool.py,Course is mandatory in row {0},பாடநெறி வரிசையில் கட்டாய {0}
 apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py,From date can not be greater than than To date,தேதியிலிருந்து இன்றுவரை விட அதிகமாக இருக்க முடியாது
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py,To date cannot be before from date,தேதி தேதி முதல் முன் இருக்க முடியாது
@@ -7559,6 +7575,7 @@
 DocType: Delivery Note,Print Without Amount,மொத்த தொகை இல்லாமல் அச்சிட
 apps/erpnext/erpnext/accounts/report/asset_depreciation_ledger/asset_depreciation_ledger.py,Depreciation Date,தேய்மானம் தேதி
 ,Work Orders in Progress,வேலை ஆணைகள் முன்னேற்றம்
+DocType: Customer Credit Limit,Bypass Credit Limit Check,பைபாஸ் கடன் வரம்பு சோதனை
 DocType: Issue,Support Team,ஆதரவு குழு
 apps/erpnext/erpnext/stock/report/batch_item_expiry_status/batch_item_expiry_status.py,Expiry (In Days),காலாவதி (நாட்களில்)
 DocType: Appraisal,Total Score (Out of 5),மொத்த மதிப்பெண் (5 அவுட்)
@@ -7743,6 +7760,7 @@
 DocType: Sales Invoice,Customer GSTIN,வாடிக்கையாளர் GSTIN
 DocType: Crop Cycle,List of diseases detected on the field. When selected it'll automatically add a list of tasks to deal with the disease ,புலத்தில் காணப்படும் நோய்களின் பட்டியல். தேர்ந்தெடுக்கும் போது தானாக நோய் தீர்க்கும் பணியின் பட்டியல் சேர்க்கப்படும்
 apps/erpnext/erpnext/manufacturing/page/bom_comparison_tool/bom_comparison_tool.js,BOM 1,BOM 1
+apps/erpnext/erpnext/assets/report/fixed_asset_register/fixed_asset_register.py,Asset Id,சொத்து ஐடி
 apps/erpnext/erpnext/healthcare/doctype/healthcare_service_unit/healthcare_service_unit.js,This is a root healthcare service unit and cannot be edited.,இது ஒரு ரூட் சுகாதார சேவை அலகு மற்றும் திருத்த முடியாது.
 DocType: Asset Repair,Repair Status,பழுதுபார்க்கும் நிலை
 apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.js,"Requested Qty: Quantity requested for purchase, but not ordered.","கோரப்பட்ட அளவு: அளவு உத்தரவிட்டார் வாங்குவதற்கு கோரியது, ஆனால் இல்லை."
diff --git a/erpnext/translations/te.csv b/erpnext/translations/te.csv
index b49d247..25e0925 100644
--- a/erpnext/translations/te.csv
+++ b/erpnext/translations/te.csv
@@ -283,7 +283,6 @@
 DocType: Loan,Repay Over Number of Periods,చెల్లింపులో కాలాల ఓవర్ సంఖ్య
 apps/erpnext/erpnext/manufacturing/report/bom_stock_report/bom_stock_report.py,Quantity to Produce can not be less than Zero,ఉత్పత్తి చేసే పరిమాణం జీరో కంటే తక్కువగా ఉండకూడదు
 DocType: Stock Entry,Additional Costs,అదనపు వ్యయాలు
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Customer &gt; Customer Group &gt; Territory,కస్టమర్&gt; కస్టమర్ గ్రూప్&gt; భూభాగం
 apps/erpnext/erpnext/accounts/doctype/account/account.py,Account with existing transaction can not be converted to group.,ఉన్న లావాదేవీతో ఖాతా సమూహం మార్చబడుతుంది సాధ్యం కాదు.
 DocType: Lead,Product Enquiry,ఉత్పత్తి ఎంక్వయిరీ
 DocType: Education Settings,Validate Batch for Students in Student Group,స్టూడెంట్ గ్రూప్ లో స్టూడెంట్స్ కోసం బ్యాచ్ ప్రమాణీకరించు
@@ -579,6 +578,7 @@
 DocType: Healthcare Settings,Create documents for sample collection,నమూనా సేకరణ కోసం పత్రాలను సృష్టించండి
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py,Payment against {0} {1} cannot be greater than Outstanding Amount {2},వ్యతిరేకంగా చెల్లింపు {0} {1} అసాధారణ మొత్తాన్ని కంటే ఎక్కువ ఉండకూడదు {2}
 apps/erpnext/erpnext/patches/v11_0/add_healthcare_service_unit_tree_root.py,All Healthcare Service Units,అన్ని హెల్త్కేర్ సర్వీస్ యూనిట్లు
+apps/erpnext/erpnext/setup/default_energy_point_rules.py,On Converting Opportunity,అవకాశాన్ని మార్చేటప్పుడు
 DocType: Bank Account,Address HTML,చిరునామా HTML
 DocType: Lead,Mobile No.,మొబైల్ నం
 apps/erpnext/erpnext/selling/doctype/pos_closing_voucher/closing_voucher_details.html,Mode of Payments,చెల్లింపుల మోడ్
@@ -643,7 +643,6 @@
 DocType: Accounting Dimension,Dimension Name,డైమెన్షన్ పేరు
 apps/erpnext/erpnext/healthcare/setup.py,Resistant,రెసిస్టెంట్
 apps/erpnext/erpnext/hotels/doctype/hotel_room_reservation/hotel_room_reservation.py,Please set Hotel Room Rate on {},దయచేసి {@} పై హోటల్ రూట్ రేటును సెట్ చేయండి
-apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py,Please setup numbering series for Attendance via Setup &gt; Numbering Series,దయచేసి సెటప్&gt; నంబరింగ్ సిరీస్ ద్వారా హాజరు కోసం నంబరింగ్ సిరీస్‌ను సెటప్ చేయండి
 DocType: Journal Entry,Multi Currency,మల్టీ కరెన్సీ
 DocType: Bank Statement Transaction Invoice Item,Invoice Type,వాయిస్ పద్ధతి
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py,Valid from date must be less than valid upto date,తేదీ నుండి చెల్లుబాటు అయ్యే తేదీ కంటే తక్కువగా ఉండాలి
@@ -756,6 +755,7 @@
 apps/erpnext/erpnext/accounts/page/pos/pos.js,Create a new Customer,ఒక కొత్త కస్టమర్ సృష్టించు
 apps/erpnext/erpnext/non_profit/report/expiring_memberships/expiring_memberships.py,Expiring On,ముగుస్తున్నది
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,"If multiple Pricing Rules continue to prevail, users are asked to set Priority manually to resolve conflict.","బహుళ ధర రూల్స్ వ్యాప్తి చెందడం కొనసాగుతుంది, వినియోగదారులు పరిష్కరించవచ్చు మానవీయంగా ప్రాధాన్యత సెట్ కోరతారు."
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js,Purchase Return,కొనుగోలు చూపించు
 apps/erpnext/erpnext/utilities/activation.py,Create Purchase Orders,కొనుగోలు ఉత్తర్వులు సృష్టించు
 ,Purchase Register,కొనుగోలు నమోదు
 apps/erpnext/erpnext/healthcare/doctype/patient/patient.py,Patient not found,రోగి దొరకలేదు
@@ -770,7 +770,6 @@
 DocType: Location,Area UOM,ప్రాంతం UOM
 apps/erpnext/erpnext/manufacturing/doctype/workstation/workstation.py,Workstation is closed on the following dates as per Holiday List: {0},కార్యక్షేత్ర హాలిడే జాబితా ప్రకారం క్రింది తేదీలు మూసివేయబడింది: {0}
 apps/erpnext/erpnext/selling/page/sales_funnel/sales_funnel.py,Opportunities,అవకాశాలు
-apps/erpnext/erpnext/www/all-products/index.html,Clear filters,ఫిల్టర్‌లను క్లియర్ చేయండి
 DocType: Lab Test Template,Single,సింగిల్
 DocType: Compensatory Leave Request,Work From Date,తేదీ నుండి పని
 DocType: Salary Slip,Total Loan Repayment,మొత్తం లోన్ తిరిగి చెల్లించే
@@ -814,6 +813,7 @@
 apps/erpnext/erpnext/education/doctype/program_enrollment_tool/program_enrollment_tool.py,Mandatory field - Academic Year,తప్పనిసరి రంగంలో - అకాడెమిక్ ఇయర్
 apps/erpnext/erpnext/education/doctype/program_enrollment_tool/program_enrollment_tool.py,Mandatory field - Academic Year,తప్పనిసరి రంగంలో - అకాడెమిక్ ఇయర్
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py,{0} {1} is not associated with {2} {3},{0} {1} {2} తో సంబంధం లేదు {3}
+DocType: Opportunity,Converted By,ద్వారా మార్చబడింది
 apps/erpnext/erpnext/public/js/hub/components/ReviewArea.vue,You need to login as a Marketplace User before you can add any reviews.,మీరు ఏవైనా సమీక్షలను జోడించే ముందు మీరు మార్కెట్ ప్లేస్ యూజర్‌గా లాగిన్ అవ్వాలి.
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py,Please set default payable account for the company {0},కంపెనీ కోసం డిఫాల్ట్ చెల్లించవలసిన ఖాతా సెట్ దయచేసి {0}
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py,Transaction not allowed against stopped Work Order {0},లావాదేవీ ఆపడానికి వ్యతిరేకంగా అనుమతించలేదు పని ఆర్డర్ {0}
@@ -838,6 +838,8 @@
 DocType: Sales Invoice,Total Qty,మొత్తం ప్యాక్ చేసిన అంశాల
 apps/erpnext/erpnext/education/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py,Guardian2 Email ID,Guardian2 ఇమెయిల్ ID
 apps/erpnext/erpnext/education/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py,Guardian2 Email ID,Guardian2 ఇమెయిల్ ID
+apps/erpnext/erpnext/hr/doctype/employee_transfer/employee_transfer.py,"Please delete the Employee <a href=""#Form/Employee/{0}"">{0}</a>\
+					to cancel this document","ఈ పత్రాన్ని రద్దు చేయడానికి దయచేసి ఉద్యోగి <a href=""#Form/Employee/{0}"">{0}</a> delete ను తొలగించండి"
 DocType: Item,Show in Website (Variant),లో వెబ్సైట్ షో (వేరియంట్)
 DocType: Employee,Health Concerns,ఆరోగ్య కారణాల
 DocType: Payroll Entry,Select Payroll Period,పేరోల్ కాలం ఎంచుకోండి
@@ -896,7 +898,6 @@
 apps/erpnext/erpnext/education/doctype/student_group/student_group.py,Please select Course,దయచేసి కోర్సు ఎంచుకోండి
 DocType: Codification Table,Codification Table,కోడెఫికేషన్ టేబుల్
 DocType: Timesheet Detail,Hrs,గంటలు
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js,Please select Company,కంపెనీ దయచేసి ఎంచుకోండి
 DocType: Employee Skill,Employee Skill,ఉద్యోగుల నైపుణ్యం
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.js,Difference Account,తేడా ఖాతా
 DocType: Pricing Rule,Discount on Other Item,ఇతర అంశంపై తగ్గింపు
@@ -964,6 +965,7 @@
 DocType: BOM,Operating Cost,నిర్వహణ ఖర్చు
 DocType: Crop,Produced Items,ఉత్పత్తి అంశాలు
 DocType: Bank Statement Transaction Entry,Match Transaction to Invoices,ఇన్వాయిస్లకు లావాదేవీని సరిపోల్చండి
+apps/erpnext/erpnext/erpnext_integrations/exotel_integration.py,Error in Exotel incoming call,ఎక్సోటెల్ ఇన్‌కమింగ్ కాల్‌లో లోపం
 DocType: Sales Order Item,Gross Profit,స్థూల లాభం
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js,Unblock Invoice,వాయిస్ని అన్బ్లాక్ చేయండి
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py,Increment cannot be 0,పెంపు 0 ఉండకూడదు
@@ -1171,6 +1173,7 @@
 DocType: Activity Cost,Activity Type,కార్యాచరణ టైప్
 DocType: Request for Quotation,For individual supplier,వ్యక్తిగత సరఫరా కోసం
 DocType: BOM Operation,Base Hour Rate(Company Currency),బేస్ అవర్ రేటు (కంపెనీ కరెన్సీ)
+,Qty To Be Billed,Qty To Bill
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py,Delivered Amount,పంపిణీ మొత్తం
 apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.js,Reserved Qty for Production: Raw materials quantity to make manufacturing items.,ఉత్పత్తి కోసం రిజర్వు చేయబడిన Qty: తయారీ వస్తువులను తయారు చేయడానికి ముడి పదార్థాల పరిమాణం.
 DocType: Loyalty Point Entry Redemption,Redemption Date,విముక్తి తేదీ
@@ -1290,7 +1293,7 @@
 apps/erpnext/erpnext/education/doctype/student_group/student_group.py,Please select Program,దయచేసి ఎంచుకోండి ప్రోగ్రామ్
 apps/erpnext/erpnext/education/doctype/student_group/student_group.py,Please select Program,దయచేసి ఎంచుకోండి ప్రోగ్రామ్
 DocType: Project,Estimated Cost,అంచనా వ్యయం
-DocType: Request for Quotation,Link to material requests,పదార్థం అభ్యర్థనలు లింక్
+DocType: Supplier Quotation,Link to material requests,పదార్థం అభ్యర్థనలు లింక్
 apps/erpnext/erpnext/public/js/hub/pages/Publish.vue,Publish,ప్రచురించు
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py,Aerospace,ఏరోస్పేస్
 ,Fichier des Ecritures Comptables [FEC],ఫిషియర్ డెస్ ఈక్విట్రర్స్ కాంపెబుల్స్ [FEC]
@@ -1303,6 +1306,7 @@
 apps/erpnext/erpnext/utilities/transaction_base.py,Invalid Posting Time,చెల్లని పోస్ట్ సమయం
 DocType: Salary Component,Condition and Formula,పరిస్థితి మరియు ఫార్ములా
 DocType: Lead,Campaign Name,ప్రచారం పేరు
+apps/erpnext/erpnext/setup/default_energy_point_rules.py,On Task Completion,టాస్క్ పూర్తిపై
 apps/erpnext/erpnext/hr/doctype/compensatory_leave_request/compensatory_leave_request.py,There is no leave period in between {0} and {1},{0} మరియు {1} మధ్య ఖాళీ సెలవు సమయం లేదు
 DocType: Fee Validity,Healthcare Practitioner,హెల్త్కేర్ ప్రాక్టీషనర్
 DocType: Hotel Room,Capacity,కెపాసిటీ
@@ -1644,7 +1648,6 @@
 DocType: Quality Feedback Template,Quality Feedback Template,నాణ్యమైన అభిప్రాయ మూస
 apps/erpnext/erpnext/config/education.py,LMS Activity,LMS కార్యాచరణ
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py,Internet Publishing,ఇంటర్నెట్ పబ్లిషింగ్
-DocType: Prescription Duration,Number,సంఖ్య
 apps/erpnext/erpnext/accounts/doctype/opening_invoice_creation_tool/opening_invoice_creation_tool.js,Creating {0} Invoice,{0} వాయిస్ సృష్టిస్తోంది
 DocType: Medical Code,Medical Code Standard,మెడికల్ కోడ్ స్టాండర్డ్
 DocType: Soil Texture,Clay Composition (%),క్లే కంపోజిషన్ (%)
@@ -1719,6 +1722,7 @@
 DocType: Support Settings,Get Started Sections,విభాగాలు ప్రారంభించండి
 DocType: Lead,CRM-LEAD-.YYYY.-,CRM-LEAD-.YYYY.-
 DocType: Invoice Discounting,Sanctioned,మంజూరు
+,Base Amount,బేస్ మొత్తం
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.js,Total Contribution Amount: {0},మొత్తం కాంట్రిబ్యూషన్ మొత్తం: {0}
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py,Row #{0}: Please specify Serial No for Item {1},రో # {0}: అంశం కోసం ఏ సీరియల్ రాయండి {1}
 DocType: Payroll Entry,Salary Slips Submitted,సలారీ స్లిప్స్ సమర్పించిన
@@ -1937,6 +1941,7 @@
 DocType: Accounting Dimension,Dimension Defaults,డైమెన్షన్ డిఫాల్ట్‌లు
 apps/erpnext/erpnext/crm/report/prospects_engaged_but_not_converted/prospects_engaged_but_not_converted.js,Minimum Lead Age (Days),కనీస లీడ్ వయసు (డేస్)
 apps/erpnext/erpnext/crm/report/prospects_engaged_but_not_converted/prospects_engaged_but_not_converted.js,Minimum Lead Age (Days),కనీస లీడ్ వయసు (డేస్)
+apps/erpnext/erpnext/assets/report/fixed_asset_register/fixed_asset_register.py,Available For Use Date,ఉపయోగ తేదీకి అందుబాటులో ఉంది
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py,All BOMs,అన్ని BOMs
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js,Create Inter Company Journal Entry,ఇంటర్ కంపెనీ జర్నల్ ఎంట్రీని సృష్టించండి
 DocType: Company,Parent Company,మాతృ సంస్థ
@@ -1999,6 +2004,7 @@
 ,IRS 1099,ఐఆర్ఎస్ 1099
 DocType: Salary Slip,Leave Without Pay,పే లేకుండా వదిలి
 DocType: Payment Request,Outward,బాహ్య
+apps/erpnext/erpnext/setup/default_energy_point_rules.py,On {0} Creation,{0} సృష్టిలో
 apps/erpnext/erpnext/regional/doctype/gstr_3b_report/gstr_3b_report.html,State/UT Tax,రాష్ట్ర / యుటి పన్ను
 ,Trial Balance for Party,పార్టీ కోసం ట్రయల్ బ్యాలెన్స్
 ,Gross and Net Profit Report,స్థూల మరియు నికర లాభ నివేదిక
@@ -2112,6 +2118,7 @@
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js,Make Stock Entry,స్టాక్ ఎంట్రీ చేయండి
 DocType: Hotel Room Reservation,Hotel Reservation User,హోటల్ రిజర్వేషన్ వినియోగదారు
 apps/erpnext/erpnext/projects/doctype/project/project.js,Set Status,స్థితిని సెట్ చేయండి
+apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py,Please setup numbering series for Attendance via Setup &gt; Numbering Series,దయచేసి సెటప్&gt; నంబరింగ్ సిరీస్ ద్వారా హాజరు కోసం నంబరింగ్ సిరీస్‌ను సెటప్ చేయండి
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py,Please select prefix first,మొదటి ఉపసర్గ దయచేసి ఎంచుకోండి
 DocType: Contract,Fulfilment Deadline,నెరవేరడం గడువు
 apps/erpnext/erpnext/public/js/hub/pages/Home.vue,Near you,నీ దగ్గర
@@ -2127,6 +2134,7 @@
 DocType: Announcement,All Students,అన్ని స్టూడెంట్స్
 apps/erpnext/erpnext/assets/doctype/asset/asset.py,Item {0} must be a non-stock item,అంశం {0} ఒక కాని స్టాక్ అంశం ఉండాలి
 apps/erpnext/erpnext/stock/doctype/batch/batch.js,View Ledger,చూడండి లెడ్జర్
+DocType: Cost Center,Lft,Lft
 DocType: Grading Scale,Intervals,విరామాలు
 DocType: Bank Statement Transaction Entry,Reconciled Transactions,పునర్నిర్మించిన లావాదేవీలు
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py,Earliest,తొట్టతొలి
@@ -2241,6 +2249,7 @@
 apps/erpnext/erpnext/hr/doctype/employee_benefit_application/employee_benefit_application.py,As per your assigned Salary Structure you cannot apply for benefits,మీ కేటాయించిన జీతం నిర్మాణం ప్రకారం మీరు ప్రయోజనాల కోసం దరఖాస్తు చేయలేరు
 apps/erpnext/erpnext/stock/doctype/item/item.py,Website Image should be a public file or website URL,వెబ్సైట్ చిత్రం పబ్లిక్ ఫైలు లేదా వెబ్సైట్ URL అయి ఉండాలి
 DocType: Purchase Invoice Item,BOM,బిఒఎం
+apps/erpnext/erpnext/stock/doctype/item/item.py,Duplicate entry in Manufacturers table,తయారీదారుల పట్టికలో నకిలీ ప్రవేశం
 apps/erpnext/erpnext/setup/doctype/item_group/item_group.js,This is a root item group and cannot be edited.,ఈ రూట్ అంశం సమూహం ఉంది మరియు సవరించడం సాధ్యం కాదు.
 apps/erpnext/erpnext/accounts/doctype/account/account.js,Merge,విలీనం
 DocType: Journal Entry Account,Purchase Order,కొనుగోలు ఆర్డర్
@@ -2384,7 +2393,6 @@
 DocType: Asset,Depreciation Schedules,అరుగుదల షెడ్యూల్స్
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.js,Create Sales Invoice,సేల్స్ ఇన్వాయిస్ సృష్టించండి
 apps/erpnext/erpnext/regional/doctype/gstr_3b_report/gstr_3b_report.html,Ineligible ITC,అనర్హమైన ఐటిసి
-apps/erpnext/erpnext/erpnext_integrations/doctype/shopify_settings/shopify_settings.py,"Support for public app is deprecated. Please setup private app, for more details refer user manual","పబ్లిక్ అనువర్తనం కోసం మద్దతు నిలిపివేయబడింది. దయచేసి ప్రైవేట్ అనువర్తనం సెటప్ చేయండి, మరిన్ని వివరాల కోసం యూజర్ మాన్యువల్ను చూడండి"
 DocType: Task,Dependent Tasks,డిపెండెంట్ టాస్క్‌లు
 apps/erpnext/erpnext/regional/report/gstr_1/gstr_1.py,Following accounts might be selected in GST Settings:,GST సెట్టింగులలో తరువాత ఖాతాలను ఎంచుకోవచ్చు:
 apps/erpnext/erpnext/manufacturing/report/bom_stock_report/bom_stock_report.js,Quantity to Produce,ఉత్పత్తి చేయడానికి పరిమాణం
@@ -2632,6 +2640,7 @@
 DocType: Water Analysis,Container,కంటైనర్
 apps/erpnext/erpnext/regional/report/gstr_1/gstr_1.py,Please set valid GSTIN No. in Company Address,దయచేసి కంపెనీ చిరునామాలో చెల్లుబాటు అయ్యే GSTIN నంబర్‌ను సెట్ చేయండి
 apps/erpnext/erpnext/education/utils.py,Student {0} - {1} appears Multiple times in row {2} & {3},స్టూడెంట్ {0} - {1} వరుసగా అనేక సార్లు కనిపిస్తుంది {2} &amp; {3}
+apps/erpnext/erpnext/selling/doctype/customer/customer.py,Following fields are mandatory to create address:,చిరునామాను సృష్టించడానికి క్రింది ఫీల్డ్‌లు తప్పనిసరి:
 DocType: Item Alternative,Two-way,రెండు-మార్గం
 DocType: Item,Manufacturers,తయారీదారులు
 ,Employee Billing Summary,ఉద్యోగుల బిల్లింగ్ సారాంశం
@@ -2706,9 +2715,9 @@
 DocType: Employee,HR-EMP-,ఆర్ EMP-
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py,User {0} doesn't have any default POS Profile. Check Default at Row {1} for this User.,వాడుకరి {0} కు ఎటువంటి డిఫాల్ట్ POS ప్రొఫైల్ లేదు. ఈ వాడుకరి కోసం రో {1} వద్ద డిఫాల్ట్ తనిఖీ చేయండి.
 DocType: Quality Meeting Minutes,Quality Meeting Minutes,నాణ్యమైన సమావేశ నిమిషాలు
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Supplier &gt; Supplier Type,సరఫరాదారు&gt; సరఫరాదారు రకం
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py,Employee Referral,ఉద్యోగుల రెఫరల్
 DocType: Student Group,Set 0 for no limit,ఎటువంటి పరిమితి 0 సెట్
+DocType: Cost Center,rgt,rgt
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py,The day(s) on which you are applying for leave are holidays. You need not apply for leave.,మీరు సెలవు కోసం దరఖాస్తు ఇది రోజు (లు) పండుగలు. మీరు సెలవు కోసం దరఖాస్తు అవసరం లేదు.
 DocType: Customer,Primary Address and Contact Detail,ప్రాథమిక చిరునామా మరియు సంప్రదింపు వివరాలు
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.js,Resend Payment Email,చెల్లింపు ఇమెయిల్ను మళ్లీ పంపండి
@@ -2812,7 +2821,6 @@
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py,Against Supplier Invoice {0} dated {1},సరఫరాదారు వ్యతిరేకంగా వాయిస్ {0} నాటి {1}
 DocType: Customer,Default Price List,డిఫాల్ట్ ధర జాబితా
 apps/erpnext/erpnext/assets/doctype/asset/asset.py,Asset Movement record {0} created,ఆస్తి ఉద్యమం రికార్డు {0} రూపొందించారు
-apps/erpnext/erpnext/utilities/page/leaderboard/leaderboard.js,No items found.,అంశాలు కనుగొనబడలేదు.
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py,You cannot delete Fiscal Year {0}. Fiscal Year {0} is set as default in Global Settings,మీరు తొలగించలేరు ఫిస్కల్ ఇయర్ {0}. ఫిస్కల్ ఇయర్ {0} గ్లోబల్ సెట్టింగ్స్ లో డిఫాల్ట్ గా సెట్
 DocType: Share Transfer,Equity/Liability Account,ఈక్విటీ / బాధ్యత ఖాతా
 apps/erpnext/erpnext/setup/doctype/customer_group/customer_group.py,A customer with the same name already exists,అదే పేరుతో ఉన్న కస్టమర్ ఇప్పటికే ఉంది
@@ -2828,6 +2836,7 @@
 apps/erpnext/erpnext/selling/doctype/customer/customer.py,Credit limit has been crossed for customer {0} ({1}/{2}),కస్టమర్ {0} ({1} / {2}) కోసం క్రెడిట్ పరిమితి దాటింది.
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py,Customer required for 'Customerwise Discount',&#39;Customerwise డిస్కౌంట్&#39; అవసరం కస్టమర్
 apps/erpnext/erpnext/config/accounting.py,Update bank payment dates with journals.,పత్రికలు బ్యాంకు చెల్లింపు తేదీలు నవీకరించండి.
+,Billed Qty,Qty బిల్
 apps/erpnext/erpnext/stock/doctype/item/item_dashboard.py,Pricing,ధర
 DocType: Employee,Attendance Device ID (Biometric/RF tag ID),హాజరు పరికర ID (బయోమెట్రిక్ / RF ట్యాగ్ ID)
 DocType: Quotation,Term Details,టర్మ్ వివరాలు
@@ -2850,6 +2859,7 @@
 DocType: Share Transfer,Asset Account,ఆస్తి ఖాతా
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js,New release date should be in the future,కొత్త విడుదల తేదీ భవిష్యత్తులో ఉండాలి
 DocType: Purchase Invoice,End date of current invoice's period,ప్రస్తుత ఇన్వాయిస్ పిరియడ్ ముగింపు తేదీ
+apps/erpnext/erpnext/hr/doctype/employee/employee.py,Please setup Employee Naming System in Human Resource &gt; HR Settings,దయచేసి మానవ వనరులు&gt; హెచ్ ఆర్ సెట్టింగులలో ఉద్యోగుల నామకరణ వ్యవస్థను సెటప్ చేయండి
 DocType: Lab Test,Technician Name,టెక్నీషియన్ పేరు
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py,"Cannot ensure delivery by Serial No as \
 					Item {0} is added with and without Ensure Delivery by \
@@ -2857,6 +2867,7 @@
 DocType: Accounts Settings,Unlink Payment on Cancellation of Invoice,వాయిస్ రద్దు చెల్లింపు లింక్ను రద్దు
 DocType: Bank Reconciliation,From Date,తేదీ నుండి
 apps/erpnext/erpnext/hr/doctype/vehicle_log/vehicle_log.py,Current Odometer reading entered should be greater than initial Vehicle Odometer {0},ఎంటర్ ప్రస్తుత ఓడోమీటార్ పఠనం ప్రారంభ వాహనం ఓడోమీటార్ కన్నా ఎక్కువ ఉండాలి {0}
+,Purchase Order Items To Be Received or Billed,స్వీకరించవలసిన లేదా బిల్ చేయవలసిన ఆర్డర్ వస్తువులను కొనండి
 DocType: Restaurant Reservation,No Show,ప్రదర్శన లేదు
 apps/erpnext/erpnext/regional/india/utils.py,You must be a registered supplier to generate e-Way Bill,ఇ-వే బిల్లును రూపొందించడానికి మీరు తప్పనిసరిగా రిజిస్టర్డ్ సరఫరాదారు అయి ఉండాలి
 DocType: Shipping Rule Country,Shipping Rule Country,షిప్పింగ్ రూల్ దేశం
@@ -2898,6 +2909,7 @@
 apps/erpnext/erpnext/templates/generators/item/item_add_to_cart.html,View in Cart,కార్ట్ లో చూడండి
 DocType: Employee Checkin,Shift Actual Start,అసలు ప్రారంభాన్ని మార్చండి
 DocType: Tally Migration,Is Day Book Data Imported,డే బుక్ డేటా దిగుమతి చేయబడింది
+,Purchase Order Items To Be Received or Billed1,స్వీకరించవలసిన లేదా బిల్ చేయవలసిన ఆర్డర్ వస్తువులను కొనుగోలు చేయండి
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py,Marketing Expenses,మార్కెటింగ్ ఖర్చులు
 ,Item Shortage Report,అంశం కొరత రిపోర్ట్
 DocType: Bank Transaction Payments,Bank Transaction Payments,బ్యాంక్ లావాదేవీ చెల్లింపులు
@@ -3262,6 +3274,7 @@
 ,Campaign Efficiency,ప్రచారం సమర్థత
 ,Campaign Efficiency,ప్రచారం సమర్థత
 DocType: Discussion,Discussion,చర్చా
+apps/erpnext/erpnext/setup/default_energy_point_rules.py,On Sales Order Submission,సేల్స్ ఆర్డర్ సమర్పణలో
 DocType: Bank Transaction,Transaction ID,లావాదేవి ఐడి
 DocType: Payroll Entry,Deduct Tax For Unsubmitted Tax Exemption Proof,పన్ను చెల్లించని పన్ను మినహాయింపు ప్రూఫ్ కోసం పన్ను తీసివేయు
 DocType: Volunteer,Anytime,ఎప్పుడైనా
@@ -3269,7 +3282,6 @@
 DocType: Employee Tax Exemption Proof Submission,Employee Tax Exemption Proof Submission,ఉద్యోగుల పన్ను మినహాయింపు ప్రూఫ్ సబ్మిషన్
 DocType: Patient,Surgical History,శస్త్రచికిత్స చరిత్ర
 DocType: Bank Statement Settings Item,Mapped Header,మ్యాప్ చేసిన శీర్షిక
-apps/erpnext/erpnext/hr/doctype/employee/employee.py,Please setup Employee Naming System in Human Resource &gt; HR Settings,దయచేసి మానవ వనరులు&gt; హెచ్ ఆర్ సెట్టింగులలో ఉద్యోగుల నామకరణ వ్యవస్థను సెటప్ చేయండి
 DocType: Employee,Resignation Letter Date,రాజీనామా ఉత్తరం తేదీ
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Pricing Rules are further filtered based on quantity.,ధర నిబంధనలకు మరింత పరిమాణం ఆధారంగా ఫిల్టర్.
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py,Please set the Date Of Joining for employee {0},ఉద్యోగికి తీసుకొన్న తేదీ సెట్ దయచేసి {0}
@@ -3284,6 +3296,7 @@
 DocType: Bank Statement Settings,Mapped Items,మ్యాప్ చేయబడిన అంశాలు
 DocType: Amazon MWS Settings,IT,ఐటి
 DocType: Chapter,Chapter,అధ్యాయము
+,Fixed Asset Register,స్థిర ఆస్తి రిజిస్టర్
 apps/erpnext/erpnext/utilities/user_progress.py,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,Select BOM and Qty for Production,ఉత్పత్తి కోసం BOM మరియు ప్యాక్ చేసిన అంశాల ఎంచుకోండి
@@ -3415,7 +3428,6 @@
 apps/erpnext/erpnext/templates/emails/reorder_item.html,Following Material Requests have been raised automatically based on Item's re-order level,మెటీరియల్ అభ్యర్థనలను తరువాత అంశం యొక్క క్రమాన్ని స్థాయి ఆధారంగా స్వయంచాలకంగా బడ్డాయి
 apps/erpnext/erpnext/controllers/accounts_controller.py,Account {0} is invalid. Account Currency must be {1},ఖాతా {0} చెల్లదు. ఖాతా కరెన్సీ ఉండాలి {1}
 apps/erpnext/erpnext/hr/doctype/salary_structure_assignment/salary_structure_assignment.py,From Date {0} cannot be after employee's relieving Date {1},తేదీ నుండి {0} ఉద్యోగి యొక్క ఉపశమనం తేదీ తర్వాత {1}
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py,Debit Note {0} has been created automatically,డెబిట్ నోట్ {0} స్వయంచాలకంగా సృష్టించబడింది
 apps/erpnext/erpnext/accounts/doctype/payment_order/payment_order.js,Create Payment Entries,చెల్లింపు ఎంట్రీలను సృష్టించండి
 DocType: Supplier,Is Internal Supplier,అంతర్గత సరఫరాదారు
 DocType: Employee,Create User Permission,వాడుకరి అనుమతిని సృష్టించండి
@@ -3973,7 +3985,6 @@
 DocType: Project User,Project Status,ప్రాజెక్టు హోదా
 DocType: UOM,Check this to disallow fractions. (for Nos),భిన్నాలు నిరాకరించేందుకు ఈ తనిఖీ. (NOS కోసం)
 DocType: Student Admission Program,Naming Series (for Student Applicant),సిరీస్ నేమింగ్ (స్టూడెంట్ దరఖాస్తుదారు కోసం)
-apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.py,UOM Conversion factor ({0} -&gt; {1}) not found for item: {2},అంశం కోసం UOM మార్పిడి కారకం ({0} -&gt; {1}) కనుగొనబడలేదు: {2}
 apps/erpnext/erpnext/hr/doctype/retention_bonus/retention_bonus.py,Bonus Payment Date cannot be a past date,బోనస్ చెల్లింపు తేదీ గత తేదీ కాదు
 DocType: Travel Request,Copy of Invitation/Announcement,ఆహ్వానం / ప్రకటన యొక్క కాపీ
 DocType: Practitioner Service Unit Schedule,Practitioner Service Unit Schedule,ప్రాక్టీషనర్ సర్వీస్ యూనిట్ షెడ్యూల్
@@ -4195,7 +4206,6 @@
 DocType: Journal Entry,Accounting Entries,అకౌంటింగ్ ఎంట్రీలు
 DocType: Job Card Time Log,Job Card Time Log,జాబ్ కార్డ్ టైమ్ లాగ్
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,"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; ఫీల్డ్లో పొందబడుతుంది."
-apps/erpnext/erpnext/education/doctype/instructor/instructor.py,Please setup Instructor Naming System in Education &gt; Education Settings,దయచేసి విద్య&gt; విద్య సెట్టింగులలో బోధకుడు నామకరణ వ్యవస్థను సెటప్ చేయండి
 DocType: Journal Entry,Paid Loan,చెల్లించిన లోన్
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py,Duplicate Entry. Please check Authorization Rule {0},ఎంట్రీ నకిలీ. తనిఖీ చేయండి అధీకృత రూల్ {0}
 DocType: Journal Entry Account,Reference Due Date,రిఫరెన్స్ గడువు తేదీ
@@ -4212,7 +4222,6 @@
 apps/erpnext/erpnext/templates/pages/projects.html,No time sheets,ఏ సమయంలో షీట్లు
 DocType: GoCardless Mandate,GoCardless Customer,GoCardless కస్టమర్
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py,Leave Type {0} cannot be carry-forwarded,{0} క్యారీ-ఫార్వార్డ్ కాదు టైప్ వదిలి
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Item Code &gt; Item Group &gt; Brand,ఐటెమ్ కోడ్&gt; ఐటెమ్ గ్రూప్&gt; బ్రాండ్
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py,Maintenance Schedule is not generated for all the items. Please click on 'Generate Schedule',నిర్వహణ షెడ్యూల్ అన్ని అంశాలను ఉత్పత్తి లేదు. &#39;రూపొందించండి షెడ్యూల్&#39; క్లిక్ చేయండి
 ,To Produce,ఉత్పత్తి
 DocType: Leave Encashment,Payroll,పేరోల్
@@ -4326,7 +4335,6 @@
 DocType: Stock Ledger Entry,Actual Qty After Transaction,లావాదేవీ తరువాత వాస్తవంగా ప్యాక్ చేసిన అంశాల
 ,Pending SO Items For Purchase Request,కొనుగోలు అభ్యర్థన SO పెండింగ్లో ఉన్న అంశాలు
 apps/erpnext/erpnext/education/doctype/student_admission/student_admission.py,Student Admissions,స్టూడెంట్ అడ్మిషన్స్
-apps/erpnext/erpnext/accounts/party.py,{0} {1} is disabled,{0} {1} నిలిపివేయబడింది
 DocType: Supplier,Billing Currency,బిల్లింగ్ కరెన్సీ
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py,Extra Large,ఎక్స్ ట్రా లార్జ్
 DocType: Loan,Loan Application,లోన్ అప్లికేషన్
@@ -4403,7 +4411,6 @@
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py,Only Leave Applications with status 'Approved' and 'Rejected' can be submitted,మాత్రమే స్థితి కూడిన దరఖాస్తులను లీవ్ &#39;ఆమోదించబడింది&#39; మరియు &#39;&#39; తిరస్కరించింది సమర్పించిన చేయవచ్చు
 apps/erpnext/erpnext/accounts/doctype/accounting_dimension/accounting_dimension.py,Creating Dimensions...,కొలతలు సృష్టిస్తోంది ...
 apps/erpnext/erpnext/education/doctype/student_group_creation_tool/student_group_creation_tool.py,Student Group Name is mandatory in row {0},స్టూడెంట్ గ్రూప్ పేరు వరుసగా తప్పనిసరి {0}
-DocType: Customer Credit Limit,Bypass credit limit_check,క్రెడిట్ పరిమితిని తనిఖీ చేయండి
 DocType: Homepage,Products to be shown on website homepage,ఉత్పత్తులు వెబ్సైట్ హోమ్ చూపబడుతుంది
 DocType: HR Settings,Password Policy,పాస్వర్డ్ విధానం
 apps/erpnext/erpnext/setup/doctype/customer_group/customer_group.js,This is a root customer group and cannot be edited.,ఈ రూట్ కస్టమర్ సమూహం ఉంది మరియు సవరించడం సాధ్యం కాదు.
@@ -4981,6 +4988,7 @@
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py,No {0} found for Inter Company Transactions.,ఇంటర్ కంపెనీ లావాదేవీలకు ఎటువంటి {0} దొరకలేదు.
 DocType: Travel Itinerary,Rented Car,అద్దె కారు
 apps/erpnext/erpnext/public/js/hub/components/profile_dialog.js,About your Company,మీ కంపెనీ గురించి
+apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.js,Show Stock Ageing Data,స్టాక్ ఏజింగ్ డేటాను చూపించు
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py,Credit To account must be a Balance Sheet account,ఖాతాకు క్రెడిట్ బాలన్స్ షీట్ ఖాతా ఉండాలి
 DocType: Donor,Donor,దాత
 DocType: Global Defaults,Disable In Words,వర్డ్స్ ఆపివేయి
@@ -4994,8 +5002,10 @@
 DocType: Patient,Patient ID,రోగి ID
 DocType: Practitioner Schedule,Schedule Name,షెడ్యూల్ పేరు
 DocType: Currency Exchange,For Buying,కొనుగోలు కోసం
+apps/erpnext/erpnext/setup/default_energy_point_rules.py,On Purchase Order Submission,కొనుగోలు ఆర్డర్ సమర్పణలో
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js,Add All Suppliers,అన్ని సరఫరాదారులను జోడించండి
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py,Row #{0}: Allocated Amount cannot be greater than outstanding amount.,రో # {0}: కేటాయించిన సొమ్ము బాకీ మొత్తం కంటే ఎక్కువ ఉండకూడదు.
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Customer &gt; Customer Group &gt; Territory,కస్టమర్&gt; కస్టమర్ గ్రూప్&gt; భూభాగం
 DocType: Tally Migration,Parties,పార్టీలు
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js,Browse BOM,బ్రౌజ్ BOM
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py,Secured Loans,సెక్యూర్డ్ లోన్స్
@@ -5026,6 +5036,7 @@
 apps/erpnext/erpnext/stock/doctype/item_alternative/item_alternative.py,Not allow to set alternative item for the item {0},అంశం కోసం ప్రత్యామ్నాయ అంశం సెట్ చేయడానికి అనుమతించవద్దు {0}
 apps/erpnext/erpnext/hr/doctype/leave_block_list/leave_block_list.py,Date is repeated,తేదీ పునరావృతమవుతుంది
 apps/erpnext/erpnext/accounts/print_format/payment_receipt_voucher/payment_receipt_voucher.html,Authorized Signatory,సంతకం పెట్టడానికి అధికారం
+apps/erpnext/erpnext/education/doctype/instructor/instructor.py,Please setup Instructor Naming System in Education &gt; Education Settings,దయచేసి విద్య&gt; విద్య సెట్టింగులలో బోధకుడు నామకరణ వ్యవస్థను సెటప్ చేయండి
 apps/erpnext/erpnext/regional/doctype/gstr_3b_report/gstr_3b_report.html,Net ITC Available(A) - (B),నికర ఐటిసి అందుబాటులో ఉంది (ఎ) - (బి)
 apps/erpnext/erpnext/education/doctype/fee_schedule/fee_schedule.js,Create Fees,ఫీజులను సృష్టించండి
 DocType: Project,Total Purchase Cost (via Purchase Invoice),మొత్తం కొనుగోలు ఖర్చు (కొనుగోలు వాయిస్ ద్వారా)
@@ -5045,6 +5056,7 @@
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.js,Message Sent,సందేశం పంపబడింది
 apps/erpnext/erpnext/accounts/doctype/account/account.py,Account with child nodes cannot be set as ledger,పిల్లల నోడ్స్ తో ఖాతా లెడ్జర్ సెట్ కాదు
 DocType: C-Form,II,రెండవ
+apps/erpnext/erpnext/assets/report/fixed_asset_register/fixed_asset_register.py,Vendor Name,విక్రేత యొక్క పేరు
 DocType: Quiz Result,Wrong,తప్పు
 DocType: Sales Invoice,Rate at which Price list currency is converted to customer's base currency,రేటు ధర జాబితా కరెన్సీ కస్టమర్ యొక్క బేస్ కరెన్సీ మార్చబడుతుంది
 DocType: Purchase Invoice Item,Net Amount (Company Currency),నికర మొత్తం (కంపెనీ కరెన్సీ)
@@ -5283,6 +5295,7 @@
 DocType: Stock Settings,Auto Material Request,ఆటో మెటీరియల్ అభ్యర్థన
 DocType: Woocommerce Settings,API consumer secret,API వినియోగదారు రహస్యం
 DocType: Delivery Note Item,Available Batch Qty at From Warehouse,గిడ్డంగి నుండి వద్ద అందుబాటులో బ్యాచ్ ప్యాక్ చేసిన అంశాల
+,Received Qty Amount,Qty మొత్తాన్ని అందుకున్నారు
 DocType: Salary Slip,Gross Pay - Total Deduction - Loan Repayment,స్థూల పే - మొత్తం తీసివేత - లోన్ తిరిగి చెల్లించే
 DocType: Bank Account,Last Integration Date,చివరి ఇంటిగ్రేషన్ తేదీ
 DocType: Expense Claim,Expense Taxes and Charges,ఖర్చు పన్నులు మరియు ఛార్జీలు
@@ -5737,6 +5750,8 @@
 DocType: Drug Prescription,Hour,అవర్
 DocType: Restaurant Order Entry,Last Sales Invoice,చివరి సేల్స్ ఇన్వాయిస్
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py,Please select Qty against item {0},దయచేసి వస్తువుకి వ్యతిరేకంగా Qty ను ఎంచుకోండి {0}
+apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py,Latest Age,తాజా యుగం
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js,Transfer Material to Supplier,సరఫరాదారు మెటీరియల్ బదిలీ
 apps/erpnext/erpnext/hr/report/loan_repayment/loan_repayment.py,EMI,EMI
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py,New Serial No cannot have Warehouse. Warehouse must be set by Stock Entry or Purchase Receipt,కొత్త సీరియల్ లేవు వేర్హౌస్ కలిగి చేయవచ్చు. వేర్హౌస్ స్టాక్ ఎంట్రీ లేదా కొనుగోలు రసీదులు ద్వారా ఏర్పాటు చేయాలి
 DocType: Lead,Lead Type,లీడ్ టైప్
@@ -5758,7 +5773,6 @@
 apps/erpnext/erpnext/hr/doctype/employee_benefit_application/employee_benefit_application.py,"An amount of {0} already claimed for the component {1},\
 						 set the amount equal or greater than {2}",{0} ఇప్పటికే {{1} భాగం కొరకు దావా వేసిన మొత్తం పరిమాణం {2}
 DocType: Shipping Rule,Shipping Rule Conditions,షిప్పింగ్ రూల్ పరిస్థితులు
-DocType: Purchase Invoice,Export Type,ఎగుమతి రకం
 DocType: Salary Slip Loan,Salary Slip Loan,జీతం స్లిప్ లోన్
 DocType: BOM Update Tool,The new BOM after replacement,భర్తీ తర్వాత కొత్త BOM
 ,Point of Sale,అమ్మకానికి పాయింట్
@@ -5878,7 +5892,6 @@
 DocType: Purchase Order Item,Blanket Order Rate,బ్లాంకెట్ ఆర్డర్ రేట్
 ,Customer Ledger Summary,కస్టమర్ లెడ్జర్ సారాంశం
 apps/erpnext/erpnext/hooks.py,Certification,సర్టిఫికేషన్
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js,Are you sure you want to make debit note?,మీరు ఖచ్చితంగా డెబిట్ నోట్ చేయాలనుకుంటున్నారా?
 DocType: Bank Guarantee,Clauses and Conditions,క్లాజులు మరియు షరతులు
 DocType: Serial No,Creation Document Type,సృష్టి డాక్యుమెంట్ టైప్
 DocType: Amazon MWS Settings,ES,ES
@@ -5916,8 +5929,6 @@
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py,Financial Services,ఫైనాన్షియల్ సర్వీసెస్
 DocType: Student Sibling,Student ID,విద్యార్థి ID
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.js,For Quantity must be greater than zero,పరిమాణానికి సున్నా కంటే ఎక్కువ ఉండాలి
-apps/erpnext/erpnext/hr/doctype/employee_transfer/employee_transfer.py,"Please delete the Employee <a href=""#Form/Employee/{0}"">{0}</a>\
-					to cancel this document","ఈ పత్రాన్ని రద్దు చేయడానికి దయచేసి ఉద్యోగి <a href=""#Form/Employee/{0}"">{0}</a> delete ను తొలగించండి"
 apps/erpnext/erpnext/config/projects.py,Types of activities for Time Logs,సమయం చిట్టాలు చర్యలు రకాలు
 DocType: Opening Invoice Creation Tool,Sales,సేల్స్
 DocType: Stock Entry Detail,Basic Amount,ప్రాథమిక సొమ్ము
@@ -5996,6 +6007,7 @@
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py,Print and Stationery,ముద్రణ మరియు స్టేషనరీ
 DocType: Stock Settings,Show Barcode Field,షో బార్కోడ్ ఫీల్డ్
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js,Send Supplier Emails,సరఫరాదారు ఇమెయిల్స్ పంపడం
+DocType: Asset Movement,ACC-ASM-.YYYY.-,ACC-ASM-.YYYY.-
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py,"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,ఆటో సృష్టించబడింది
 apps/erpnext/erpnext/hr/doctype/employee_onboarding/employee_onboarding.py,Submit this to create the Employee record,ఉద్యోగుల రికార్డును రూపొందించడానికి దీన్ని సమర్పించండి
@@ -6075,7 +6087,6 @@
 DocType: Sales Team,Contact No.,సంప్రదించండి నం
 apps/erpnext/erpnext/templates/includes/cart/cart_address.html,Billing Address is same as Shipping Address,బిల్లింగ్ చిరునామా షిప్పింగ్ చిరునామా వలె ఉంటుంది
 DocType: Bank Reconciliation,Payment Entries,చెల్లింపు ఎంట్రీలు
-apps/erpnext/erpnext/erpnext_integrations/doctype/shopify_settings/shopify_settings.py,Access token or Shopify URL missing,యాక్సెస్ టోకెన్ లేదా Shopify URL లేదు
 DocType: Location,Latitude,అక్షాంశం
 DocType: Work Order,Scrap Warehouse,స్క్రాప్ వేర్హౌస్
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py,"Warehouse required at Row No {0}, please set default warehouse for the item {1} for the company {2}","రౌ సంఖ్య {0} వద్ద వేర్హౌస్ అవసరం, దయచేసి సంస్థ {2} కోసం వస్తువు {1} కోసం డిఫాల్ట్ గిడ్డంగిని సెట్ చేయండి"
@@ -6119,7 +6130,6 @@
 DocType: Job Offer Term,Value / Description,విలువ / వివరణ
 apps/erpnext/erpnext/controllers/accounts_controller.py,"Row #{0}: Asset {1} cannot be submitted, it is already {2}","రో # {0}: ఆస్తి {1} సమర్పించిన కాదు, అది ఇప్పటికే ఉంది {2}"
 DocType: Tax Rule,Billing Country,బిల్లింగ్ దేశం
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js,Are you sure you want to make credit note?,మీరు ఖచ్చితంగా క్రెడిట్ నోట్ చేయాలనుకుంటున్నారా?
 DocType: Purchase Order Item,Expected Delivery Date,ఊహించినది డెలివరీ తేదీ
 DocType: Restaurant Order Entry,Restaurant Order Entry,రెస్టారెంట్ ఆర్డర్ ఎంట్రీ
 apps/erpnext/erpnext/accounts/general_ledger.py,Debit and Credit not equal for {0} #{1}. Difference is {2}.,డెబిట్ మరియు క్రెడిట్ {0} # సమాన కాదు {1}. తేడా ఉంది {2}.
@@ -6242,6 +6252,7 @@
 DocType: Purchase Invoice,Taxes and Charges Added,పన్నులు మరియు ఆరోపణలు చేర్చబడింది
 apps/erpnext/erpnext/assets/doctype/asset/asset.py,Depreciation Row {0}: Next Depreciation Date cannot be before Available-for-use Date,తరుగుదల వరుస {0}: అప్రస్తుత తేదీ అందుబాటులో ఉండకపోవటానికి ముందు తేదీ ఉండకూడదు
 ,Sales Funnel,అమ్మకాల గరాటు
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Item Code &gt; Item Group &gt; Brand,ఐటెమ్ కోడ్&gt; ఐటెమ్ గ్రూప్&gt; బ్రాండ్
 apps/erpnext/erpnext/setup/doctype/company/company.py,Abbreviation is mandatory,సంక్షిప్త తప్పనిసరి
 DocType: Project,Task Progress,టాస్క్ ప్రోగ్రెస్
 apps/erpnext/erpnext/templates/includes/navbar/navbar_items.html,Cart,కార్ట్
@@ -6483,6 +6494,7 @@
 DocType: Employee Grade,Employee Grade,ఉద్యోగి గ్రేడ్
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py,Piecework,Piecework
 DocType: GSTR 3B Report,June,జూన్
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Supplier &gt; Supplier Type,సరఫరాదారు&gt; సరఫరాదారు రకం
 DocType: Share Balance,From No,సంఖ్య నుండి
 DocType: Shift Type,Early Exit Grace Period,ప్రారంభ నిష్క్రమణ గ్రేస్ కాలం
 DocType: Task,Actual Time (in Hours),(గంటల్లో) వాస్తవ సమయం
@@ -6764,6 +6776,7 @@
 DocType: Warehouse,Warehouse Name,వేర్హౌస్ పేరు
 DocType: Naming Series,Select Transaction,Select లావాదేవీ
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py,Please enter Approving Role or Approving User,రోల్ ఆమోదిస్తోంది లేదా వాడుకరి ఆమోదిస్తోంది నమోదు చేయండి
+apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.py,UOM Conversion factor ({0} -&gt; {1}) not found for item: {2},అంశం కోసం UOM మార్పిడి కారకం ({0} -&gt; {1}) కనుగొనబడలేదు: {2}
 DocType: Journal Entry,Write Off Entry,ఎంట్రీ ఆఫ్ వ్రాయండి
 DocType: BOM,Rate Of Materials Based On,రేటు పదార్థాల బేస్డ్ న
 DocType: Education Settings,"If enabled, field Academic Term will be Mandatory in Program Enrollment Tool.","ప్రారంభించబడితే, ఫీల్డ్ అకాడెమిక్ టర్మ్ ప్రోగ్రామ్ ఎన్రాల్మెంట్ టూల్లో తప్పనిసరి అవుతుంది."
@@ -6953,6 +6966,7 @@
 DocType: Quality Inspection Reading,Quality Inspection Reading,నాణ్యత తనిఖీ పఠనం
 apps/erpnext/erpnext/stock/doctype/stock_settings/stock_settings.py,`Freeze Stocks Older Than` should be smaller than %d days.,`ఫ్రీజ్ స్టాక్స్ పాత Than`% d రోజుల కంటే తక్కువగా ఉండాలి.
 DocType: Tax Rule,Purchase Tax Template,పన్ను మూస కొనుగోలు
+apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py,Earliest Age,ప్రారంభ వయస్సు
 apps/erpnext/erpnext/utilities/user_progress.py,Set a sales goal you'd like to achieve for your company.,మీ సంస్థ కోసం మీరు సాధించాలనుకుంటున్న అమ్మకాల లక్ష్యాన్ని సెట్ చేయండి.
 DocType: Quality Goal,Revision,పునర్విమర్శ
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js,Healthcare Services,ఆరోగ్య సేవలు
@@ -6995,6 +7009,7 @@
 apps/erpnext/erpnext/healthcare/doctype/patient_encounter/patient_encounter.js,Schedule Discharge,షెడ్యూల్ డిచ్ఛార్జ్
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py,Cheques and Deposits incorrectly cleared,చెక్కుల మరియు డిపాజిట్లు తప్పుగా క్లియర్
 DocType: Homepage Section Card,Homepage Section Card,హోమ్‌పేజీ విభాగం కార్డ్
+,Amount To Be Billed,బిల్ చేయవలసిన మొత్తం
 apps/erpnext/erpnext/accounts/doctype/account/account.py,Account {0}: You can not assign itself as parent account,ఖాతా {0}: మీరు పేరెంట్ ఖాతా గా కేటాయించలేరు
 DocType: Purchase Invoice Item,Price List Rate,ధర జాబితా రేటు
 apps/erpnext/erpnext/utilities/activation.py,Create customer quotes,కస్టమర్ కోట్స్ సృష్టించు
@@ -7047,6 +7062,7 @@
 DocType: Supplier Scorecard Criteria,Supplier Scorecard Criteria,సరఫరాదారు స్కోరు ప్రమాణం
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py,Please select Start Date and End Date for Item {0},అంశం కోసం ప్రారంభ తేదీ మరియు ముగింపు తేదీ దయచేసి ఎంచుకోండి {0}
 DocType: Maintenance Schedule,MAT-MSH-.YYYY.-,MAT-MSH-.YYYY.-
+,Amount to Receive,స్వీకరించవలసిన మొత్తం
 apps/erpnext/erpnext/education/doctype/student_group_creation_tool/student_group_creation_tool.py,Course is mandatory in row {0},కోర్సు వరుసగా తప్పనిసరి {0}
 apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py,From date can not be greater than than To date,తేదీ నుండి తేదీ కంటే ఎక్కువ ఉండకూడదు
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py,To date cannot be before from date,తేదీ తేదీ నుండి ముందు ఉండరాదు
@@ -7294,7 +7310,6 @@
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js,BOM and Manufacturing Quantity are required,బిఒఎం అండ్ మానుఫ్యాక్చరింగ్ పరిమాణం అవసరం
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js,Ageing Range 2,ఏజింగ్ రేంజ్ 2
 DocType: SG Creation Tool Course,Max Strength,మాక్స్ శక్తి
-apps/erpnext/erpnext/accounts/doctype/account/account.py,"Account {0} already exists in child company {1}. The following fields have different values, they should be same:<ul><li>{2}</li></ul>","పిల్లల సంస్థ {1} లో ఖాతా {0} ఇప్పటికే ఉంది. కింది ఫీల్డ్‌లు వేర్వేరు విలువలను కలిగి ఉంటాయి, అవి ఒకే విధంగా ఉండాలి: <ul><li> {2} </li></ul>"
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py,Installing presets,ప్రీసెట్లు ఇన్స్టాల్ చేస్తోంది
 DocType: Fee Schedule,EDU-FSH-.YYYY.-,EDU-FSH-.YYYY.-
 apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js,No Delivery Note selected for Customer {},కస్టమర్ కోసం డెలివరీ నోట్ ఎంపిక చేయబడలేదు
@@ -7501,6 +7516,7 @@
 DocType: Delivery Note,Print Without Amount,పరిమాణం లేకుండా ముద్రించండి
 apps/erpnext/erpnext/accounts/report/asset_depreciation_ledger/asset_depreciation_ledger.py,Depreciation Date,అరుగుదల తేదీ
 ,Work Orders in Progress,పని ఆర్డర్స్ ఇన్ ప్రోగ్రెస్
+DocType: Customer Credit Limit,Bypass Credit Limit Check,బైపాస్ క్రెడిట్ పరిమితి తనిఖీ
 DocType: Issue,Support Team,మద్దతు బృందం
 apps/erpnext/erpnext/stock/report/batch_item_expiry_status/batch_item_expiry_status.py,Expiry (In Days),గడువు (డేస్)
 DocType: Appraisal,Total Score (Out of 5),(5) మొత్తం స్కోరు
@@ -7685,6 +7701,7 @@
 DocType: Sales Invoice,Customer GSTIN,కస్టమర్ GSTIN
 DocType: Crop Cycle,List of diseases detected on the field. When selected it'll automatically add a list of tasks to deal with the disease ,ఫీల్డ్లో గుర్తించిన వ్యాధుల జాబితా. ఎంచుకున్నప్పుడు అది వ్యాధిని ఎదుర్కోడానికి స్వయంచాలకంగా పనుల జాబితాను జోడిస్తుంది
 apps/erpnext/erpnext/manufacturing/page/bom_comparison_tool/bom_comparison_tool.js,BOM 1,BOM 1
+apps/erpnext/erpnext/assets/report/fixed_asset_register/fixed_asset_register.py,Asset Id,ఆస్తి ఐడి
 apps/erpnext/erpnext/healthcare/doctype/healthcare_service_unit/healthcare_service_unit.js,This is a root healthcare service unit and cannot be edited.,ఇది ఒక రూట్ హెల్త్ కేర్ యూనిట్ మరియు సవరించబడదు.
 DocType: Asset Repair,Repair Status,రిపేరు స్థితి
 apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.js,"Requested Qty: Quantity requested for purchase, but not ordered.","అభ్యర్థించిన Qty: పరిమాణం కొనుగోలు కోసం అభ్యర్థించబడింది, కానీ ఆర్డర్ చేయలేదు."
diff --git a/erpnext/translations/th.csv b/erpnext/translations/th.csv
index 39ec552..350db28 100644
--- a/erpnext/translations/th.csv
+++ b/erpnext/translations/th.csv
@@ -289,7 +289,6 @@
 DocType: Loan,Repay Over Number of Periods,ชำระคืนกว่าจำนวนงวด
 apps/erpnext/erpnext/manufacturing/report/bom_stock_report/bom_stock_report.py,Quantity to Produce can not be less than Zero,ปริมาณที่จะผลิตต้องไม่น้อยกว่าศูนย์
 DocType: Stock Entry,Additional Costs,ค่าใช้จ่ายเพิ่มเติม
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Customer &gt; Customer Group &gt; Territory,ลูกค้า&gt; กลุ่มลูกค้า&gt; อาณาเขต
 apps/erpnext/erpnext/accounts/doctype/account/account.py,Account with existing transaction can not be converted to group.,บัญชี กับการทำธุรกรรม ที่มีอยู่ ไม่สามารถ แปลงเป็น กลุ่ม
 DocType: Lead,Product Enquiry,สอบถามสินค้า
 DocType: Education Settings,Validate Batch for Students in Student Group,ตรวจสอบรุ่นสำหรับนักเรียนในกลุ่มนักเรียน
@@ -587,6 +586,7 @@
 DocType: Healthcare Settings,Create documents for sample collection,สร้างเอกสารสำหรับการเก็บตัวอย่าง
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py,Payment against {0} {1} cannot be greater than Outstanding Amount {2},การชำระเงินกับ {0} {1} ไม่สามารถจะสูงกว่าจำนวนเงินที่โดดเด่น {2}
 apps/erpnext/erpnext/patches/v11_0/add_healthcare_service_unit_tree_root.py,All Healthcare Service Units,หน่วยบริการด้านการดูแลสุขภาพทั้งหมด
+apps/erpnext/erpnext/setup/default_energy_point_rules.py,On Converting Opportunity,ในการแปลงโอกาส
 DocType: Bank Account,Address HTML,ที่อยู่ HTML
 DocType: Lead,Mobile No.,เบอร์มือถือ
 apps/erpnext/erpnext/selling/doctype/pos_closing_voucher/closing_voucher_details.html,Mode of Payments,โหมดการชำระเงิน
@@ -651,7 +651,6 @@
 DocType: Accounting Dimension,Dimension Name,ชื่อส่วนข้อมูล
 apps/erpnext/erpnext/healthcare/setup.py,Resistant,ต้านทาน
 apps/erpnext/erpnext/hotels/doctype/hotel_room_reservation/hotel_room_reservation.py,Please set Hotel Room Rate on {},โปรดตั้งค่าห้องพักโรงแรมเมื่อ {@}
-apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py,Please setup numbering series for Attendance via Setup &gt; Numbering Series,โปรดตั้งค่าหมายเลขลำดับสำหรับการเข้าร่วมผ่านการตั้งค่า&gt; ลำดับเลข
 DocType: Journal Entry,Multi Currency,หลายสกุลเงิน
 DocType: Bank Statement Transaction Invoice Item,Invoice Type,ประเภทใบแจ้งหนี้
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py,Valid from date must be less than valid upto date,ที่ถูกต้องจากวันที่จะต้องน้อยกว่าที่ถูกต้องจนถึงวันที่
@@ -769,6 +768,7 @@
 apps/erpnext/erpnext/accounts/page/pos/pos.js,Create a new Customer,สร้างลูกค้าใหม่
 apps/erpnext/erpnext/non_profit/report/expiring_memberships/expiring_memberships.py,Expiring On,หมดอายุเมื่อ
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,"If multiple Pricing Rules continue to prevail, users are asked to set Priority manually to resolve conflict.",ถ้ากฎการกำหนดราคาหลายยังคงเหนือกว่าผู้ใช้จะขอให้ตั้งลำดับความสำคัญด้วยตนเองเพื่อแก้ไขความขัดแย้ง
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js,Purchase Return,ซื้อกลับ
 apps/erpnext/erpnext/utilities/activation.py,Create Purchase Orders,สร้างใบสั่งซื้อ
 ,Purchase Register,สั่งซื้อสมัครสมาชิก
 apps/erpnext/erpnext/healthcare/doctype/patient/patient.py,Patient not found,ไม่พบผู้ป่วย
@@ -784,7 +784,6 @@
 DocType: Location,Area UOM,พื้นที่ UOM
 apps/erpnext/erpnext/manufacturing/doctype/workstation/workstation.py,Workstation is closed on the following dates as per Holiday List: {0},เวิร์คสเตชั่จะปิดทำการในวันที่ต่อไปนี้เป็นรายชื่อต่อวันหยุด: {0}
 apps/erpnext/erpnext/selling/page/sales_funnel/sales_funnel.py,Opportunities,โอกาส
-apps/erpnext/erpnext/www/all-products/index.html,Clear filters,ล้างตัวกรอง
 DocType: Lab Test Template,Single,โสด
 DocType: Compensatory Leave Request,Work From Date,ทำงานจากวันที่
 DocType: Salary Slip,Total Loan Repayment,รวมการชำระคืนเงินกู้
@@ -828,6 +827,7 @@
 apps/erpnext/erpnext/education/doctype/program_enrollment_tool/program_enrollment_tool.py,Mandatory field - Academic Year,ฟิลด์บังคับ - Academic Year
 apps/erpnext/erpnext/education/doctype/program_enrollment_tool/program_enrollment_tool.py,Mandatory field - Academic Year,ฟิลด์บังคับ - ปีการศึกษา
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py,{0} {1} is not associated with {2} {3},{0} {1} ไม่มีส่วนเกี่ยวข้องกับ {2} {3}
+DocType: Opportunity,Converted By,แปลงโดย
 apps/erpnext/erpnext/public/js/hub/components/ReviewArea.vue,You need to login as a Marketplace User before you can add any reviews.,คุณต้องเข้าสู่ระบบในฐานะผู้ใช้ Marketplace ก่อนจึงจะสามารถเพิ่มความเห็นได้
 apps/erpnext/erpnext/manufacturing/doctype/job_card/job_card.py,Row {0} : Operation is required against the raw material item {1},แถว {0}: ต้องดำเนินการกับรายการวัตถุดิบ {1}
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py,Please set default payable account for the company {0},โปรดตั้งค่าบัญชีค่าตั้งต้นสำหรับ บริษัท {0}
@@ -854,6 +854,8 @@
 DocType: Sales Invoice,Total Qty,จำนวนรวม
 apps/erpnext/erpnext/education/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py,Guardian2 Email ID,รหัสอีเมล Guardian2
 apps/erpnext/erpnext/education/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py,Guardian2 Email ID,รหัสอีเมล Guardian2
+apps/erpnext/erpnext/hr/doctype/employee_transfer/employee_transfer.py,"Please delete the Employee <a href=""#Form/Employee/{0}"">{0}</a>\
+					to cancel this document","โปรดลบพนักงาน <a href=""#Form/Employee/{0}"">{0}</a> \ เพื่อยกเลิกเอกสารนี้"
 DocType: Item,Show in Website (Variant),แสดงในเว็บไซต์ (Variant)
 DocType: Employee,Health Concerns,ความกังวลเรื่องสุขภาพ
 DocType: Payroll Entry,Select Payroll Period,เลือกระยะเวลาการจ่ายเงินเดือน
@@ -914,7 +916,6 @@
 DocType: Codification Table,Codification Table,ตารางการแจกแจง
 DocType: Timesheet Detail,Hrs,ชั่วโมง
 apps/erpnext/erpnext/manufacturing/page/bom_comparison_tool/bom_comparison_tool.js,Changes in {0},การเปลี่ยนแปลงใน {0}
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js,Please select Company,กรุณาเลือก บริษัท
 DocType: Employee Skill,Employee Skill,ทักษะของพนักงาน
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.js,Difference Account,บัญชี ที่แตกต่างกัน
 DocType: Pricing Rule,Discount on Other Item,ส่วนลดในรายการอื่น ๆ
@@ -983,6 +984,7 @@
 DocType: BOM,Operating Cost,ค่าใช้จ่ายในการดำเนินงาน
 DocType: Crop,Produced Items,รายการที่ผลิต
 DocType: Bank Statement Transaction Entry,Match Transaction to Invoices,จับคู่การทำธุรกรรมกับใบแจ้งหนี้
+apps/erpnext/erpnext/erpnext_integrations/exotel_integration.py,Error in Exotel incoming call,ข้อผิดพลาดในการโทรเข้า Exotel
 DocType: Sales Order Item,Gross Profit,กำไรขั้นต้น
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js,Unblock Invoice,เลิกบล็อกใบแจ้งหนี้
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py,Increment cannot be 0,ไม่สามารถเพิ่มเป็น 0
@@ -1198,6 +1200,7 @@
 DocType: Activity Cost,Activity Type,ประเภทกิจกรรม
 DocType: Request for Quotation,For individual supplier,หาผู้จัดจำหน่ายของแต่ละบุคคล
 DocType: BOM Operation,Base Hour Rate(Company Currency),อัตราฐานชั่วโมง (สกุลเงินบริษัท)
+,Qty To Be Billed,จำนวนที่จะเรียกเก็บเงิน
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py,Delivered Amount,จัดส่งจํานวนเงิน
 apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.js,Reserved Qty for Production: Raw materials quantity to make manufacturing items.,ปริมาณที่สงวนไว้สำหรับการผลิต: ปริมาณวัตถุดิบเพื่อผลิตรายการ
 DocType: Loyalty Point Entry Redemption,Redemption Date,วันที่ไถ่ถอน
@@ -1319,7 +1322,7 @@
 apps/erpnext/erpnext/education/doctype/student_group/student_group.py,Please select Program,โปรดเลือกโปรแกรม
 apps/erpnext/erpnext/education/doctype/student_group/student_group.py,Please select Program,โปรดเลือกโปรแกรม
 DocType: Project,Estimated Cost,ค่าใช้จ่ายประมาณ
-DocType: Request for Quotation,Link to material requests,เชื่อมโยงไปยังการร้องขอวัสดุ
+DocType: Supplier Quotation,Link to material requests,เชื่อมโยงไปยังการร้องขอวัสดุ
 apps/erpnext/erpnext/public/js/hub/pages/Publish.vue,Publish,ประกาศ
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py,Aerospace,การบินและอวกาศ
 ,Fichier des Ecritures Comptables [FEC],Fichier des Ecritures Comptables [FEC]
@@ -1332,6 +1335,7 @@
 apps/erpnext/erpnext/utilities/transaction_base.py,Invalid Posting Time,เวลาผ่านรายการไม่ถูกต้อง
 DocType: Salary Component,Condition and Formula,เงื่อนไขและสูตร
 DocType: Lead,Campaign Name,ชื่อแคมเปญ
+apps/erpnext/erpnext/setup/default_energy_point_rules.py,On Task Completion,เมื่อเสร็จสิ้นภารกิจ
 apps/erpnext/erpnext/hr/doctype/compensatory_leave_request/compensatory_leave_request.py,There is no leave period in between {0} and {1},ไม่มีระยะเวลาการลาออกระหว่าง {0} ถึง {1}
 DocType: Fee Validity,Healthcare Practitioner,ผู้ประกอบการด้านสุขภาพ
 DocType: Hotel Room,Capacity,ความจุ
@@ -1696,7 +1700,6 @@
 DocType: Quality Feedback Template,Quality Feedback Template,เทมเพลตข้อเสนอแนะคุณภาพ
 apps/erpnext/erpnext/config/education.py,LMS Activity,กิจกรรม LMS
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py,Internet Publishing,สำนักพิมพ์ ทางอินเทอร์เน็ต
-DocType: Prescription Duration,Number,จำนวน
 apps/erpnext/erpnext/accounts/doctype/opening_invoice_creation_tool/opening_invoice_creation_tool.js,Creating {0} Invoice,กำลังสร้าง {0} ใบแจ้งหนี้
 DocType: Medical Code,Medical Code Standard,มาตรฐานการแพทย์
 DocType: Soil Texture,Clay Composition (%),องค์ประกอบของดิน (%)
@@ -1771,6 +1774,7 @@
 DocType: Support Settings,Get Started Sections,เริ่มหัวข้อ
 DocType: Lead,CRM-LEAD-.YYYY.-,CRM-LEAD-.YYYY.-
 DocType: Invoice Discounting,Sanctioned,ตามทำนองคลองธรรม
+,Base Amount,จำนวนฐาน
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.js,Total Contribution Amount: {0},จำนวนเงินสมทบทั้งหมด: {0}
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py,Row #{0}: Please specify Serial No for Item {1},แถว # {0}: โปรดระบุหมายเลขเครื่องกับรายการ {1}
 DocType: Payroll Entry,Salary Slips Submitted,เงินเดือนส่ง
@@ -1992,6 +1996,7 @@
 DocType: Accounting Dimension,Dimension Defaults,ค่าเริ่มต้นของมิติ
 apps/erpnext/erpnext/crm/report/prospects_engaged_but_not_converted/prospects_engaged_but_not_converted.js,Minimum Lead Age (Days),อายุนำขั้นต่ำ (วัน)
 apps/erpnext/erpnext/crm/report/prospects_engaged_but_not_converted/prospects_engaged_but_not_converted.js,Minimum Lead Age (Days),อายุนำขั้นต่ำ (วัน)
+apps/erpnext/erpnext/assets/report/fixed_asset_register/fixed_asset_register.py,Available For Use Date,พร้อมใช้งานสำหรับวันที่ใช้งาน
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py,All BOMs,BOMs ทั้งหมด
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js,Create Inter Company Journal Entry,สร้างรายการบันทึกระหว่าง บริษัท
 DocType: Company,Parent Company,บริษัท แม่
@@ -2056,6 +2061,7 @@
 ,IRS 1099,"IRS 1,099"
 DocType: Salary Slip,Leave Without Pay,ฝากโดยไม่ต้องจ่าย
 DocType: Payment Request,Outward,ภายนอก
+apps/erpnext/erpnext/setup/default_energy_point_rules.py,On {0} Creation,เมื่อวันที่ {0} การสร้าง
 apps/erpnext/erpnext/regional/doctype/gstr_3b_report/gstr_3b_report.html,State/UT Tax,ภาษีของรัฐ / UT
 ,Trial Balance for Party,งบทดลองสำหรับพรรค
 ,Gross and Net Profit Report,รายงานกำไรขั้นต้นและกำไรสุทธิ
@@ -2173,6 +2179,7 @@
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js,Make Stock Entry,ทำรายการสินค้า
 DocType: Hotel Room Reservation,Hotel Reservation User,ผู้จองโรงแรม
 apps/erpnext/erpnext/projects/doctype/project/project.js,Set Status,กำหนดสถานะ
+apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py,Please setup numbering series for Attendance via Setup &gt; Numbering Series,โปรดตั้งค่าหมายเลขลำดับสำหรับการเข้าร่วมผ่านการตั้งค่า&gt; ลำดับเลข
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py,Please select prefix first,กรุณาเลือก คำนำหน้า เป็นครั้งแรก
 DocType: Contract,Fulfilment Deadline,Fulfillment Deadline
 apps/erpnext/erpnext/public/js/hub/pages/Home.vue,Near you,ใกล้คุณ
@@ -2188,6 +2195,7 @@
 DocType: Announcement,All Students,นักเรียนทุกคน
 apps/erpnext/erpnext/assets/doctype/asset/asset.py,Item {0} must be a non-stock item,รายการ {0} จะต้องเป็นรายการที่ไม่สต็อก
 apps/erpnext/erpnext/stock/doctype/batch/batch.js,View Ledger,ดู บัญชีแยกประเภท
+DocType: Cost Center,Lft,ซ้าย
 DocType: Grading Scale,Intervals,ช่วงเวลา
 DocType: Bank Statement Transaction Entry,Reconciled Transactions,การเจรจาต่อรอง
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py,Earliest,ที่เก่าแก่ที่สุด
@@ -2303,6 +2311,7 @@
 apps/erpnext/erpnext/hr/doctype/employee_benefit_application/employee_benefit_application.py,As per your assigned Salary Structure you cannot apply for benefits,ตามโครงสร้างค่าจ้างที่ได้รับมอบหมายคุณไม่สามารถยื่นขอผลประโยชน์ได้
 apps/erpnext/erpnext/stock/doctype/item/item.py,Website Image should be a public file or website URL,ภาพ Website ควรจะเป็นไฟล์สาธารณะหรือ URL ของเว็บไซต์
 DocType: Purchase Invoice Item,BOM,BOM
+apps/erpnext/erpnext/stock/doctype/item/item.py,Duplicate entry in Manufacturers table,รายการซ้ำในตารางผู้ผลิต
 apps/erpnext/erpnext/setup/doctype/item_group/item_group.js,This is a root item group and cannot be edited.,กลุ่มนี้เป็นกลุ่ม รายการที่ ราก และ ไม่สามารถแก้ไขได้
 apps/erpnext/erpnext/accounts/doctype/account/account.js,Merge,ผสาน
 DocType: Journal Entry Account,Purchase Order,ใบสั่งซื้อ
@@ -2449,7 +2458,6 @@
 DocType: Asset,Depreciation Schedules,ตารางค่าเสื่อมราคา
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.js,Create Sales Invoice,สร้างใบแจ้งหนี้การขาย
 apps/erpnext/erpnext/regional/doctype/gstr_3b_report/gstr_3b_report.html,Ineligible ITC,ITC ที่ไม่มีสิทธิ์
-apps/erpnext/erpnext/erpnext_integrations/doctype/shopify_settings/shopify_settings.py,"Support for public app is deprecated. Please setup private app, for more details refer user manual",การสนับสนุนแอปพลิเคชันสาธารณะเลิกใช้แล้ว โปรดตั้งค่าแอปส่วนตัวสำหรับรายละเอียดเพิ่มเติมดูคู่มือผู้ใช้
 DocType: Task,Dependent Tasks,งานที่ต้องพึ่งพา
 apps/erpnext/erpnext/regional/report/gstr_1/gstr_1.py,Following accounts might be selected in GST Settings:,สามารถเลือกบัญชีต่อไปนี้ในการตั้งค่า GST:
 apps/erpnext/erpnext/manufacturing/report/bom_stock_report/bom_stock_report.js,Quantity to Produce,ปริมาณในการผลิต
@@ -2702,6 +2710,7 @@
 DocType: Water Analysis,Container,ภาชนะ
 apps/erpnext/erpnext/regional/report/gstr_1/gstr_1.py,Please set valid GSTIN No. in Company Address,โปรดตั้งค่าหมายเลข GSTIN ที่ถูกต้องในที่อยู่ บริษัท
 apps/erpnext/erpnext/education/utils.py,Student {0} - {1} appears Multiple times in row {2} & {3},นักศึกษา {0} - {1} ปรากฏขึ้นหลายครั้งในแถว {2} และ {3}
+apps/erpnext/erpnext/selling/doctype/customer/customer.py,Following fields are mandatory to create address:,ฟิลด์ต่อไปนี้จำเป็นต้องสร้างที่อยู่:
 DocType: Item Alternative,Two-way,สองทาง
 DocType: Item,Manufacturers,ผู้ผลิต
 apps/erpnext/erpnext/accounts/deferred_revenue.py,Error while processing deferred accounting for {0},เกิดข้อผิดพลาดขณะประมวลผลการบัญชีที่ถูกเลื่อนออกไปสำหรับ {0}
@@ -2777,9 +2786,9 @@
 DocType: Employee,HR-EMP-,HR-EMP-
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py,User {0} doesn't have any default POS Profile. Check Default at Row {1} for this User.,ผู้ใช้ {0} ไม่มีโพรไฟล์ POS มาตรฐานใด ๆ ตรวจสอบการตั้งค่าเริ่มต้นที่แถว {1} สำหรับผู้ใช้รายนี้
 DocType: Quality Meeting Minutes,Quality Meeting Minutes,รายงานการประชุมคุณภาพ
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Supplier &gt; Supplier Type,ผู้ผลิต&gt; ประเภทผู้จัดจำหน่าย
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py,Employee Referral,การแนะนำผลิตภัณฑ์ของพนักงาน
 DocType: Student Group,Set 0 for no limit,ตั้ง 0 ไม่มีขีด จำกัด
+DocType: Cost Center,rgt,RGT
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py,The day(s) on which you are applying for leave are holidays. You need not apply for leave.,วันที่ (s) ที่คุณจะใช้สำหรับการลาวันหยุด คุณไม่จำเป็นต้องใช้สำหรับการลา
 DocType: Customer,Primary Address and Contact Detail,ที่อยู่หลักและที่อยู่ติดต่อ
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.js,Resend Payment Email,ส่งอีเมล์การชำระเงิน
@@ -2889,7 +2898,6 @@
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py,Against Supplier Invoice {0} dated {1},กับผู้ผลิตใบแจ้งหนี้ {0} วัน {1}
 DocType: Customer,Default Price List,รายการราคาเริ่มต้น
 apps/erpnext/erpnext/assets/doctype/asset/asset.py,Asset Movement record {0} created,บันทึกการเคลื่อนไหวของสินทรัพย์ {0} สร้าง
-apps/erpnext/erpnext/utilities/page/leaderboard/leaderboard.js,No items found.,ไม่พบรายการ
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py,You cannot delete Fiscal Year {0}. Fiscal Year {0} is set as default in Global Settings,คุณไม่สามารถลบปีงบประมาณ {0} ปีงบประมาณ {0} ตั้งเป็นค่าเริ่มต้นในการตั้งค่าส่วนกลาง
 DocType: Share Transfer,Equity/Liability Account,บัญชีหนี้สิน / หนี้สิน
 apps/erpnext/erpnext/setup/doctype/customer_group/customer_group.py,A customer with the same name already exists,มีลูกค้าที่มีชื่อเดียวกันอยู่แล้ว
@@ -2905,6 +2913,7 @@
 apps/erpnext/erpnext/selling/doctype/customer/customer.py,Credit limit has been crossed for customer {0} ({1}/{2}),วงเงินเครดิตถูกหักสำหรับลูกค้า {0} ({1} / {2}) แล้ว
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py,Customer required for 'Customerwise Discount',ลูกค้า จำเป็นต้องใช้ สำหรับ ' Customerwise ส่วนลด '
 apps/erpnext/erpnext/config/accounting.py,Update bank payment dates with journals.,การชำระเงินของธนาคารปรับปรุงวันที่มีวารสาร
+,Billed Qty,เรียกเก็บเงินจำนวน
 apps/erpnext/erpnext/stock/doctype/item/item_dashboard.py,Pricing,การตั้งราคา
 DocType: Employee,Attendance Device ID (Biometric/RF tag ID),ID อุปกรณ์การเข้าร่วม (ID แท็ก Biometric / RF)
 DocType: Quotation,Term Details,รายละเอียดคำ
@@ -2928,6 +2937,7 @@
 DocType: Share Transfer,Asset Account,บัญชีสินทรัพย์
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js,New release date should be in the future,วันที่วางจำหน่ายใหม่ควรจะเป็นในอนาคต
 DocType: Purchase Invoice,End date of current invoice's period,วันที่สิ้นสุดของรอบระยะเวลาใบแจ้งหนี้ปัจจุบัน
+apps/erpnext/erpnext/hr/doctype/employee/employee.py,Please setup Employee Naming System in Human Resource &gt; HR Settings,โปรดตั้งค่าระบบการตั้งชื่อพนักงานในทรัพยากรมนุษย์&gt; การตั้งค่าทรัพยากรบุคคล
 DocType: Lab Test,Technician Name,ชื่อช่างเทคนิค
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py,"Cannot ensure delivery by Serial No as \
 					Item {0} is added with and without Ensure Delivery by \
@@ -2935,6 +2945,7 @@
 DocType: Accounts Settings,Unlink Payment on Cancellation of Invoice,ยกเลิกการเชื่อมโยงการชำระเงินในการยกเลิกใบแจ้งหนี้
 DocType: Bank Reconciliation,From Date,จากวันที่
 apps/erpnext/erpnext/hr/doctype/vehicle_log/vehicle_log.py,Current Odometer reading entered should be greater than initial Vehicle Odometer {0},อ่านวัดระยะทางที่ปัจจุบันเข้ามาควรจะมากกว่าครั้งแรกยานพาหนะ Odometer {0}
+,Purchase Order Items To Be Received or Billed,สั่งซื้อรายการที่จะได้รับหรือเรียกเก็บเงิน
 DocType: Restaurant Reservation,No Show,ไม่แสดง
 apps/erpnext/erpnext/regional/india/utils.py,You must be a registered supplier to generate e-Way Bill,คุณต้องเป็นซัพพลายเออร์ที่ลงทะเบียนเพื่อสร้าง e-Way Bill
 DocType: Shipping Rule Country,Shipping Rule Country,กฎการจัดส่งสินค้าประเทศ
@@ -2977,6 +2988,7 @@
 apps/erpnext/erpnext/templates/generators/item/item_add_to_cart.html,View in Cart,ดูในรถเข็น
 DocType: Employee Checkin,Shift Actual Start,Shift เริ่มจริง
 DocType: Tally Migration,Is Day Book Data Imported,นำเข้าข้อมูลหนังสือรายวันแล้ว
+,Purchase Order Items To Be Received or Billed1,ซื้อรายการสั่งซื้อที่จะได้รับหรือเรียกเก็บเงิน 1
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py,Marketing Expenses,ค่าใช้จ่ายใน การตลาด
 apps/erpnext/erpnext/stock/doctype/pick_list/pick_list.py,{0} units of {1} is not available.,{0} หน่วยของ {1} ไม่พร้อมใช้งาน
 ,Item Shortage Report,รายงานสินค้าไม่เพียงพอ
@@ -3205,7 +3217,6 @@
 apps/erpnext/erpnext/public/js/call_popup/call_popup.js,View all issues from {0},ดูปัญหาทั้งหมดจาก {0}
 DocType: Quality Inspection,MAT-QA-.YYYY.-,MAT-QA-.YYYY.-
 DocType: Quality Meeting Table,Quality Meeting Table,โต๊ะประชุมคุณภาพ
-apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,โปรดตั้ง Naming Series สำหรับ {0} ผ่านการตั้งค่า&gt; การตั้งค่า&gt; Naming Series
 apps/erpnext/erpnext/templates/pages/help.html,Visit the forums,ไปที่ฟอรัม
 DocType: Student,Student Mobile Number,หมายเลขโทรศัพท์มือถือของนักเรียน
 DocType: Item,Has Variants,มีหลากหลายรูปแบบ
@@ -3350,6 +3361,7 @@
 ,Campaign Efficiency,ประสิทธิภาพแคมเปญ
 ,Campaign Efficiency,ประสิทธิภาพแคมเปญ
 DocType: Discussion,Discussion,การสนทนา
+apps/erpnext/erpnext/setup/default_energy_point_rules.py,On Sales Order Submission,ในการส่งคำสั่งขาย
 DocType: Bank Transaction,Transaction ID,รหัสธุรกรรม
 DocType: Payroll Entry,Deduct Tax For Unsubmitted Tax Exemption Proof,หักภาษีสำหรับหลักฐานการยกเว้นภาษีที่ยังไม่ได้ส่ง
 DocType: Volunteer,Anytime,ทุกที่ทุกเวลา
@@ -3357,7 +3369,6 @@
 DocType: Employee Tax Exemption Proof Submission,Employee Tax Exemption Proof Submission,การส่งหลักฐานการได้รับการยกเว้นภาษีพนักงาน
 DocType: Patient,Surgical History,ประวัติการผ่าตัด
 DocType: Bank Statement Settings Item,Mapped Header,หัวกระดาษที่แมป
-apps/erpnext/erpnext/hr/doctype/employee/employee.py,Please setup Employee Naming System in Human Resource &gt; HR Settings,โปรดตั้งค่าระบบการตั้งชื่อพนักงานในทรัพยากรมนุษย์&gt; การตั้งค่าทรัพยากรบุคคล
 DocType: Employee,Resignation Letter Date,วันที่ใบลาออก
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Pricing Rules are further filtered based on quantity.,กฎการกำหนดราคาจะถูกกรองต่อไปขึ้นอยู่กับปริมาณ
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py,Please set the Date Of Joining for employee {0},โปรดกำหนดวันที่เข้าร่วมสำหรับพนักงาน {0}
@@ -3372,6 +3383,7 @@
 DocType: Bank Statement Settings,Mapped Items,รายการที่แมป
 DocType: Amazon MWS Settings,IT,มัน
 DocType: Chapter,Chapter,บท
+,Fixed Asset Register,ทะเบียนสินทรัพย์ถาวร
 apps/erpnext/erpnext/utilities/user_progress.py,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,Select BOM and Qty for Production,เลือก BOM และจำนวนการผลิต
@@ -3507,7 +3519,6 @@
 apps/erpnext/erpnext/templates/emails/reorder_item.html,Following Material Requests have been raised automatically based on Item's re-order level,ต่อไปนี้ขอวัสดุได้รับการยกโดยอัตโนมัติตามระดับสั่งซื้อใหม่ของรายการ
 apps/erpnext/erpnext/controllers/accounts_controller.py,Account {0} is invalid. Account Currency must be {1},บัญชี {0} ไม่ถูกต้อง สกุลเงินในบัญชีจะต้องเป็น {1}
 apps/erpnext/erpnext/hr/doctype/salary_structure_assignment/salary_structure_assignment.py,From Date {0} cannot be after employee's relieving Date {1},จากวันที่ {0} ไม่สามารถเป็นได้หลังจากที่พนักงานลบวันที่ {1}
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py,Debit Note {0} has been created automatically,เดบิต Note {0} ถูกสร้างขึ้นโดยอัตโนมัติ
 apps/erpnext/erpnext/accounts/doctype/payment_order/payment_order.js,Create Payment Entries,สร้างรายการชำระเงิน
 DocType: Supplier,Is Internal Supplier,เป็นผู้จัดหาภายใน
 DocType: Employee,Create User Permission,สร้างการอนุญาตผู้ใช้
@@ -4071,7 +4082,6 @@
 DocType: Project User,Project Status,สถานะโครงการ
 DocType: UOM,Check this to disallow fractions. (for Nos),ตรวจสอบนี้จะไม่อนุญาตให้เศษส่วน (สำหรับ Nos)
 DocType: Student Admission Program,Naming Series (for Student Applicant),การตั้งชื่อชุด (สำหรับนักศึกษาสมัคร)
-apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.py,UOM Conversion factor ({0} -&gt; {1}) not found for item: {2},ไม่พบปัจจัยการแปลง UOM ({0} -&gt; {1}) สำหรับรายการ: {2}
 apps/erpnext/erpnext/hr/doctype/retention_bonus/retention_bonus.py,Bonus Payment Date cannot be a past date,วันที่ชำระเงินโบนัสไม่สามารถเป็นวันที่ผ่านมาได้
 DocType: Travel Request,Copy of Invitation/Announcement,สำเนาหนังสือเชิญ / ประกาศ
 DocType: Practitioner Service Unit Schedule,Practitioner Service Unit Schedule,ตารางหน่วยบริการของผู้ประกอบวิชาชีพ
@@ -4240,6 +4250,7 @@
 apps/erpnext/erpnext/utilities/user_progress.py,Setup Company,ตั้ง บริษัท
 ,Lab Test Report,รายงานการทดสอบห้องปฏิบัติการ
 DocType: Employee Benefit Application,Employee Benefit Application,ใบสมัครผลประโยชน์ของพนักงาน
+apps/erpnext/erpnext/accounts/doctype/invoice_discounting/invoice_discounting.py,Row({0}): {1} is already discounted in {2},แถว ({0}): {1} ถูกลดราคาใน {2} แล้ว
 apps/erpnext/erpnext/hr/doctype/additional_salary/additional_salary.py,Additional Salary Component Exists.,องค์ประกอบเงินเดือนเพิ่มเติมมีอยู่
 DocType: Purchase Invoice,Unregistered,เชลยศักดิ์
 DocType: Student Applicant,Application Date,วันรับสมัคร
@@ -4319,7 +4330,6 @@
 DocType: Journal Entry,Accounting Entries,บัญชีรายการ
 DocType: Job Card Time Log,Job Card Time Log,บันทึกเวลาของการ์ดงาน
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,"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;"
-apps/erpnext/erpnext/education/doctype/instructor/instructor.py,Please setup Instructor Naming System in Education &gt; Education Settings,โปรดตั้งค่าระบบการตั้งชื่อผู้สอนในด้านการศึกษา&gt; การตั้งค่าการศึกษา
 DocType: Journal Entry,Paid Loan,เงินกู้ที่ชำระแล้ว
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py,Duplicate Entry. Please check Authorization Rule {0},รายการ ที่ซ้ำกัน กรุณาตรวจสอบ การอนุมัติ กฎ {0}
 DocType: Journal Entry Account,Reference Due Date,วันที่ครบกำหนดอ้างอิง
@@ -4336,7 +4346,6 @@
 apps/erpnext/erpnext/templates/pages/projects.html,No time sheets,ไม่มีแผ่นเวลา
 DocType: GoCardless Mandate,GoCardless Customer,ลูกค้า GoCardless
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py,Leave Type {0} cannot be carry-forwarded,ฝากประเภท {0} ไม่สามารถดำเนินการส่งต่อ-
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Item Code &gt; Item Group &gt; Brand,รหัสรายการ&gt; กลุ่มรายการ&gt; แบรนด์
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py,Maintenance Schedule is not generated for all the items. Please click on 'Generate Schedule',ตาราง การบำรุงรักษา ที่ไม่ได้ สร้างขึ้นสำหรับ รายการทั้งหมด กรุณา คลิกที่ 'สร้าง ตาราง '
 ,To Produce,ในการ ผลิต
 DocType: Leave Encashment,Payroll,บัญชีเงินเดือน
@@ -4452,7 +4461,6 @@
 DocType: Stock Ledger Entry,Actual Qty After Transaction,จำนวนที่เกิดขึ้นจริงหลังทำรายการ
 ,Pending SO Items For Purchase Request,รายการที่รอดำเนินการเพื่อให้ใบขอซื้อ
 apps/erpnext/erpnext/education/doctype/student_admission/student_admission.py,Student Admissions,การรับสมัครนักศึกษา
-apps/erpnext/erpnext/accounts/party.py,{0} {1} is disabled,{0} {1} ถูกปิดใช้งาน
 DocType: Supplier,Billing Currency,สกุลเงินการเรียกเก็บเงิน
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py,Extra Large,ขนาดใหญ่พิเศษ
 DocType: Loan,Loan Application,การขอสินเชื่อ
@@ -4529,7 +4537,6 @@
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py,Only Leave Applications with status 'Approved' and 'Rejected' can be submitted,ทิ้งไว้เพียงการประยุกต์ใช้งานที่มีสถานะ &#39;อนุมัติ&#39; และ &#39;ปฏิเสธ&#39; สามารถส่ง
 apps/erpnext/erpnext/accounts/doctype/accounting_dimension/accounting_dimension.py,Creating Dimensions...,กำลังสร้างมิติ ...
 apps/erpnext/erpnext/education/doctype/student_group_creation_tool/student_group_creation_tool.py,Student Group Name is mandatory in row {0},นักศึกษาชื่อกลุ่มมีผลบังคับใช้ในแถว {0}
-DocType: Customer Credit Limit,Bypass credit limit_check,บายพาสเครดิต limit_check
 DocType: Homepage,Products to be shown on website homepage,ผลิตภัณฑ์ที่จะแสดงบนหน้าแรกของเว็บไซต์
 DocType: HR Settings,Password Policy,นโยบายรหัสผ่าน
 apps/erpnext/erpnext/setup/doctype/customer_group/customer_group.js,This is a root customer group and cannot be edited.,นี่คือกลุ่ม ลูกค้าราก และ ไม่สามารถแก้ไขได้
@@ -4835,6 +4842,7 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py,Row {0}: Advance against Customer must be credit,แถว {0}: ล่วงหน้ากับลูกค้าจะต้องมีเครดิต
 DocType: Quality Meeting,Quality Meeting,การประชุมคุณภาพ
 apps/erpnext/erpnext/accounts/doctype/account/account.js,Non-Group to Group,ที่ไม่ใช่กลุ่มกลุ่ม
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,โปรดตั้ง Naming Series สำหรับ {0} ผ่านการตั้งค่า&gt; การตั้งค่า&gt; Naming Series
 DocType: Employee,ERPNext User,ผู้ใช้ ERPNext
 apps/erpnext/erpnext/education/doctype/student_group_creation_tool/student_group_creation_tool.py,Batch is mandatory in row {0},แบทช์มีผลบังคับในแถว {0}
 apps/erpnext/erpnext/education/doctype/student_group_creation_tool/student_group_creation_tool.py,Batch is mandatory in row {0},แบทช์มีผลบังคับในแถว {0}
@@ -5134,6 +5142,7 @@
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py,No {0} found for Inter Company Transactions.,ไม่พบ {0} รายการระหว่าง บริษัท
 DocType: Travel Itinerary,Rented Car,เช่ารถ
 apps/erpnext/erpnext/public/js/hub/components/profile_dialog.js,About your Company,เกี่ยวกับ บริษัท ของคุณ
+apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.js,Show Stock Ageing Data,แสดงข้อมูลอายุของสต็อค
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py,Credit To account must be a Balance Sheet account,เครดิตไปยังบัญชีจะต้องเป็นบัญชีงบดุล
 DocType: Donor,Donor,ผู้บริจาค
 DocType: Global Defaults,Disable In Words,ปิดการใช้งานในคำพูด
@@ -5148,8 +5157,10 @@
 DocType: Practitioner Schedule,Schedule Name,ชื่อกำหนดการ
 apps/erpnext/erpnext/regional/doctype/gstr_3b_report/gstr_3b_report.py,Please enter GSTIN and state for the Company Address {0},โปรดป้อน GSTIN และสถานะสำหรับที่อยู่ บริษัท {0}
 DocType: Currency Exchange,For Buying,สำหรับการซื้อ
+apps/erpnext/erpnext/setup/default_energy_point_rules.py,On Purchase Order Submission,ในการส่งคำสั่งซื้อ
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js,Add All Suppliers,เพิ่มซัพพลายเออร์ทั้งหมด
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py,Row #{0}: Allocated Amount cannot be greater than outstanding amount.,แถว # {0}: จำนวนที่จัดสรรไว้ต้องไม่เกินยอดค้างชำระ
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Customer &gt; Customer Group &gt; Territory,ลูกค้า&gt; กลุ่มลูกค้า&gt; อาณาเขต
 DocType: Tally Migration,Parties,คู่กรณี
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js,Browse BOM,ดู BOM
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py,Secured Loans,เงินให้กู้ยืม ที่มีหลักประกัน
@@ -5181,6 +5192,7 @@
 apps/erpnext/erpnext/stock/doctype/item_alternative/item_alternative.py,Not allow to set alternative item for the item {0},ไม่อนุญาตให้ตั้งค่ารายการอื่นสำหรับรายการ {0}
 apps/erpnext/erpnext/hr/doctype/leave_block_list/leave_block_list.py,Date is repeated,วันที่ซ้ำแล้วซ้ำอีก
 apps/erpnext/erpnext/accounts/print_format/payment_receipt_voucher/payment_receipt_voucher.html,Authorized Signatory,ผู้มีอำนาจลงนาม
+apps/erpnext/erpnext/education/doctype/instructor/instructor.py,Please setup Instructor Naming System in Education &gt; Education Settings,โปรดตั้งค่าระบบการตั้งชื่อผู้สอนในด้านการศึกษา&gt; การตั้งค่าการศึกษา
 apps/erpnext/erpnext/regional/doctype/gstr_3b_report/gstr_3b_report.html,Net ITC Available(A) - (B),Net ITC Available (A) - (B)
 apps/erpnext/erpnext/education/doctype/fee_schedule/fee_schedule.js,Create Fees,สร้างค่าธรรมเนียม
 DocType: Project,Total Purchase Cost (via Purchase Invoice),ค่าใช้จ่ายในการจัดซื้อรวม (ผ่านการซื้อใบแจ้งหนี้)
@@ -5201,6 +5213,7 @@
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.js,Message Sent,ข้อความส่งแล้ว
 apps/erpnext/erpnext/accounts/doctype/account/account.py,Account with child nodes cannot be set as ledger,บัญชีที่มีโหนดลูกไม่สามารถกำหนดให้เป็นบัญชีแยกประเภท
 DocType: C-Form,II,ครั้งที่สอง
+apps/erpnext/erpnext/assets/report/fixed_asset_register/fixed_asset_register.py,Vendor Name,ชื่อผู้ขาย
 DocType: Quiz Result,Wrong,ไม่ถูกต้อง
 DocType: Sales Invoice,Rate at which Price list currency is converted to customer's base currency,อัตราที่สกุลเงินรายการราคาจะถูกแปลงเป็นสกุลเงินหลักของลูกค้า
 DocType: Purchase Invoice Item,Net Amount (Company Currency),ปริมาณสุทธิ (บริษัท สกุลเงิน)
@@ -5446,6 +5459,7 @@
 DocType: Stock Settings,Auto Material Request,ขอวัสดุอัตโนมัติ
 DocType: Woocommerce Settings,API consumer secret,ความลับของผู้ใช้ API
 DocType: Delivery Note Item,Available Batch Qty at From Warehouse,จำนวนรุ่นที่มีจำหน่ายที่จากคลังสินค้า
+,Received Qty Amount,ได้รับจำนวนเงิน
 DocType: Salary Slip,Gross Pay - Total Deduction - Loan Repayment,จ่ายขั้นต้น - ลดรวม - การชำระคืนเงินกู้
 DocType: Bank Account,Last Integration Date,วันที่รวมล่าสุด
 DocType: Expense Claim,Expense Taxes and Charges,ภาษีและค่าใช้จ่ายที่ต้องเสียไป
@@ -5909,6 +5923,8 @@
 DocType: Drug Prescription,Hour,ชั่วโมง
 DocType: Restaurant Order Entry,Last Sales Invoice,ใบเสนอราคาการขายครั้งล่าสุด
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py,Please select Qty against item {0},โปรดเลือกจำนวนเทียบกับรายการ {0}
+apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py,Latest Age,อายุล่าสุด
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js,Transfer Material to Supplier,โอนวัสดุที่จะผลิต
 apps/erpnext/erpnext/hr/report/loan_repayment/loan_repayment.py,EMI,อีเอ็มไอ
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py,New Serial No cannot have Warehouse. Warehouse must be set by Stock Entry or Purchase Receipt,ใหม่ หมายเลขเครื่อง ไม่สามารถมี คลังสินค้า คลังสินค้า จะต้องตั้งค่า โดย สต็อก รายการ หรือ รับซื้อ
 DocType: Lead,Lead Type,ชนิดช่องทาง
@@ -5932,7 +5948,6 @@
 apps/erpnext/erpnext/hr/doctype/employee_benefit_application/employee_benefit_application.py,"An amount of {0} already claimed for the component {1},\
 						 set the amount equal or greater than {2}","จำนวน {0} อ้างสิทธิ์แล้วสำหรับคอมโพเนนต์ {1}, \ กำหนดจำนวนเงินที่เท่ากันหรือมากกว่า {2}"
 DocType: Shipping Rule,Shipping Rule Conditions,เงื่อนไขกฎการจัดส่งสินค้า
-DocType: Purchase Invoice,Export Type,ประเภทการส่งออก
 DocType: Salary Slip Loan,Salary Slip Loan,สินเชื่อลื่น
 DocType: BOM Update Tool,The new BOM after replacement,BOM ใหม่หลังจากเปลี่ยน
 ,Point of Sale,จุดขาย
@@ -6054,7 +6069,6 @@
 DocType: Purchase Order Item,Blanket Order Rate,อัตราการสั่งซื้อผ้าห่ม
 ,Customer Ledger Summary,สรุปบัญชีแยกประเภทลูกค้า
 apps/erpnext/erpnext/hooks.py,Certification,การรับรอง
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js,Are you sure you want to make debit note?,คุณแน่ใจหรือไม่ว่าต้องการบันทึกเดบิต
 DocType: Bank Guarantee,Clauses and Conditions,ข้อและเงื่อนไข
 DocType: Serial No,Creation Document Type,ประเภท การสร้าง เอกสาร
 DocType: Amazon MWS Settings,ES,ES
@@ -6092,8 +6106,6 @@
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py,Financial Services,บริการทางการเงิน
 DocType: Student Sibling,Student ID,รหัสนักศึกษา
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.js,For Quantity must be greater than zero,สำหรับจำนวนต้องมากกว่าศูนย์
-apps/erpnext/erpnext/hr/doctype/employee_transfer/employee_transfer.py,"Please delete the Employee <a href=""#Form/Employee/{0}"">{0}</a>\
-					to cancel this document","โปรดลบพนักงาน <a href=""#Form/Employee/{0}"">{0}</a> \ เพื่อยกเลิกเอกสารนี้"
 apps/erpnext/erpnext/config/projects.py,Types of activities for Time Logs,ประเภทของกิจกรรมสำหรับบันทึกเวลา
 DocType: Opening Invoice Creation Tool,Sales,ขาย
 DocType: Stock Entry Detail,Basic Amount,จํานวนเงินขั้นพื้นฐาน
@@ -6172,6 +6184,7 @@
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py,Print and Stationery,พิมพ์และเครื่องเขียน
 DocType: Stock Settings,Show Barcode Field,แสดงฟิลด์บาร์โค้ด
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js,Send Supplier Emails,ส่งอีเมลผู้ผลิต
+DocType: Asset Movement,ACC-ASM-.YYYY.-,ACC-ASM-.YYYY.-
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py,"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,สร้างอัตโนมัติแล้ว
 apps/erpnext/erpnext/hr/doctype/employee_onboarding/employee_onboarding.py,Submit this to create the Employee record,ส่งสิ่งนี้เพื่อสร้างเรคคอร์ด Employee
@@ -6252,7 +6265,6 @@
 DocType: Sales Team,Contact No.,ติดต่อหมายเลข
 apps/erpnext/erpnext/templates/includes/cart/cart_address.html,Billing Address is same as Shipping Address,ที่อยู่สำหรับเรียกเก็บเงินนั้นเหมือนกับที่อยู่สำหรับจัดส่ง
 DocType: Bank Reconciliation,Payment Entries,รายการชำระเงิน
-apps/erpnext/erpnext/erpnext_integrations/doctype/shopify_settings/shopify_settings.py,Access token or Shopify URL missing,ไม่สามารถเข้าถึงโทเค็นหรือ Shopify URL
 DocType: Location,Latitude,ละติจูด
 DocType: Work Order,Scrap Warehouse,เศษคลังสินค้า
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py,"Warehouse required at Row No {0}, please set default warehouse for the item {1} for the company {2}",ต้องการคลังสินค้าที่แถวไม่ใช่ {0} โปรดตั้งค่าคลังสินค้าเริ่มต้นสำหรับรายการ {1} สำหรับ บริษัท {2}
@@ -6297,7 +6309,6 @@
 DocType: Job Offer Term,Value / Description,ค่า / รายละเอียด
 apps/erpnext/erpnext/controllers/accounts_controller.py,"Row #{0}: Asset {1} cannot be submitted, it is already {2}",แถว # {0}: สินทรัพย์ {1} ไม่สามารถส่งมันมีอยู่แล้ว {2}
 DocType: Tax Rule,Billing Country,ประเทศการเรียกเก็บเงิน
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js,Are you sure you want to make credit note?,คุณแน่ใจหรือว่าต้องการบันทึกเครดิต
 DocType: Purchase Order Item,Expected Delivery Date,คาดว่าวันที่ส่ง
 DocType: Restaurant Order Entry,Restaurant Order Entry,รายการสั่งซื้อร้านอาหาร
 apps/erpnext/erpnext/accounts/general_ledger.py,Debit and Credit not equal for {0} #{1}. Difference is {2}.,เดบิตและเครดิตไม่เท่ากันสำหรับ {0} # {1} ความแตกต่างคือ {2}
@@ -6422,6 +6433,7 @@
 DocType: Purchase Invoice,Taxes and Charges Added,ภาษีและค่าบริการเพิ่ม
 apps/erpnext/erpnext/assets/doctype/asset/asset.py,Depreciation Row {0}: Next Depreciation Date cannot be before Available-for-use Date,แถวค่าเสื่อมราคา {0}: วันที่คิดค่าเสื่อมราคาต่อไปไม่ได้ก่อนวันที่ที่พร้อมใช้งาน
 ,Sales Funnel,ช่องทาง ขาย
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Item Code &gt; Item Group &gt; Brand,รหัสรายการ&gt; กลุ่มรายการ&gt; แบรนด์
 apps/erpnext/erpnext/setup/doctype/company/company.py,Abbreviation is mandatory,ชื่อย่อมีผลบังคับใช้
 DocType: Project,Task Progress,ความคืบหน้าของงาน
 apps/erpnext/erpnext/templates/includes/navbar/navbar_items.html,Cart,เกวียน
@@ -6667,6 +6679,7 @@
 DocType: Employee Grade,Employee Grade,เกรดพนักงาน
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py,Piecework,งานเหมา
 DocType: GSTR 3B Report,June,มิถุนายน
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Supplier &gt; Supplier Type,ผู้ผลิต&gt; ประเภทผู้จัดจำหน่าย
 DocType: Share Balance,From No,จากไม่มี
 DocType: Shift Type,Early Exit Grace Period,ช่วงเวลาผ่อนผันออกก่อนกำหนด
 DocType: Task,Actual Time (in Hours),เวลาที่เกิดขึ้นจริง (ในชั่วโมง)
@@ -6953,6 +6966,7 @@
 DocType: Warehouse,Warehouse Name,ชื่อคลังสินค้า
 DocType: Naming Series,Select Transaction,เลือกรายการ
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py,Please enter Approving Role or Approving User,กรุณากรอก บทบาท การอนุมัติ หรือ ให้ความเห็นชอบ ผู้ใช้
+apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.py,UOM Conversion factor ({0} -&gt; {1}) not found for item: {2},ไม่พบปัจจัยการแปลง UOM ({0} -&gt; {1}) สำหรับรายการ: {2}
 apps/erpnext/erpnext/support/doctype/service_level_agreement/service_level_agreement.py,Service Level Agreement with Entity Type {0} and Entity {1} already exists.,ข้อตกลงระดับการให้บริการที่มีประเภทเอนทิตี {0} และเอนทิตี {1} มีอยู่แล้ว
 DocType: Journal Entry,Write Off Entry,เขียนปิดเข้า
 DocType: BOM,Rate Of Materials Based On,อัตราวัสดุตาม
@@ -7144,6 +7158,7 @@
 DocType: Quality Inspection Reading,Quality Inspection Reading,การตรวจสอบคุณภาพการอ่าน
 apps/erpnext/erpnext/stock/doctype/stock_settings/stock_settings.py,`Freeze Stocks Older Than` should be smaller than %d days.,ค่าของ `อายัด (freeze) Stock ที่เก่ากว่า ` ควรจะ มีขนาดเล็กกว่า % d วัน
 DocType: Tax Rule,Purchase Tax Template,ซื้อแม่แบบภาษี
+apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py,Earliest Age,อายุแรกสุด
 apps/erpnext/erpnext/utilities/user_progress.py,Set a sales goal you'd like to achieve for your company.,ตั้งเป้าหมายการขายที่คุณต้องการเพื่อให้ได้สำหรับ บริษัท ของคุณ
 DocType: Quality Goal,Revision,การทบทวน
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js,Healthcare Services,บริการสุขภาพ
@@ -7187,6 +7202,7 @@
 apps/erpnext/erpnext/healthcare/doctype/patient_encounter/patient_encounter.js,Schedule Discharge,ยกเลิกการจัดตารางเวลา
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py,Cheques and Deposits incorrectly cleared,เช็คและเงินฝากล้างไม่ถูกต้อง
 DocType: Homepage Section Card,Homepage Section Card,การ์ดส่วนของหน้าแรก
+,Amount To Be Billed,จำนวนเงินที่จะเรียกเก็บเงิน
 apps/erpnext/erpnext/accounts/doctype/account/account.py,Account {0}: You can not assign itself as parent account,บัญชี {0}: คุณไม่สามารถกำหนดตัวเองเป็นบัญชีผู้ปกครอง
 DocType: Purchase Invoice Item,Price List Rate,อัตราราคาตามรายการ
 apps/erpnext/erpnext/utilities/activation.py,Create customer quotes,สร้างคำพูดของลูกค้า
@@ -7239,6 +7255,7 @@
 DocType: Supplier Scorecard Criteria,Supplier Scorecard Criteria,เกณฑ์ชี้วัดของผู้จัดหาผลิตภัณฑ์
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py,Please select Start Date and End Date for Item {0},กรุณาเลือก วันเริ่มต้น และ วันที่สิ้นสุด สำหรับรายการที่ {0}
 DocType: Maintenance Schedule,MAT-MSH-.YYYY.-,MAT-MSH-.YYYY.-
+,Amount to Receive,จำนวนเงินที่จะได้รับ
 apps/erpnext/erpnext/education/doctype/student_group_creation_tool/student_group_creation_tool.py,Course is mandatory in row {0},แน่นอนมีผลบังคับใช้ในแถว {0}
 apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py,From date can not be greater than than To date,วันที่ต้องไม่มากกว่าวันที่
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py,To date cannot be before from date,วันที่ ไม่สามารถ ก่อนที่จะ นับจากวันที่
@@ -7490,7 +7507,6 @@
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js,BOM and Manufacturing Quantity are required,รายการวัสดุและปริมาณการผลิตจะต้อง
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js,Ageing Range 2,ช่วงสูงอายุ 2
 DocType: SG Creation Tool Course,Max Strength,ความแรงของแม็กซ์
-apps/erpnext/erpnext/accounts/doctype/account/account.py,"Account {0} already exists in child company {1}. The following fields have different values, they should be same:<ul><li>{2}</li></ul>",บัญชี {0} มีอยู่แล้วใน บริษัท ย่อย {1} ฟิลด์ต่อไปนี้มีค่าต่างกันควรจะเหมือนกัน: <ul><li> {2} </li></ul>
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py,Installing presets,การติดตั้งค่าที่ตั้งล่วงหน้า
 DocType: Fee Schedule,EDU-FSH-.YYYY.-,EDU ที่ FSH-.YYYY.-
 apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js,No Delivery Note selected for Customer {},ไม่ได้เลือกหมายเหตุการจัดส่งสำหรับลูกค้า {}
@@ -7702,6 +7718,7 @@
 DocType: Delivery Note,Print Without Amount,พิมพ์ที่ไม่มีจำนวน
 apps/erpnext/erpnext/accounts/report/asset_depreciation_ledger/asset_depreciation_ledger.py,Depreciation Date,วันค่าเสื่อมราคา
 ,Work Orders in Progress,กำลังดำเนินการใบสั่งงาน
+DocType: Customer Credit Limit,Bypass Credit Limit Check,บายพาสการตรวจสอบวงเงินสินเชื่อ
 DocType: Issue,Support Team,ทีมสนับสนุน
 apps/erpnext/erpnext/stock/report/batch_item_expiry_status/batch_item_expiry_status.py,Expiry (In Days),หมดอายุ (ในวัน)
 DocType: Appraisal,Total Score (Out of 5),คะแนนรวม (out of 5)
@@ -7888,6 +7905,7 @@
 DocType: Sales Invoice,Customer GSTIN,ลูกค้า GSTIN
 DocType: Crop Cycle,List of diseases detected on the field. When selected it'll automatically add a list of tasks to deal with the disease ,รายชื่อโรคที่ตรวจพบบนสนาม เมื่อเลือกมันจะเพิ่มรายการของงานเพื่อจัดการกับโรค
 apps/erpnext/erpnext/manufacturing/page/bom_comparison_tool/bom_comparison_tool.js,BOM 1,BOM 1
+apps/erpnext/erpnext/assets/report/fixed_asset_register/fixed_asset_register.py,Asset Id,รหัสเนื้อหา
 apps/erpnext/erpnext/healthcare/doctype/healthcare_service_unit/healthcare_service_unit.js,This is a root healthcare service unit and cannot be edited.,นี่คือหน่วยบริการด้านการดูแลสุขภาพรากและไม่สามารถแก้ไขได้
 DocType: Asset Repair,Repair Status,สถานะการซ่อมแซม
 apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.js,"Requested Qty: Quantity requested for purchase, but not ordered.",ขอ จำนวน: จำนวน การร้องขอ สำหรับการซื้อ แต่ไม่ ได้รับคำสั่ง
diff --git a/erpnext/translations/tr.csv b/erpnext/translations/tr.csv
index e4b50c7..3b0d6e6 100644
--- a/erpnext/translations/tr.csv
+++ b/erpnext/translations/tr.csv
@@ -313,7 +313,6 @@
 DocType: Loan,Repay Over Number of Periods,Sürelerinin Üzeri sayısı Repay
 apps/erpnext/erpnext/manufacturing/report/bom_stock_report/bom_stock_report.py,Quantity to Produce can not be less than Zero,Üretilecek Miktar Sıfırdan Az olamaz
 DocType: Stock Entry,Additional Costs,Ek maliyetler
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Customer &gt; Customer Group &gt; Territory,Müşteri&gt; Müşteri Grubu&gt; Bölge
 apps/erpnext/erpnext/accounts/doctype/account/account.py,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
@@ -635,6 +634,7 @@
 DocType: Healthcare Settings,Create documents for sample collection,Örnek koleksiyon için belgeler oluşturun
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py,Payment against {0} {1} cannot be greater than Outstanding Amount {2},Karşı Ödeme {0} {1} Üstün Tutar daha büyük olamaz {2}
 apps/erpnext/erpnext/patches/v11_0/add_healthcare_service_unit_tree_root.py,All Healthcare Service Units,Tüm Sağlık Hizmeti Birimleri
+apps/erpnext/erpnext/setup/default_energy_point_rules.py,On Converting Opportunity,Fırsat Dönüştürme Üzerine
 DocType: Bank Account,Address HTML,Adres HTML
 DocType: Lead,Mobile No.,Cep No
 DocType: Lead,Mobile No.,Cep No
@@ -701,7 +701,6 @@
 DocType: Accounting Dimension,Dimension Name,Boyut adı
 apps/erpnext/erpnext/healthcare/setup.py,Resistant,dayanıklı
 apps/erpnext/erpnext/hotels/doctype/hotel_room_reservation/hotel_room_reservation.py,Please set Hotel Room Rate on {},Otel Oda Fiyatı&#39;nı {} olarak ayarlayın.
-apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py,Please setup numbering series for Attendance via Setup &gt; Numbering Series,Lütfen Kurulum&gt; Numaralandırma Serisi ile Devam için numaralandırma serilerini ayarlayın
 DocType: Journal Entry,Multi Currency,Çoklu Para Birimi
 DocType: Bank Statement Transaction Invoice Item,Invoice Type,Fatura Türü
 DocType: Bank Statement Transaction Invoice Item,Invoice Type,Fatura Türü
@@ -829,6 +828,7 @@
 apps/erpnext/erpnext/accounts/page/pos/pos.js,Create a new Customer,Yeni müşteri oluştur
 apps/erpnext/erpnext/non_profit/report/expiring_memberships/expiring_memberships.py,Expiring On,Süresi doldu
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,"If multiple Pricing Rules continue to prevail, users are asked to set Priority manually to resolve conflict.","Birden fazla fiyatlandırma Kuralo hakimse, kullanıcılardan zorunu çözmek için Önceliği elle ayarlamaları istenir"
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js,Purchase Return,Satın alma iadesi
 apps/erpnext/erpnext/utilities/activation.py,Create Purchase Orders,Satınalma Siparişleri oluşturun
 ,Purchase Register,Satın alma kaydı
 apps/erpnext/erpnext/healthcare/doctype/patient/patient.py,Patient not found,Hasta bulunamadı
@@ -846,7 +846,6 @@
 DocType: Location,Area UOM,Alan UOM
 apps/erpnext/erpnext/manufacturing/doctype/workstation/workstation.py,Workstation is closed on the following dates as per Holiday List: {0},İş İstasyonu Tatil List göre aşağıdaki tarihlerde kapalı: {0}
 apps/erpnext/erpnext/selling/page/sales_funnel/sales_funnel.py,Opportunities,Fırsatlar
-apps/erpnext/erpnext/www/all-products/index.html,Clear filters,Filtreleri temizle
 DocType: Lab Test Template,Single,Tek
 DocType: Lab Test Template,Single,Bireysel
 DocType: Compensatory Leave Request,Work From Date,Tarihten Çalışma
@@ -895,6 +894,7 @@
 apps/erpnext/erpnext/education/doctype/program_enrollment_tool/program_enrollment_tool.py,Mandatory field - Academic Year,Zorunlu alan - Akademik Yıl
 apps/erpnext/erpnext/education/doctype/program_enrollment_tool/program_enrollment_tool.py,Mandatory field - Academic Year,Zorunlu alan - Akademik Yıl
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py,{0} {1} is not associated with {2} {3},"{0} {1}, {2} {3} ile ilişkili değil"
+DocType: Opportunity,Converted By,Tarafından Dönüştürüldü
 apps/erpnext/erpnext/public/js/hub/components/ReviewArea.vue,You need to login as a Marketplace User before you can add any reviews.,Herhangi bir inceleme ekleyebilmeniz için önce bir Marketplace Kullanıcısı olarak giriş yapmanız gerekir.
 apps/erpnext/erpnext/manufacturing/doctype/job_card/job_card.py,Row {0} : Operation is required against the raw material item {1},{0} Satırı: {1} hammadde öğesine karşı işlem yapılması gerekiyor
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py,Please set default payable account for the company {0},Lütfen {0} şirketi için varsayılan ödenebilir hesabı ayarlayın.
@@ -924,6 +924,8 @@
 DocType: Sales Invoice,Total Qty,Toplam Adet
 apps/erpnext/erpnext/education/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py,Guardian2 Email ID,Guardian2 E-posta Kimliği
 apps/erpnext/erpnext/education/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py,Guardian2 Email ID,Guardian2 E-posta Kimliği
+apps/erpnext/erpnext/hr/doctype/employee_transfer/employee_transfer.py,"Please delete the Employee <a href=""#Form/Employee/{0}"">{0}</a>\
+					to cancel this document","Lütfen bu dokümanı iptal etmek için <a href=""#Form/Employee/{0}"">{0}</a> \ Çalışanını silin."
 DocType: Item,Show in Website (Variant),Web Sitesi göster (Varyant)
 DocType: Employee,Health Concerns,Sağlık Sorunları
 DocType: Payroll Entry,Select Payroll Period,Bordro Dönemi seçin
@@ -988,7 +990,6 @@
 DocType: Codification Table,Codification Table,Codification Table
 DocType: Timesheet Detail,Hrs,saat
 apps/erpnext/erpnext/manufacturing/page/bom_comparison_tool/bom_comparison_tool.js,Changes in {0},{0} &#39;daki değişiklikler
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js,Please select Company,Firma seçiniz
 DocType: Employee Skill,Employee Skill,Çalışan Beceri
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.js,Difference Account,Fark Hesabı
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.js,Difference Account,Fark Hesabı
@@ -1063,6 +1064,7 @@
 DocType: BOM,Operating Cost,İşletme Maliyeti
 DocType: Crop,Produced Items,Üretilen Ürünler
 DocType: Bank Statement Transaction Entry,Match Transaction to Invoices,İşlemlerin Faturalara Eşleştirilmesi
+apps/erpnext/erpnext/erpnext_integrations/exotel_integration.py,Error in Exotel incoming call,Exotel gelen aramada hata
 DocType: Sales Order Item,Gross Profit,Brüt Kar
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js,Unblock Invoice,Faturanın Engellenmesini Kaldır
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py,Increment cannot be 0,Artım 0 olamaz
@@ -1300,6 +1302,7 @@
 DocType: Activity Cost,Activity Type,Faaliyet Türü
 DocType: Request for Quotation,For individual supplier,Bireysel tedarikçi
 DocType: BOM Operation,Base Hour Rate(Company Currency),Baz Saat Hızı (Şirket Para Birimi)
+,Qty To Be Billed,Faturalandırılacak Miktar
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py,Delivered Amount,Teslim Tutar
 apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.js,Reserved Qty for Production: Raw materials quantity to make manufacturing items.,Üretim İçin Ayrılmış Miktar: İmalat kalemlerini yapmak için hammadde miktarı.
 DocType: Loyalty Point Entry Redemption,Redemption Date,Kefalet Tarihi
@@ -1433,7 +1436,7 @@
 DocType: Sales Invoice,Commission Rate (%),Komisyon Oranı (%)
 apps/erpnext/erpnext/education/doctype/student_group/student_group.py,Please select Program,Lütfen Program Seçiniz
 DocType: Project,Estimated Cost,Tahmini maliyeti
-DocType: Request for Quotation,Link to material requests,materyal isteklere Bağlantı
+DocType: Supplier Quotation,Link to material requests,materyal isteklere Bağlantı
 apps/erpnext/erpnext/public/js/hub/pages/Publish.vue,Publish,yayınlamak
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py,Aerospace,Havacılık ve Uzay;
 ,Fichier des Ecritures Comptables [FEC],Fichier des Ecritures Comptables [FEC]
@@ -1447,6 +1450,7 @@
 DocType: Salary Component,Condition and Formula,Durum ve Formül
 DocType: Lead,Campaign Name,Kampanya Adı
 DocType: Lead,Campaign Name,Kampanya Adı
+apps/erpnext/erpnext/setup/default_energy_point_rules.py,On Task Completion,Görev Tamamlandıktan Sonra
 apps/erpnext/erpnext/hr/doctype/compensatory_leave_request/compensatory_leave_request.py,There is no leave period in between {0} and {1},{0} ile {1} tarihleri arasında izin süresi yoktur
 DocType: Fee Validity,Healthcare Practitioner,Sağlık Uygulayıcısı
 DocType: Hotel Room,Capacity,Kapasite
@@ -1833,7 +1837,6 @@
 DocType: Quality Feedback Template,Quality Feedback Template,Kalite Geribildirim Şablonu
 apps/erpnext/erpnext/config/education.py,LMS Activity,LMS Etkinliği
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py,Internet Publishing,İnternet Yayıncılığı
-DocType: Prescription Duration,Number,Numara
 apps/erpnext/erpnext/accounts/doctype/opening_invoice_creation_tool/opening_invoice_creation_tool.js,Creating {0} Invoice,{0} Fatura Oluşturma
 DocType: Medical Code,Medical Code Standard,Tıbbi Kod Standardı
 DocType: Soil Texture,Clay Composition (%),Kil Kompozisyonu (%)
@@ -1912,6 +1915,7 @@
 DocType: Support Settings,Get Started Sections,Başlarken Bölümleri
 DocType: Lead,CRM-LEAD-.YYYY.-,CRM-KURŞUN-.YYYY.-
 DocType: Invoice Discounting,Sanctioned,onaylanmış
+,Base Amount,Baz Miktarı
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.js,Total Contribution Amount: {0},Toplam Katkı Payı: {0}
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py,Row #{0}: Please specify Serial No for Item {1},Satır # {0}: Ürün{1} için seri no belirtiniz
 DocType: Payroll Entry,Salary Slips Submitted,Maaş Fişleri Gönderildi
@@ -2149,6 +2153,7 @@
 DocType: Accounting Dimension,Dimension Defaults,Boyut Varsayılanları
 apps/erpnext/erpnext/crm/report/prospects_engaged_but_not_converted/prospects_engaged_but_not_converted.js,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,Minimum Lead Age (Days),Minimum Müşteri Aday Kaydı Yaşı (Gün)
+apps/erpnext/erpnext/assets/report/fixed_asset_register/fixed_asset_register.py,Available For Use Date,Kullanım Tarihi
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py,All BOMs,Tüm malzeme listeleri
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js,Create Inter Company Journal Entry,Şirketler Arası Dergi Girişi Oluşturma
 DocType: Company,Parent Company,Ana Şirket
@@ -2216,6 +2221,7 @@
 ,IRS 1099,IRS 1099
 DocType: Salary Slip,Leave Without Pay,Ücretsiz İzin
 DocType: Payment Request,Outward,dışa doğru
+apps/erpnext/erpnext/setup/default_energy_point_rules.py,On {0} Creation,{0} Yaratılışında
 apps/erpnext/erpnext/regional/doctype/gstr_3b_report/gstr_3b_report.html,State/UT Tax,Devlet / UT Vergisi
 ,Trial Balance for Party,Parti için Deneme Dengesi
 ,Gross and Net Profit Report,Brüt ve Net Kar Raporu
@@ -2343,6 +2349,7 @@
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js,Make Stock Entry,Stok Girişi Yap
 DocType: Hotel Room Reservation,Hotel Reservation User,Otel Rezervasyonu Kullanıcısı
 apps/erpnext/erpnext/projects/doctype/project/project.js,Set Status,Durumu Ayarla
+apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py,Please setup numbering series for Attendance via Setup &gt; Numbering Series,Lütfen Kurulum&gt; Numaralandırma Serisi ile Devam için numaralandırma serilerini ayarlayın
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py,Please select prefix first,Önce Ön ek seçiniz
 DocType: Contract,Fulfilment Deadline,Son teslim tarihi
 apps/erpnext/erpnext/public/js/hub/pages/Home.vue,Near you,Sana yakın
@@ -2359,6 +2366,8 @@
 DocType: Announcement,All Students,Tüm Öğrenciler
 apps/erpnext/erpnext/assets/doctype/asset/asset.py,Item {0} must be a non-stock item,{0} stok korunmayan ürün olmalıdır
 apps/erpnext/erpnext/stock/doctype/batch/batch.js,View Ledger,Değerlendirme Defteri
+DocType: Cost Center,Lft,lft
+DocType: Cost Center,Lft,Lft
 DocType: Grading Scale,Intervals,Aralıklar
 DocType: Bank Statement Transaction Entry,Reconciled Transactions,Mutabık Kılınan İşlemler
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py,Earliest,En erken
@@ -2483,6 +2492,7 @@
 apps/erpnext/erpnext/hr/doctype/employee_benefit_application/employee_benefit_application.py,As per your assigned Salary Structure you cannot apply for benefits,"Atanan Maaş Yapınıza göre, faydalar için başvuruda bulunamazsınız."
 apps/erpnext/erpnext/stock/doctype/item/item.py,Website Image should be a public file or website URL,Web Sitesi Resim kamu dosya veya web sitesi URL olmalıdır
 DocType: Purchase Invoice Item,BOM,Ürün Ağacı
+apps/erpnext/erpnext/stock/doctype/item/item.py,Duplicate entry in Manufacturers table,Üreticiler tablosuna yinelenen giriş
 apps/erpnext/erpnext/setup/doctype/item_group/item_group.js,This is a root item group and cannot be edited.,Bu bir kök Ürün grubudur ve düzenlenemez.
 apps/erpnext/erpnext/accounts/doctype/account/account.js,Merge,birleşmek
 DocType: Journal Entry Account,Purchase Order,Satın alma emri
@@ -2645,7 +2655,6 @@
 DocType: Asset,Depreciation Schedules,Amortisman Çizelgeleri
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.js,Create Sales Invoice,Satış Faturası Yaratın
 apps/erpnext/erpnext/regional/doctype/gstr_3b_report/gstr_3b_report.html,Ineligible ITC,Uygun olmayan ITC
-apps/erpnext/erpnext/erpnext_integrations/doctype/shopify_settings/shopify_settings.py,"Support for public app is deprecated. Please setup private app, for more details refer user manual","Genel uygulama desteği kullanımdan kaldırılmıştır. Lütfen özel uygulamayı kurun, daha fazla bilgi için kullanım kılavuzuna bakın"
 DocType: Task,Dependent Tasks,Bağımlı Görevler
 apps/erpnext/erpnext/regional/report/gstr_1/gstr_1.py,Following accounts might be selected in GST Settings:,GST Ayarları&#39;nda aşağıdaki hesaplar seçilebilir:
 apps/erpnext/erpnext/manufacturing/report/bom_stock_report/bom_stock_report.js,Quantity to Produce,Üretilecek Miktar
@@ -2923,6 +2932,7 @@
 DocType: Water Analysis,Container,konteyner
 apps/erpnext/erpnext/regional/report/gstr_1/gstr_1.py,Please set valid GSTIN No. in Company Address,Lütfen şirket adresinde geçerli bir GSTIN numarası giriniz.
 apps/erpnext/erpnext/education/utils.py,Student {0} - {1} appears Multiple times in row {2} & {3},Öğrenci {0} - {1} satırda birden çok kez görünür {2} {3}
+apps/erpnext/erpnext/selling/doctype/customer/customer.py,Following fields are mandatory to create address:,Adres oluşturmak için aşağıdaki alanların doldurulması zorunludur:
 DocType: Item Alternative,Two-way,Çift yönlü
 DocType: Item,Manufacturers,Üreticiler
 apps/erpnext/erpnext/accounts/deferred_revenue.py,Error while processing deferred accounting for {0},{0} için ertelenmiş muhasebe işlenirken hata oluştu
@@ -3005,9 +3015,9 @@
 DocType: Employee,HR-EMP-,HR-EMP-
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py,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: Quality Meeting Minutes,Quality Meeting Minutes,Kalite Toplantı Tutanakları
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Supplier &gt; Supplier Type,Tedarikçi&gt; Tedarikçi Tipi
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py,Employee Referral,İşçi başvurusu
 DocType: Student Group,Set 0 for no limit,hiçbir sınırı 0 olarak ayarlayın
+DocType: Cost Center,rgt,rgt
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py,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.
 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,Resend Payment Email,Ödeme E-posta tekrar gönder
@@ -3120,7 +3130,6 @@
 DocType: Customer,Default Price List,Standart Fiyat Listesi
 DocType: Customer,Default Price List,Standart Fiyat Listesi
 apps/erpnext/erpnext/assets/doctype/asset/asset.py,Asset Movement record {0} created,Varlık Hareket kaydı {0} oluşturuldu
-apps/erpnext/erpnext/utilities/page/leaderboard/leaderboard.js,No items found.,Hiç bir öğe bulunamadı.
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py,You cannot delete Fiscal Year {0}. Fiscal Year {0} is set as default in Global Settings,Silemezsiniz Mali Yılı {0}. Mali yıl {0} Genel ayarlar varsayılan olarak ayarlanır
 DocType: Share Transfer,Equity/Liability Account,Özkaynak / Sorumluluk Hesabı
 apps/erpnext/erpnext/setup/doctype/customer_group/customer_group.py,A customer with the same name already exists,Aynı ada sahip bir müşteri zaten var
@@ -3136,6 +3145,7 @@
 apps/erpnext/erpnext/selling/doctype/customer/customer.py,Credit limit has been crossed for customer {0} ({1}/{2}),Müşteri {0} için ({1} / {2}) kredi limiti geçti.
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py,Customer required for 'Customerwise Discount','Müşteri indirimi' için gereken müşteri
 apps/erpnext/erpnext/config/accounting.py,Update bank payment dates with journals.,Günlüklerle ödeme tarihlerini güncelle.
+,Billed Qty,Faturalı Miktar
 apps/erpnext/erpnext/stock/doctype/item/item_dashboard.py,Pricing,Fiyatlandırma
 DocType: Employee,Attendance Device ID (Biometric/RF tag ID),Seyirci Cihaz Kimliği (Biyometrik / RF etiketi numarası)
 DocType: Quotation,Term Details,Dönem Ayrıntıları
@@ -3160,6 +3170,7 @@
 DocType: Share Transfer,Asset Account,Öğe Hesabı
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js,New release date should be in the future,Yeni çıkış tarihi gelecekte olmalı
 DocType: Purchase Invoice,End date of current invoice's period,Cari fatura döneminin bitiş tarihi
+apps/erpnext/erpnext/hr/doctype/employee/employee.py,Please setup Employee Naming System in Human Resource &gt; HR Settings,Lütfen İnsan Kaynağında Çalışan Adlandırma Sistemini kurun&gt; İK Ayarları
 DocType: Lab Test,Technician Name,Teknisyen Adı
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py,"Cannot ensure delivery by Serial No as \
 					Item {0} is added with and without Ensure Delivery by \
@@ -3167,6 +3178,7 @@
 DocType: Accounts Settings,Unlink Payment on Cancellation of Invoice,Fatura İptaline İlişkin Ödeme bağlantısını kaldır
 DocType: Bank Reconciliation,From Date,Tarihinden itibaren
 apps/erpnext/erpnext/hr/doctype/vehicle_log/vehicle_log.py,Current Odometer reading entered should be greater than initial Vehicle Odometer {0},Girilen Güncel Yolölçer okuma başlangıç Araç Odometrenin daha fazla olmalıdır {0}
+,Purchase Order Items To Be Received or Billed,Alınacak veya Faturalandırılacak Sipariş Öğelerini Satın Alın
 DocType: Restaurant Reservation,No Show,Gösterim Yok
 apps/erpnext/erpnext/regional/india/utils.py,You must be a registered supplier to generate e-Way Bill,E-Way Bill&#39;i oluşturmak için tescilli bir tedarikçi olmalısınız
 DocType: Shipping Rule Country,Shipping Rule Country,Nakliye Kural Ülke
@@ -3213,6 +3225,7 @@
 apps/erpnext/erpnext/templates/generators/item/item_add_to_cart.html,View in Cart,Sepet Görüntüle
 DocType: Employee Checkin,Shift Actual Start,Vardiya Gerçek Başlangıç
 DocType: Tally Migration,Is Day Book Data Imported,Günlük Kitap Verileri Alındı mı
+,Purchase Order Items To Be Received or Billed1,Alınacak veya Faturalanacak Sipariş Öğelerini Satın Alın
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py,Marketing Expenses,Pazarlama Giderleri
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py,Marketing Expenses,Pazarlama Giderleri
 apps/erpnext/erpnext/stock/doctype/pick_list/pick_list.py,{0} units of {1} is not available.,{0} {1} birimi mevcut değil.
@@ -3457,7 +3470,6 @@
 apps/erpnext/erpnext/public/js/call_popup/call_popup.js,View all issues from {0},{0} &#39;daki tüm sorunları görüntüle
 DocType: Quality Inspection,MAT-QA-.YYYY.-,MAT-QA .YYYY.-
 DocType: Quality Meeting Table,Quality Meeting Table,Kalite Toplantı Masası
-apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,Lütfen Ayarlama&gt; Ayarlar&gt; Adlandırma Serisi ile {0} için Adlandırma Serisi&#39;ni ayarlayın.
 apps/erpnext/erpnext/templates/pages/help.html,Visit the forums,Forumları ziyaret et
 DocType: Student,Student Mobile Number,Öğrenci Cep Numarası
 DocType: Item,Has Variants,Varyasyoları var
@@ -3614,6 +3626,7 @@
 ,Campaign Efficiency,Kampanya Verimliliği
 ,Campaign Efficiency,Kampanya Verimliliği
 DocType: Discussion,Discussion,Tartışma
+apps/erpnext/erpnext/setup/default_energy_point_rules.py,On Sales Order Submission,Satış Siparişi Gönderme
 DocType: Bank Transaction,Transaction ID,İşlem Kimliği
 DocType: Payroll Entry,Deduct Tax For Unsubmitted Tax Exemption Proof,Gönderilmemiş Vergi İstisnası Kanıtı için Vergi İndirimi
 DocType: Volunteer,Anytime,İstediğin zaman
@@ -3621,7 +3634,6 @@
 DocType: Employee Tax Exemption Proof Submission,Employee Tax Exemption Proof Submission,Çalışan Vergi Muafiyeti Proof Sunumu
 DocType: Patient,Surgical History,Cerrahi Tarih
 DocType: Bank Statement Settings Item,Mapped Header,Eşlenen Üstbilgi
-apps/erpnext/erpnext/hr/doctype/employee/employee.py,Please setup Employee Naming System in Human Resource &gt; HR Settings,Lütfen İnsan Kaynağında Çalışan Adlandırma Sistemini kurun&gt; İK Ayarları
 DocType: Employee,Resignation Letter Date,İstifa Mektubu Tarihi
 DocType: Employee,Resignation Letter Date,İstifa Mektubu Tarihi
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Pricing Rules are further filtered based on quantity.,Fiyatlandırma Kuralları miktara dayalı olarak tekrar filtrelenir.
@@ -3637,6 +3649,7 @@
 DocType: Bank Statement Settings,Mapped Items,Eşlenmiş Öğeler
 DocType: Amazon MWS Settings,IT,O
 DocType: Chapter,Chapter,bölüm
+,Fixed Asset Register,Sabit Varlık Kaydı
 apps/erpnext/erpnext/utilities/user_progress.py,Pair,Çift
 apps/erpnext/erpnext/utilities/user_progress.py,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."
@@ -3784,7 +3797,6 @@
 apps/erpnext/erpnext/templates/emails/reorder_item.html,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ş
 apps/erpnext/erpnext/controllers/accounts_controller.py,Account {0} is invalid. Account Currency must be {1},Hesap {0} geçersiz. Hesap Para olmalıdır {1}
 apps/erpnext/erpnext/hr/doctype/salary_structure_assignment/salary_structure_assignment.py,From Date {0} cannot be after employee's relieving Date {1},{0} tarihinden itibaren çalışanın işten ayrılmasından sonra tarih {1} olamaz
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py,Debit Note {0} has been created automatically,Borç Notu {0} otomatik olarak yaratıldı
 apps/erpnext/erpnext/accounts/doctype/payment_order/payment_order.js,Create Payment Entries,Ödeme Girişleri Oluştur
 DocType: Supplier,Is Internal Supplier,İç Tedarikçi mi
 DocType: Employee,Create User Permission,Kullanıcı İzni Yarat
@@ -4386,7 +4398,6 @@
 DocType: Project User,Project Status,Proje Durumu
 DocType: UOM,Check this to disallow fractions. (for Nos),Kesirlere izin vermemek için işaretleyin (Numaralar için)
 DocType: Student Admission Program,Naming Series (for Student Applicant),Seri İsimlendirme (Öğrenci Başvuru için)
-apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.py,UOM Conversion factor ({0} -&gt; {1}) not found for item: {2},{2} öğesi için UOM Dönüşüm faktörü ({0} -&gt; {1}) bulunamadı:
 apps/erpnext/erpnext/hr/doctype/retention_bonus/retention_bonus.py,Bonus Payment Date cannot be a past date,Bonus Ödeme Tarihi bir tarih olamaz
 DocType: Travel Request,Copy of Invitation/Announcement,Davetiye / Duyurunun kopyası
 DocType: Practitioner Service Unit Schedule,Practitioner Service Unit Schedule,Uygulayıcı Hizmet Birimi Takvimi
@@ -4565,6 +4576,7 @@
 apps/erpnext/erpnext/utilities/user_progress.py,Setup Company,Kurulum Şirketi
 ,Lab Test Report,Lab Test Raporu
 DocType: Employee Benefit Application,Employee Benefit Application,Çalışanlara Sağlanan Fayda
+apps/erpnext/erpnext/accounts/doctype/invoice_discounting/invoice_discounting.py,Row({0}): {1} is already discounted in {2},"Satır ({0}): {1}, {2} için zaten indirimli"
 apps/erpnext/erpnext/hr/doctype/additional_salary/additional_salary.py,Additional Salary Component Exists.,Ek Maaş Bileşeni Vardır.
 DocType: Purchase Invoice,Unregistered,kayıtsız
 DocType: Student Applicant,Application Date,Başvuru Tarihi
@@ -4652,7 +4664,6 @@
 DocType: Journal Entry,Accounting Entries,Muhasebe Girişler
 DocType: Job Card Time Log,Job Card Time Log,İş kartı zaman günlüğü
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,"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."
-apps/erpnext/erpnext/education/doctype/instructor/instructor.py,Please setup Instructor Naming System in Education &gt; Education Settings,Lütfen Eğitimde Eğitimci Adlandırma Sistemini kurun&gt; Eğitim Ayarları
 DocType: Journal Entry,Paid Loan,Ücretli Kredi
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py,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,Duplicate Entry. Please check Authorization Rule {0},Girişi çoğaltın. Yetkilendirme Kuralı kontrol edin {0}
@@ -4671,7 +4682,6 @@
 apps/erpnext/erpnext/templates/pages/projects.html,No time sheets,Hiçbir zaman çarşaf
 DocType: GoCardless Mandate,GoCardless Customer,GoCardless Müşterisi
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py,Leave Type {0} cannot be carry-forwarded,{0} carry-iletilmesine olamaz Type bırakın
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Item Code &gt; Item Group &gt; Brand,Ürün Kodu&gt; Ürün Grubu&gt; Marka
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py,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
 DocType: Leave Encashment,Payroll,Bordro
@@ -4797,7 +4807,6 @@
 DocType: Stock Ledger Entry,Actual Qty After Transaction,İşlem sonrası gerçek Adet
 ,Pending SO Items For Purchase Request,Satın Alma Talebi bekleyen PO Ürünleri
 apps/erpnext/erpnext/education/doctype/student_admission/student_admission.py,Student Admissions,Öğrenci Kabulleri
-apps/erpnext/erpnext/accounts/party.py,{0} {1} is disabled,{0} {1} devre dışı
 DocType: Supplier,Billing Currency,Fatura Para Birimi
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py,Extra Large,Ekstra Büyük
 DocType: Loan,Loan Application,Kredi başvurusu
@@ -4881,7 +4890,6 @@
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py,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/accounts/doctype/accounting_dimension/accounting_dimension.py,Creating Dimensions...,Boyutların Oluşturulması ...
 apps/erpnext/erpnext/education/doctype/student_group_creation_tool/student_group_creation_tool.py,Student Group Name is mandatory in row {0},Öğrenci Grubu Adı satırda zorunludur {0}
-DocType: Customer Credit Limit,Bypass credit limit_check,Kredi limitini atla
 DocType: Homepage,Products to be shown on website homepage,Ürünler web sitesi ana sayfasında gösterilecek
 DocType: HR Settings,Password Policy,Şifre politikası
 apps/erpnext/erpnext/setup/doctype/customer_group/customer_group.js,This is a root customer group and cannot be edited.,Bu bir kök müşteri grubudur ve düzenlenemez.
@@ -5209,6 +5217,7 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py,Row {0}: Advance against Customer must be credit,Satır {0}: Müşteriye karşı Advance kredi olmalı
 DocType: Quality Meeting,Quality Meeting,Kalite Toplantısı
 apps/erpnext/erpnext/accounts/doctype/account/account.js,Non-Group to Group,Grup grup dışı
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,Lütfen Ayarlama&gt; Ayarlar&gt; Adlandırma Serisi ile {0} için Adlandırma Serisi&#39;ni ayarlayın.
 DocType: Employee,ERPNext User,ERPNext Kullanıcı
 apps/erpnext/erpnext/education/doctype/student_group_creation_tool/student_group_creation_tool.py,Batch is mandatory in row {0},Parti {0}. satırda zorunludur
 apps/erpnext/erpnext/education/doctype/student_group_creation_tool/student_group_creation_tool.py,Batch is mandatory in row {0},Parti {0}. satırda zorunludur
@@ -5529,6 +5538,7 @@
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py,No {0} found for Inter Company Transactions.,Inter Şirket İşlemleri için {0} bulunamadı.
 DocType: Travel Itinerary,Rented Car,Kiralanmış araba
 apps/erpnext/erpnext/public/js/hub/components/profile_dialog.js,About your Company,Şirketiniz hakkında
+apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.js,Show Stock Ageing Data,Stok Yaşlanma Verilerini Göster
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py,Credit To account must be a Balance Sheet account,Hesabın için Kredi bir bilanço hesabı olmalıdır
 DocType: Donor,Donor,verici
 DocType: Global Defaults,Disable In Words,Words devre dışı bırak
@@ -5544,8 +5554,10 @@
 DocType: Practitioner Schedule,Schedule Name,Program Adı
 apps/erpnext/erpnext/regional/doctype/gstr_3b_report/gstr_3b_report.py,Please enter GSTIN and state for the Company Address {0},Lütfen GSTIN girin ve {0} Şirket Adresini girin.
 DocType: Currency Exchange,For Buying,Satın almak için
+apps/erpnext/erpnext/setup/default_energy_point_rules.py,On Purchase Order Submission,Satınalma Siparişi Gönderme İşleminde
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js,Add All Suppliers,Tüm Tedarikçiler Ekleyin
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py,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/accounts/doctype/pricing_rule/pricing_rule.js,Customer &gt; Customer Group &gt; Territory,Müşteri&gt; Müşteri Grubu&gt; Bölge
 DocType: Tally Migration,Parties,Taraflar
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js,Browse BOM,BOM Araştır
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py,Secured Loans,Teminatlı Krediler
@@ -5578,6 +5590,7 @@
 apps/erpnext/erpnext/stock/doctype/item_alternative/item_alternative.py,Not allow to set alternative item for the item {0},{0} öğesi için alternatif öğe ayarlamaya izin verilmez
 apps/erpnext/erpnext/hr/doctype/leave_block_list/leave_block_list.py,Date is repeated,Tarih tekrarlanır
 apps/erpnext/erpnext/accounts/print_format/payment_receipt_voucher/payment_receipt_voucher.html,Authorized Signatory,Yetkili imza
+apps/erpnext/erpnext/education/doctype/instructor/instructor.py,Please setup Instructor Naming System in Education &gt; Education Settings,Lütfen Eğitimde Eğitimci Adlandırma Sistemini kurun&gt; Eğitim Ayarları
 apps/erpnext/erpnext/regional/doctype/gstr_3b_report/gstr_3b_report.html,Net ITC Available(A) - (B),Net ITC Mevcut (A) - (B)
 apps/erpnext/erpnext/education/doctype/fee_schedule/fee_schedule.js,Create Fees,Ücret Yarat
 DocType: Project,Total Purchase Cost (via Purchase Invoice),Toplam Satınalma Maliyeti (Satın Alma Fatura üzerinden)
@@ -5599,6 +5612,7 @@
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.js,Message Sent,Gönderilen Mesaj
 apps/erpnext/erpnext/accounts/doctype/account/account.py,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/assets/report/fixed_asset_register/fixed_asset_register.py,Vendor Name,Satıcı adı
 DocType: Quiz Result,Wrong,Yanlış
 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)
@@ -5857,6 +5871,7 @@
 DocType: Stock Settings,Auto Material Request,Otomatik Malzeme Talebi
 DocType: Woocommerce Settings,API consumer secret,API tüketici sırrı
 DocType: Delivery Note Item,Available Batch Qty at From Warehouse,Depodaki Mevcut Parti Miktarı
+,Received Qty Amount,Alınan Miktar Miktarı
 DocType: Salary Slip,Gross Pay - Total Deduction - Loan Repayment,Brüt Ücret - Toplam Kesintisi - Kredi Geri Ödeme
 DocType: Bank Account,Last Integration Date,Son Entegrasyon Tarihi
 DocType: Expense Claim,Expense Taxes and Charges,Gider Vergileri ve Masrafları
@@ -6358,6 +6373,8 @@
 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,Please select Qty against item {0},Lütfen {0} öğesine karşı Miktar seçin
+apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py,Latest Age,Son yaş
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js,Transfer Material to Supplier,Tedarikçi Malzeme Transferi
 apps/erpnext/erpnext/hr/report/loan_repayment/loan_repayment.py,EMI,EMI
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py,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,Potansiyel Müşteri Tipi
@@ -6381,7 +6398,6 @@
 apps/erpnext/erpnext/hr/doctype/employee_benefit_application/employee_benefit_application.py,"An amount of {0} already claimed for the component {1},\
 						 set the amount equal or greater than {2}","{1} bileşeni için halihazırda talep edilen {0} miktarı, tutarı {2} &#39;ye eşit veya daha büyük olacak şekilde ayarla"
 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
 DocType: BOM Update Tool,The new BOM after replacement,Değiştirilmesinden sonra yeni BOM
 ,Point of Sale,Satış Noktası
@@ -6509,7 +6525,6 @@
 DocType: Purchase Order Item,Blanket Order Rate,Battaniye Sipariş Hızı
 ,Customer Ledger Summary,Müşteri Muhasebe Özeti
 apps/erpnext/erpnext/hooks.py,Certification,belgeleme
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js,Are you sure you want to make debit note?,Ödeme notu yazmak istediğinize emin misiniz?
 DocType: Bank Guarantee,Clauses and Conditions,Şartlar ve Koşullar
 DocType: Serial No,Creation Document Type,Oluşturulan Belge Türü
 DocType: Amazon MWS Settings,ES,ES
@@ -6552,8 +6567,6 @@
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py,Financial Services,Finansal Hizmetler
 DocType: Student Sibling,Student ID,Öğrenci Kimliği
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.js,For Quantity must be greater than zero,Miktar için sıfırdan büyük olmalıdır
-apps/erpnext/erpnext/hr/doctype/employee_transfer/employee_transfer.py,"Please delete the Employee <a href=""#Form/Employee/{0}"">{0}</a>\
-					to cancel this document","Bu dokümanı iptal etmek için lütfen <a href=""#Form/Employee/{0}"">{0}</a> \ Çalışanını silin"
 apps/erpnext/erpnext/config/projects.py,Types of activities for Time Logs,Zaman Kayıtlar faaliyetleri Türleri
 DocType: Opening Invoice Creation Tool,Sales,Satışlar
 DocType: Stock Entry Detail,Basic Amount,Temel Tutar
@@ -6636,6 +6649,7 @@
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py,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,Send Supplier Emails,Tedarikçi E-postalarını Gönder
+DocType: Asset Movement,ACC-ASM-.YYYY.-,ACC-ASM-.YYYY.-
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py,"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
 apps/erpnext/erpnext/hr/doctype/employee_onboarding/employee_onboarding.py,Submit this to create the Employee record,Çalışan kaydını oluşturmak için bunu gönderin
@@ -6717,7 +6731,6 @@
 DocType: Sales Team,Contact No.,İletişim No
 apps/erpnext/erpnext/templates/includes/cart/cart_address.html,Billing Address is same as Shipping Address,"Fatura Adresi, Teslimat Adresiyle aynı"
 DocType: Bank Reconciliation,Payment Entries,Ödeme Girişler
-apps/erpnext/erpnext/erpnext_integrations/doctype/shopify_settings/shopify_settings.py,Access token or Shopify URL missing,Erişim anahtarı veya Shopify URL'si eksik
 DocType: Location,Latitude,Enlem
 DocType: Work Order,Scrap Warehouse,hurda Depo
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py,"Warehouse required at Row No {0}, please set default warehouse for the item {1} for the company {2}","{0} numaralı Satırda gerekli depo lütfen, {2} şirketi için {1} öğesinin varsayılan depolamasını lütfen ayarlayın"
@@ -6765,7 +6778,6 @@
 DocType: Job Offer Term,Value / Description,Değer / Açıklama
 apps/erpnext/erpnext/controllers/accounts_controller.py,"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
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js,Are you sure you want to make credit note?,Kredi notu almak istediğinize emin misiniz?
 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
@@ -6904,6 +6916,7 @@
 DocType: Purchase Invoice,Taxes and Charges Added,Eklenen Vergi ve Harçlar
 apps/erpnext/erpnext/assets/doctype/asset/asset.py,Depreciation Row {0}: Next Depreciation Date cannot be before Available-for-use Date,"Amortisör Satırı {0}: Sonraki Amortisman Tarihi, Kullanıma hazır Tarih&#39;ten önce olamaz"
 ,Sales Funnel,Satış Yolu
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Item Code &gt; Item Group &gt; Brand,Ürün Kodu&gt; Ürün Grubu&gt; Marka
 apps/erpnext/erpnext/setup/doctype/company/company.py,Abbreviation is mandatory,Kısaltma zorunludur
 DocType: Project,Task Progress,görev İlerleme
 apps/erpnext/erpnext/templates/includes/navbar/navbar_items.html,Cart,Araba
@@ -7171,6 +7184,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py,Piecework,Parça başı iş
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py,Piecework,Parça başı iş
 DocType: GSTR 3B Report,June,Haziran
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Supplier &gt; Supplier Type,Tedarikçi&gt; Tedarikçi Tipi
 DocType: Share Balance,From No,Hayır&#39;dan
 DocType: Shift Type,Early Exit Grace Period,Erken Çıkış Grace Dönemi
 DocType: Task,Actual Time (in Hours),Gerçek Zaman (Saat olarak)
@@ -7480,6 +7494,7 @@
 DocType: Naming Series,Select Transaction,İşlem Seçin
 DocType: Naming Series,Select Transaction,İşlem Seçin
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py,Please enter Approving Role or Approving User,Onaylayıcı Rol veya Onaylayıcı Kullanıcı Giriniz
+apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.py,UOM Conversion factor ({0} -&gt; {1}) not found for item: {2},{2} öğesi için UOM Dönüşüm faktörü ({0} -&gt; {1}) bulunamadı:
 apps/erpnext/erpnext/support/doctype/service_level_agreement/service_level_agreement.py,Service Level Agreement with Entity Type {0} and Entity {1} already exists.,{0} Varlığı ve {1} Varlığı ile Hizmet Seviyesi Anlaşması zaten var.
 DocType: Journal Entry,Write Off Entry,Şüpheli Alacak Girdisi
 DocType: BOM,Rate Of Materials Based On,Dayalı Ürün Br. Fiyatı
@@ -7684,6 +7699,7 @@
 DocType: Quality Inspection Reading,Quality Inspection Reading,Kalite Kontrol Okuma
 apps/erpnext/erpnext/stock/doctype/stock_settings/stock_settings.py,`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/stock/report/stock_balance/stock_balance.py,Earliest Age,En erken yaş
 apps/erpnext/erpnext/utilities/user_progress.py,Set a sales goal you'd like to achieve for your company.,Şirketiniz için ulaşmak istediğiniz bir satış hedefi belirleyin.
 DocType: Quality Goal,Revision,Revizyon
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js,Healthcare Services,Sağlık Hizmetleri
@@ -7732,6 +7748,7 @@
 apps/erpnext/erpnext/healthcare/doctype/patient_encounter/patient_encounter.js,Schedule Discharge,Program Deşarjı
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py,Cheques and Deposits incorrectly cleared,Çekler ve Mevduat yanlış temizlenir
 DocType: Homepage Section Card,Homepage Section Card,Anasayfa Bölüm Kartı
+,Amount To Be Billed,Faturalandırılacak Tutar
 apps/erpnext/erpnext/accounts/doctype/account/account.py,Account {0}: You can not assign itself as parent account,Hesap {0}: Kendisini bir ana hesap olarak atayamazsınız
 DocType: Purchase Invoice Item,Price List Rate,Fiyat Listesi Oranı
 DocType: Purchase Invoice Item,Price List Rate,Fiyat Listesi Oranı
@@ -7786,6 +7803,7 @@
 DocType: Supplier Scorecard Criteria,Supplier Scorecard Criteria,Tedarikçi Puan Kartı Kriterleri
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py,Please select Start Date and End Date for Item {0},Ürün {0} için Başlangıç ve Bitiş tarihi seçiniz
 DocType: Maintenance Schedule,MAT-MSH-.YYYY.-,MAT-MSH-.YYYY.-
+,Amount to Receive,Alınacak Miktar
 apps/erpnext/erpnext/education/doctype/student_group_creation_tool/student_group_creation_tool.py,Course is mandatory in row {0},Ders satırda zorunludur {0}
 apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py,From date can not be greater than than To date,Başlangıç tarihinden itibaren büyük olamaz
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py,To date cannot be before from date,Bitiş tarihi başlangıç tarihinden önce olmamalıdır
@@ -8062,7 +8080,6 @@
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js,BOM and Manufacturing Quantity are required,Ürün Ağacı ve Üretim Miktarı gereklidir
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js,Ageing Range 2,Yaşlanma Aralığı 2
 DocType: SG Creation Tool Course,Max Strength,Maksimum Güç
-apps/erpnext/erpnext/accounts/doctype/account/account.py,"Account {0} already exists in child company {1}. The following fields have different values, they should be same:<ul><li>{2}</li></ul>","{0} hesabı, {1} alt şirketinde zaten var. Aşağıdaki alanların farklı değerleri vardır, bunlar aynı olmalıdır: <ul><li> {2} </li></ul>"
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py,Installing presets,Önayarları yükleme
 DocType: Fee Schedule,EDU-FSH-.YYYY.-,EDU-FSH .YYYY.-
 apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js,No Delivery Note selected for Customer {},Müşteri için {} dağıtım Notu seçilmedi
@@ -8296,6 +8313,7 @@
 DocType: Delivery Note,Print Without Amount,Tutarı olmadan yazdır
 apps/erpnext/erpnext/accounts/report/asset_depreciation_ledger/asset_depreciation_ledger.py,Depreciation Date,Amortisman tarihi
 ,Work Orders in Progress,Devam Eden İş Emirleri
+DocType: Customer Credit Limit,Bypass Credit Limit Check,Baypas Kredi Limiti Kontrolü
 DocType: Issue,Support Team,Destek Ekibi
 apps/erpnext/erpnext/stock/report/batch_item_expiry_status/batch_item_expiry_status.py,Expiry (In Days),(Gün) Son Kullanma
 DocType: Appraisal,Total Score (Out of 5),Toplam Puan (5 üzerinden)
@@ -8492,6 +8510,7 @@
 DocType: Sales Invoice,Customer GSTIN,Müşteri GSTIN
 DocType: Crop Cycle,List of diseases detected on the field. When selected it'll automatically add a list of tasks to deal with the disease ,"Sahada tespit edilen hastalıkların listesi. Seçildiğinde, hastalıkla başa çıkmak için görevlerin bir listesi otomatik olarak eklenir."
 apps/erpnext/erpnext/manufacturing/page/bom_comparison_tool/bom_comparison_tool.js,BOM 1,BOM 1
+apps/erpnext/erpnext/assets/report/fixed_asset_register/fixed_asset_register.py,Asset Id,Varlık Kimliği
 apps/erpnext/erpnext/healthcare/doctype/healthcare_service_unit/healthcare_service_unit.js,This is a root healthcare service unit and cannot be edited.,Bu bir kök sağlık hizmeti birimidir ve düzenlenemez.
 DocType: Asset Repair,Repair Status,Onarım Durumu
 apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.js,"Requested Qty: Quantity requested for purchase, but not ordered.","İstenen Miktar: Satın almak için istenen, ancak sipariş edilmeyen miktar"
diff --git a/erpnext/translations/uk.csv b/erpnext/translations/uk.csv
index cd76d93..59f57b6 100644
--- a/erpnext/translations/uk.csv
+++ b/erpnext/translations/uk.csv
@@ -289,7 +289,6 @@
 DocType: Loan,Repay Over Number of Periods,Погашати Over Кількість періодів
 apps/erpnext/erpnext/manufacturing/report/bom_stock_report/bom_stock_report.py,Quantity to Produce can not be less than Zero,Кількість для виробництва не може бути меншою за нульову
 DocType: Stock Entry,Additional Costs,Додаткові витрати
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Customer &gt; Customer Group &gt; Territory,Клієнт&gt; Група клієнтів&gt; Територія
 apps/erpnext/erpnext/accounts/doctype/account/account.py,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 для студентів в студентській групі
@@ -587,6 +586,7 @@
 DocType: Healthcare Settings,Create documents for sample collection,Створення документів для збору зразків
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py,Payment against {0} {1} cannot be greater than Outstanding Amount {2},"Оплата по {0} {1} не може бути більше, ніж сума до оплати {2}"
 apps/erpnext/erpnext/patches/v11_0/add_healthcare_service_unit_tree_root.py,All Healthcare Service Units,Усі служби охорони здоров&#39;я
+apps/erpnext/erpnext/setup/default_energy_point_rules.py,On Converting Opportunity,Про можливості перетворення
 DocType: Bank Account,Address HTML,Адреса HTML
 DocType: Lead,Mobile No.,Номер мобільного.
 apps/erpnext/erpnext/selling/doctype/pos_closing_voucher/closing_voucher_details.html,Mode of Payments,Спосіб оплати
@@ -651,7 +651,6 @@
 DocType: Accounting Dimension,Dimension Name,Назва розміру
 apps/erpnext/erpnext/healthcare/setup.py,Resistant,Стійкий
 apps/erpnext/erpnext/hotels/doctype/hotel_room_reservation/hotel_room_reservation.py,Please set Hotel Room Rate on {},"Будь ласка, встановіть вартість номера готелю на {}"
-apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py,Please setup numbering series for Attendance via Setup &gt; Numbering Series,Установіть серію нумерації для відвідування через Налаштування&gt; Серія нумерації
 DocType: Journal Entry,Multi Currency,Мультивалютна
 DocType: Bank Statement Transaction Invoice Item,Invoice Type,Тип рахунку-фактури
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py,Valid from date must be less than valid upto date,Дійсна з дати повинна бути меншою за дійсну дату
@@ -769,6 +768,7 @@
 apps/erpnext/erpnext/accounts/page/pos/pos.js,Create a new Customer,Створення нового клієнта
 apps/erpnext/erpnext/non_profit/report/expiring_memberships/expiring_memberships.py,Expiring On,Закінчується
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,"If multiple Pricing Rules continue to prevail, users are asked to set Priority manually to resolve conflict.","Якщо кілька правил ціноутворення продовжують переважати, користувачам пропонується встановити пріоритет вручну та вирішити конфлікт."
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js,Purchase Return,Купівля Повернення
 apps/erpnext/erpnext/utilities/activation.py,Create Purchase Orders,Створення замовлень на поставку
 ,Purchase Register,Реєстр закупівель
 apps/erpnext/erpnext/healthcare/doctype/patient/patient.py,Patient not found,Пацієнта не знайдено
@@ -784,7 +784,6 @@
 DocType: Location,Area UOM,Площа УОМ
 apps/erpnext/erpnext/manufacturing/doctype/workstation/workstation.py,Workstation is closed on the following dates as per Holiday List: {0},Робоча станція закрита в наступні терміни відповідно до списку вихідних: {0}
 apps/erpnext/erpnext/selling/page/sales_funnel/sales_funnel.py,Opportunities,Нагоди
-apps/erpnext/erpnext/www/all-products/index.html,Clear filters,Очистити фільтри
 DocType: Lab Test Template,Single,Одиночний
 DocType: Compensatory Leave Request,Work From Date,Робота з датою
 DocType: Salary Slip,Total Loan Repayment,Загальна сума погашення кредиту
@@ -828,6 +827,7 @@
 apps/erpnext/erpnext/education/doctype/program_enrollment_tool/program_enrollment_tool.py,Mandatory field - Academic Year,Обов&#39;язкове поле - Академічний рік
 apps/erpnext/erpnext/education/doctype/program_enrollment_tool/program_enrollment_tool.py,Mandatory field - Academic Year,Обов&#39;язкове поле - Академічний рік
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py,{0} {1} is not associated with {2} {3},{0} {1} не пов&#39;язаний з {2} {3}
+DocType: Opportunity,Converted By,Перетворено
 apps/erpnext/erpnext/public/js/hub/components/ReviewArea.vue,You need to login as a Marketplace User before you can add any reviews.,"Потрібно увійти як користувач Marketplace, перш ніж ви зможете додавати будь-які відгуки."
 apps/erpnext/erpnext/manufacturing/doctype/job_card/job_card.py,Row {0} : Operation is required against the raw material item {1},Рядок {0}: операція потрібна для елемента сировини {1}
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py,Please set default payable account for the company {0},"Будь ласка, встановіть за замовчуванням заборгованості рахунки для компанії {0}"
@@ -854,6 +854,8 @@
 DocType: Sales Invoice,Total Qty,Всього Кількість
 apps/erpnext/erpnext/education/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py,Guardian2 Email ID,ІД епошти охоронця 2
 apps/erpnext/erpnext/education/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py,Guardian2 Email ID,ІД епошти охоронця 2
+apps/erpnext/erpnext/hr/doctype/employee_transfer/employee_transfer.py,"Please delete the Employee <a href=""#Form/Employee/{0}"">{0}</a>\
+					to cancel this document","Видаліть працівника <a href=""#Form/Employee/{0}"">{0}</a> \, щоб скасувати цей документ"
 DocType: Item,Show in Website (Variant),Показати в веб-сайт (варіант)
 DocType: Employee,Health Concerns,Проблеми Здоров&#39;я
 DocType: Payroll Entry,Select Payroll Period,Виберіть Період нарахування заробітної плати
@@ -914,7 +916,6 @@
 DocType: Codification Table,Codification Table,Таблиця кодифікації
 DocType: Timesheet Detail,Hrs,годин
 apps/erpnext/erpnext/manufacturing/page/bom_comparison_tool/bom_comparison_tool.js,Changes in {0},Зміни в {0}
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js,Please select Company,"Будь ласка, виберіть компанію"
 DocType: Employee Skill,Employee Skill,Майстерність працівника
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.js,Difference Account,Рахунок різниці
 DocType: Pricing Rule,Discount on Other Item,Знижка на інший товар
@@ -983,6 +984,7 @@
 DocType: BOM,Operating Cost,Експлуатаційні витрати
 DocType: Crop,Produced Items,Вироблені предмети
 DocType: Bank Statement Transaction Entry,Match Transaction to Invoices,Матч-транзакція до рахунків-фактур
+apps/erpnext/erpnext/erpnext_integrations/exotel_integration.py,Error in Exotel incoming call,Помилка вхідного дзвінка Exotel
 DocType: Sales Order Item,Gross Profit,Загальний прибуток
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js,Unblock Invoice,Розблокувати рахунок-фактуру
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py,Increment cannot be 0,Приріст не може бути 0
@@ -1197,6 +1199,7 @@
 DocType: Activity Cost,Activity Type,Тип діяльності
 DocType: Request for Quotation,For individual supplier,Для індивідуального постачальника
 DocType: BOM Operation,Base Hour Rate(Company Currency),Базовий годину Rate (Компанія Валюта)
+,Qty To Be Billed,"Кількість, яку потрібно виставити на рахунку"
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py,Delivered Amount,Доставлено на суму
 apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.js,Reserved Qty for Production: Raw materials quantity to make manufacturing items.,Кількість зарезервованих для виробництва: кількість сировини для виготовлення виробів.
 DocType: Loyalty Point Entry Redemption,Redemption Date,Дата викупу
@@ -1317,7 +1320,7 @@
 apps/erpnext/erpnext/education/doctype/student_group/student_group.py,Please select Program,"Будь ласка, виберіть Програми"
 apps/erpnext/erpnext/education/doctype/student_group/student_group.py,Please select Program,"Будь ласка, виберіть Програми"
 DocType: Project,Estimated Cost,орієнтовна вартість
-DocType: Request for Quotation,Link to material requests,Посилання на матеріал запитів
+DocType: Supplier Quotation,Link to material requests,Посилання на матеріал запитів
 apps/erpnext/erpnext/public/js/hub/pages/Publish.vue,Publish,Опублікувати
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py,Aerospace,Авіаційно-космічний
 ,Fichier des Ecritures Comptables [FEC],Fichier des Ecritures Comptables [FEC]
@@ -1330,6 +1333,7 @@
 apps/erpnext/erpnext/utilities/transaction_base.py,Invalid Posting Time,Неправильний час публікації
 DocType: Salary Component,Condition and Formula,Стан та формула
 DocType: Lead,Campaign Name,Назва кампанії
+apps/erpnext/erpnext/setup/default_energy_point_rules.py,On Task Completion,Про виконання завдання
 apps/erpnext/erpnext/hr/doctype/compensatory_leave_request/compensatory_leave_request.py,There is no leave period in between {0} and {1},Між відмітками {0} та {1} немає періоду відпустки.
 DocType: Fee Validity,Healthcare Practitioner,Практик охорони здоров&#39;я
 DocType: Hotel Room,Capacity,Потужність
@@ -1675,7 +1679,6 @@
 DocType: Quality Feedback Template,Quality Feedback Template,Шаблон зворотнього зв&#39;язку якості
 apps/erpnext/erpnext/config/education.py,LMS Activity,Активність LMS
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py,Internet Publishing,Інтернет видання
-DocType: Prescription Duration,Number,Номер
 apps/erpnext/erpnext/accounts/doctype/opening_invoice_creation_tool/opening_invoice_creation_tool.js,Creating {0} Invoice,Створення {0} рахунку-фактури
 DocType: Medical Code,Medical Code Standard,Медичний кодекс Стандарт
 DocType: Soil Texture,Clay Composition (%),Композиція глини (%)
@@ -1750,6 +1753,7 @@
 DocType: Support Settings,Get Started Sections,Розпочніть розділи
 DocType: Lead,CRM-LEAD-.YYYY.-,CRM-LEAD-.YYYY.-
 DocType: Invoice Discounting,Sanctioned,санкціоновані
+,Base Amount,Базова сума
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.js,Total Contribution Amount: {0},Сума загального внеску: {0}
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py,Row #{0}: Please specify Serial No for Item {1},"Ряд # {0}: Будь ласка, сформулюйте Серійний номер, вказаний в п {1}"
 DocType: Payroll Entry,Salary Slips Submitted,Заробітна плата подано
@@ -1972,6 +1976,7 @@
 DocType: Accounting Dimension,Dimension Defaults,Параметри за замовчуванням
 apps/erpnext/erpnext/crm/report/prospects_engaged_but_not_converted/prospects_engaged_but_not_converted.js,Minimum Lead Age (Days),Мінімальний Lead Вік (дні)
 apps/erpnext/erpnext/crm/report/prospects_engaged_but_not_converted/prospects_engaged_but_not_converted.js,Minimum Lead Age (Days),Мінімальний Lead Вік (дні)
+apps/erpnext/erpnext/assets/report/fixed_asset_register/fixed_asset_register.py,Available For Use Date,Доступна для використання дата
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py,All BOMs,все ВВП
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js,Create Inter Company Journal Entry,Створіть запис журналу Inter Company
 DocType: Company,Parent Company,Материнська компанія
@@ -2036,6 +2041,7 @@
 ,IRS 1099,IRS 1099
 DocType: Salary Slip,Leave Without Pay,Відпустка без збереження заробітної
 DocType: Payment Request,Outward,Зовні
+apps/erpnext/erpnext/setup/default_energy_point_rules.py,On {0} Creation,{0} Створення
 apps/erpnext/erpnext/regional/doctype/gstr_3b_report/gstr_3b_report.html,State/UT Tax,Державний / УТ податок
 ,Trial Balance for Party,Оборотно-сальдова відомість для контрагента
 ,Gross and Net Profit Report,Звіт про валовий та чистий прибуток
@@ -2153,6 +2159,7 @@
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js,Make Stock Entry,Зробіть запис на складі
 DocType: Hotel Room Reservation,Hotel Reservation User,Бронювання готелів користувачем
 apps/erpnext/erpnext/projects/doctype/project/project.js,Set Status,Встановити статус
+apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py,Please setup numbering series for Attendance via Setup &gt; Numbering Series,Установіть серію нумерації для відвідування через Налаштування&gt; Серія нумерації
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py,Please select prefix first,"Будь ласка, виберіть префікс в першу чергу"
 DocType: Contract,Fulfilment Deadline,Термін виконання
 apps/erpnext/erpnext/public/js/hub/pages/Home.vue,Near you,Поруч з вами
@@ -2168,6 +2175,7 @@
 DocType: Announcement,All Students,всі студенти
 apps/erpnext/erpnext/assets/doctype/asset/asset.py,Item {0} must be a non-stock item,Номенклатурна позиція {0} має бути неінвентарною
 apps/erpnext/erpnext/stock/doctype/batch/batch.js,View Ledger,Подивитися Леджер
+DocType: Cost Center,Lft,Lft
 DocType: Grading Scale,Intervals,інтервали
 DocType: Bank Statement Transaction Entry,Reconciled Transactions,Узгоджені операції
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py,Earliest,Найперша
@@ -2283,6 +2291,7 @@
 apps/erpnext/erpnext/hr/doctype/employee_benefit_application/employee_benefit_application.py,As per your assigned Salary Structure you cannot apply for benefits,Відповідно до вашої призначеної структури заробітної плати ви не можете подати заявку на отримання пільг
 apps/erpnext/erpnext/stock/doctype/item/item.py,Website Image should be a public file or website URL,Зображення для веб-сайту має бути загальнодоступним файлом або адресою веб-сайту
 DocType: Purchase Invoice Item,BOM,Норми
+apps/erpnext/erpnext/stock/doctype/item/item.py,Duplicate entry in Manufacturers table,Дублікат запису в таблиці виробників
 apps/erpnext/erpnext/setup/doctype/item_group/item_group.js,This is a root item group and cannot be edited.,Це кореневий елемент групи і не можуть бути змінені.
 apps/erpnext/erpnext/accounts/doctype/account/account.js,Merge,Об&#39;єднати
 DocType: Journal Entry Account,Purchase Order,Замовлення на придбання
@@ -2429,7 +2438,6 @@
 DocType: Asset,Depreciation Schedules,Розклади амортизації
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.js,Create Sales Invoice,Створіть рахунок-фактуру з продажу
 apps/erpnext/erpnext/regional/doctype/gstr_3b_report/gstr_3b_report.html,Ineligible ITC,Недопустимий ІТЦ
-apps/erpnext/erpnext/erpnext_integrations/doctype/shopify_settings/shopify_settings.py,"Support for public app is deprecated. Please setup private app, for more details refer user manual","Підтримка публічного додатка застаріла. Будь ласка, налаштуйте приватне додаток, щоб отримати докладнішу інформацію, зверніться до керівництва користувача"
 DocType: Task,Dependent Tasks,Залежні завдання
 apps/erpnext/erpnext/regional/report/gstr_1/gstr_1.py,Following accounts might be selected in GST Settings:,У налаштуваннях GST можуть бути обрані такі облікові записи:
 apps/erpnext/erpnext/manufacturing/report/bom_stock_report/bom_stock_report.js,Quantity to Produce,Кількість для виробництва
@@ -2681,6 +2689,7 @@
 DocType: Water Analysis,Container,Контейнер
 apps/erpnext/erpnext/regional/report/gstr_1/gstr_1.py,Please set valid GSTIN No. in Company Address,"Будь ласка, встановіть дійсний номер GSTIN у компанії"
 apps/erpnext/erpnext/education/utils.py,Student {0} - {1} appears Multiple times in row {2} & {3},Student {0} - {1} кілька разів з&#39;являється в рядку {2} і {3}
+apps/erpnext/erpnext/selling/doctype/customer/customer.py,Following fields are mandatory to create address:,Для створення адреси обов&#39;язкові наступні поля:
 DocType: Item Alternative,Two-way,Двостороння
 DocType: Item,Manufacturers,Виробники
 apps/erpnext/erpnext/accounts/deferred_revenue.py,Error while processing deferred accounting for {0},Помилка під час обробки відкладеного обліку для {0}
@@ -2756,9 +2765,9 @@
 DocType: Employee,HR-EMP-,HR-EMP-
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py,User {0} doesn't have any default POS Profile. Check Default at Row {1} for this User.,Користувач {0} не має стандартного профілю POS. Перевірте за замовчуванням в рядку {1} для цього Користувача.
 DocType: Quality Meeting Minutes,Quality Meeting Minutes,Хвилини про якісну зустріч
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Supplier &gt; Supplier Type,Постачальник&gt; Тип постачальника
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py,Employee Referral,Відрядження співробітників
 DocType: Student Group,Set 0 for no limit,Встановіть 0 для жодних обмежень
+DocType: Cost Center,rgt,полк
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py,The day(s) on which you are applying for leave are holidays. You need not apply for leave.,"День(дні), на якій ви подаєте заяву на відпустку - вихідні. Вам не потрібно подавати заяву."
 DocType: Customer,Primary Address and Contact Detail,Основна адреса та контактні дані
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.js,Resend Payment Email,Повторно оплати на e-mail
@@ -2868,7 +2877,6 @@
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py,Against Supplier Invoice {0} dated {1},Згідно вхідного рахунку-фактури {0} від {1}
 DocType: Customer,Default Price List,Прайс-лист за замовчуванням
 apps/erpnext/erpnext/assets/doctype/asset/asset.py,Asset Movement record {0} created,Рух активів {0} створено
-apps/erpnext/erpnext/utilities/page/leaderboard/leaderboard.js,No items found.,Немає елементів.
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py,You cannot delete Fiscal Year {0}. Fiscal Year {0} is set as default in Global Settings,Ви не можете видаляти фінансовий рік {0}. Фінансовий рік {0} встановлено за замовчанням в розділі Глобальні параметри
 DocType: Share Transfer,Equity/Liability Account,Обліковий капітал / зобов&#39;язання
 apps/erpnext/erpnext/setup/doctype/customer_group/customer_group.py,A customer with the same name already exists,Клієнт з тим самим ім&#39;ям вже існує
@@ -2884,6 +2892,7 @@
 apps/erpnext/erpnext/selling/doctype/customer/customer.py,Credit limit has been crossed for customer {0} ({1}/{2}),Клієнтський ліміт був перехрещений для клієнта {0} ({1} / {2})
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py,Customer required for 'Customerwise Discount',Замовник вимагає для &#39;&#39; Customerwise Знижка
 apps/erpnext/erpnext/config/accounting.py,Update bank payment dates with journals.,Оновлення банківські платіжні дати з журналів.
+,Billed Qty,Рахунок Кількість
 apps/erpnext/erpnext/stock/doctype/item/item_dashboard.py,Pricing,ціноутворення
 DocType: Employee,Attendance Device ID (Biometric/RF tag ID),Ідентифікатор пристрою відвідуваності (ідентифікатор біометричного / RF тега)
 DocType: Quotation,Term Details,Термін Детальніше
@@ -2907,6 +2916,7 @@
 DocType: Share Transfer,Asset Account,Рахунок активів
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js,New release date should be in the future,Нова дата випуску повинна бути в майбутньому
 DocType: Purchase Invoice,End date of current invoice's period,Кінцева дата періоду виставлення рахунків
+apps/erpnext/erpnext/hr/doctype/employee/employee.py,Please setup Employee Naming System in Human Resource &gt; HR Settings,"Будь ласка, налаштуйте Систему іменування співробітників у Людських ресурсах&gt; Налаштування HR"
 DocType: Lab Test,Technician Name,Ім&#39;я техніки
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py,"Cannot ensure delivery by Serial No as \
 					Item {0} is added with and without Ensure Delivery by \
@@ -2914,6 +2924,7 @@
 DocType: Accounts Settings,Unlink Payment on Cancellation of Invoice,Відвязувати оплати при анулюванні рахунку-фактури
 DocType: Bank Reconciliation,From Date,З дати
 apps/erpnext/erpnext/hr/doctype/vehicle_log/vehicle_log.py,Current Odometer reading entered should be greater than initial Vehicle Odometer {0},"Поточне значення одометра увійшли має бути більше, ніж початковий одометр автомобіля {0}"
+,Purchase Order Items To Be Received or Billed,"Купівля замовлень, які потрібно отримати або виставити рахунок"
 DocType: Restaurant Reservation,No Show,Немає шоу
 apps/erpnext/erpnext/regional/india/utils.py,You must be a registered supplier to generate e-Way Bill,"Ви повинні бути зареєстрованим постачальником, щоб створювати електронний шлях"
 DocType: Shipping Rule Country,Shipping Rule Country,Країна правил доставки
@@ -2956,6 +2967,7 @@
 apps/erpnext/erpnext/templates/generators/item/item_add_to_cart.html,View in Cart,Дивіться в кошик
 DocType: Employee Checkin,Shift Actual Start,Фактичний старт Shift
 DocType: Tally Migration,Is Day Book Data Imported,Імпортуються дані про денну книгу
+,Purchase Order Items To Be Received or Billed1,"Елементи замовлення на придбання, які потрібно отримати або виставити рахунок1"
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py,Marketing Expenses,Маркетингові витрати
 apps/erpnext/erpnext/stock/doctype/pick_list/pick_list.py,{0} units of {1} is not available.,{0} одиниць {1} недоступний.
 ,Item Shortage Report,Повідомлення про нестачу номенклатурних позицій
@@ -3184,7 +3196,6 @@
 apps/erpnext/erpnext/public/js/call_popup/call_popup.js,View all issues from {0},Переглянути всі випуски від {0}
 DocType: Quality Inspection,MAT-QA-.YYYY.-,MAT-QA-.YYYY.-
 DocType: Quality Meeting Table,Quality Meeting Table,Таблиця якісних зустрічей
-apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,"Будь ласка, встановіть назву серії для {0} за допомогою пункту Налаштування&gt; Налаштування&gt; Іменування серії"
 apps/erpnext/erpnext/templates/pages/help.html,Visit the forums,Відвідайте форуми
 DocType: Student,Student Mobile Number,Студент Мобільний телефон
 DocType: Item,Has Variants,Має Варіанти
@@ -3328,6 +3339,7 @@
 ,Campaign Efficiency,ефективність кампанії
 ,Campaign Efficiency,ефективність кампанії
 DocType: Discussion,Discussion,обговорення
+apps/erpnext/erpnext/setup/default_energy_point_rules.py,On Sales Order Submission,Про подання замовлення на продаж
 DocType: Bank Transaction,Transaction ID,ID транзакції
 DocType: Payroll Entry,Deduct Tax For Unsubmitted Tax Exemption Proof,Відрахування податку для підтвердження невикористаних податків
 DocType: Volunteer,Anytime,У будь-який час
@@ -3335,7 +3347,6 @@
 DocType: Employee Tax Exemption Proof Submission,Employee Tax Exemption Proof Submission,Подача доказів про звільнення від податку працівника
 DocType: Patient,Surgical History,Хірургічна історія
 DocType: Bank Statement Settings Item,Mapped Header,Записаний заголовок
-apps/erpnext/erpnext/hr/doctype/employee/employee.py,Please setup Employee Naming System in Human Resource &gt; HR Settings,"Будь ласка, налаштуйте Систему іменування співробітників у Людських ресурсах&gt; Налаштування HR"
 DocType: Employee,Resignation Letter Date,Дата листа про відставка
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Pricing Rules are further filtered based on quantity.,Ціни Правила далі фільтруються на основі кількості.
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py,Please set the Date Of Joining for employee {0},"Будь ласка, встановіть дати приєднання для працівника {0}"
@@ -3350,6 +3361,7 @@
 DocType: Bank Statement Settings,Mapped Items,Маповані елементи
 DocType: Amazon MWS Settings,IT,ІТ
 DocType: Chapter,Chapter,Глава
+,Fixed Asset Register,Реєстр фіксованих активів
 apps/erpnext/erpnext/utilities/user_progress.py,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,Select BOM and Qty for Production,Виберіть BOM і Кількість для виробництва
@@ -3485,7 +3497,6 @@
 apps/erpnext/erpnext/templates/emails/reorder_item.html,Following Material Requests have been raised automatically based on Item's re-order level,Наступне Замовлення матеріалів буде створено автоматично згідно рівня дозамовлення для даної позиції
 apps/erpnext/erpnext/controllers/accounts_controller.py,Account {0} is invalid. Account Currency must be {1},Рахунок {0} є неприпустимим. Валюта рахунку повинні бути {1}
 apps/erpnext/erpnext/hr/doctype/salary_structure_assignment/salary_structure_assignment.py,From Date {0} cannot be after employee's relieving Date {1},Від дати {0} не може бути після звільнення працівника Дата {1}
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py,Debit Note {0} has been created automatically,Дебетова примітка {0} створена автоматично
 apps/erpnext/erpnext/accounts/doctype/payment_order/payment_order.js,Create Payment Entries,Створення платіжних записів
 DocType: Supplier,Is Internal Supplier,Є внутрішнім постачальником
 DocType: Employee,Create User Permission,Створити праву користувача
@@ -4049,7 +4060,6 @@
 DocType: Project User,Project Status,Статус проекту
 DocType: UOM,Check this to disallow fractions. (for Nos),"Перевірте це, щоб заборонити фракції. (для №)"
 DocType: Student Admission Program,Naming Series (for Student Applicant),Іменування Series (для студентів Заявником)
-apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.py,UOM Conversion factor ({0} -&gt; {1}) not found for item: {2},Коефіцієнт конверсії UOM ({0} -&gt; {1}) не знайдено для елемента: {2}
 apps/erpnext/erpnext/hr/doctype/retention_bonus/retention_bonus.py,Bonus Payment Date cannot be a past date,Дата виплати бонусу не може бути минулою датою
 DocType: Travel Request,Copy of Invitation/Announcement,Копія запрошення / оголошення
 DocType: Practitioner Service Unit Schedule,Practitioner Service Unit Schedule,Розклад служби практиків
@@ -4198,6 +4208,7 @@
 apps/erpnext/erpnext/utilities/user_progress.py,Setup Company,Налаштування компанії
 ,Lab Test Report,Лабораторія тестового звіту
 DocType: Employee Benefit Application,Employee Benefit Application,Заявка на користь працівника
+apps/erpnext/erpnext/accounts/doctype/invoice_discounting/invoice_discounting.py,Row({0}): {1} is already discounted in {2},Рядок ({0}): {1} вже знижено в {2}
 apps/erpnext/erpnext/hr/doctype/additional_salary/additional_salary.py,Additional Salary Component Exists.,Додатковий компонент заробітної плати існує.
 DocType: Purchase Invoice,Unregistered,Незареєстрований
 DocType: Student Applicant,Application Date,дата подачі заявки
@@ -4277,7 +4288,6 @@
 DocType: Journal Entry,Accounting Entries,Бухгалтерські проводки
 DocType: Job Card Time Log,Job Card Time Log,Журнал часу роботи
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,"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.","Якщо вибрано Правило ціноутворення для «Оцінити», воно буде перезаписати Прайс-лист. Коефіцієнт регулювання цін є кінцевою ставкою, тому подальша знижка не повинна застосовуватися. Отже, у таких транзакціях, як замовлення на купівлю, замовлення на купівлю і т. Д., Воно буде вивантажуватись у полі «Оцінка», а не поле «Ціновий курс»."
-apps/erpnext/erpnext/education/doctype/instructor/instructor.py,Please setup Instructor Naming System in Education &gt; Education Settings,"Будь ласка, налаштуйте систему іменування інструкторів у програмі Освіта&gt; Налаштування освіти"
 DocType: Journal Entry,Paid Loan,Платний кредит
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py,Duplicate Entry. Please check Authorization Rule {0},"Дублювати запис. Будь ласка, перевірте Авторизація Правило {0}"
 DocType: Journal Entry Account,Reference Due Date,Довідкова дата
@@ -4294,7 +4304,6 @@
 apps/erpnext/erpnext/templates/pages/projects.html,No time sheets,Немає часу листи
 DocType: GoCardless Mandate,GoCardless Customer,GoCardless Клієнт
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py,Leave Type {0} cannot be carry-forwarded,Тип відпустки {0} не може бути перенесеним
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Item Code &gt; Item Group &gt; Brand,Код товару&gt; Група предметів&gt; Бренд
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py,Maintenance Schedule is not generated for all the items. Please click on 'Generate Schedule',"Не для всіх позицій згенероване Заплановане тех. обслуговування. Натисніть ""Згенерувати розклад"" будь-ласка"
 ,To Produce,Виробляти
 DocType: Leave Encashment,Payroll,Платіжна відомість
@@ -4409,7 +4418,6 @@
 DocType: Stock Ledger Entry,Actual Qty After Transaction,Фактична к-сть після операції
 ,Pending SO Items For Purchase Request,"Замовлені товари, які очікують закупки"
 apps/erpnext/erpnext/education/doctype/student_admission/student_admission.py,Student Admissions,зараховуються студентів
-apps/erpnext/erpnext/accounts/party.py,{0} {1} is disabled,{0} {1} відключений
 DocType: Supplier,Billing Currency,Валюта оплати
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py,Extra Large,Дуже великий
 DocType: Loan,Loan Application,Заявка на позику
@@ -4486,7 +4494,6 @@
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py,Only Leave Applications with status 'Approved' and 'Rejected' can be submitted,Тільки залиште додатки зі статусом «Схвалено» і «Відхилено» можуть бути представлені
 apps/erpnext/erpnext/accounts/doctype/accounting_dimension/accounting_dimension.py,Creating Dimensions...,Створення розмірів ...
 apps/erpnext/erpnext/education/doctype/student_group_creation_tool/student_group_creation_tool.py,Student Group Name is mandatory in row {0},Студентська група Ім&#39;я є обов&#39;язковим в рядку {0}
-DocType: Customer Credit Limit,Bypass credit limit_check,Обхід кредиту limit_check
 DocType: Homepage,Products to be shown on website homepage,"Продукти, що будуть показані на головній сторінці веб-сайту"
 DocType: HR Settings,Password Policy,Політика щодо паролів
 apps/erpnext/erpnext/setup/doctype/customer_group/customer_group.js,This is a root customer group and cannot be edited.,Це корінь групи клієнтів і не можуть бути змінені.
@@ -4780,6 +4787,7 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py,Row {0}: Advance against Customer must be credit,Ряд {0}: Аванси по клієнту повинні бути у кредиті
 DocType: Quality Meeting,Quality Meeting,Якісна зустріч
 apps/erpnext/erpnext/accounts/doctype/account/account.js,Non-Group to Group,Перетворити елемент у групу
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,"Будь ласка, встановіть назву серії для {0} за допомогою пункту Налаштування&gt; Налаштування&gt; Іменування серії"
 DocType: Employee,ERPNext User,ERPNext Користувач
 apps/erpnext/erpnext/education/doctype/student_group_creation_tool/student_group_creation_tool.py,Batch is mandatory in row {0},Пакетний є обов&#39;язковим в рядку {0}
 apps/erpnext/erpnext/education/doctype/student_group_creation_tool/student_group_creation_tool.py,Batch is mandatory in row {0},Пакетний є обов&#39;язковим в рядку {0}
@@ -5079,6 +5087,7 @@
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py,No {0} found for Inter Company Transactions.,Ні {0} знайдено для транзакцій компанії «Інтер».
 DocType: Travel Itinerary,Rented Car,Орендований автомобіль
 apps/erpnext/erpnext/public/js/hub/components/profile_dialog.js,About your Company,Про вашу компанію
+apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.js,Show Stock Ageing Data,Показати дані про старість акцій
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py,Credit To account must be a Balance Sheet account,Кредит на рахунку повинен бути баланс рахунку
 DocType: Donor,Donor,Донор
 DocType: Global Defaults,Disable In Words,"Відключити ""прописом"""
@@ -5093,8 +5102,10 @@
 DocType: Practitioner Schedule,Schedule Name,Назва розкладу
 apps/erpnext/erpnext/regional/doctype/gstr_3b_report/gstr_3b_report.py,Please enter GSTIN and state for the Company Address {0},Введіть GSTIN та вкажіть адресу компанії {0}
 DocType: Currency Exchange,For Buying,Для покупки
+apps/erpnext/erpnext/setup/default_energy_point_rules.py,On Purchase Order Submission,Під час подання замовлення
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js,Add All Suppliers,Додати всіх постачальників
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py,Row #{0}: Allocated Amount cannot be greater than outstanding amount.,Рядок # {0}: Виділена сума не може бути більше суми заборгованості.
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Customer &gt; Customer Group &gt; Territory,Клієнт&gt; Група клієнтів&gt; Територія
 DocType: Tally Migration,Parties,Сторони
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js,Browse BOM,Переглянути норми
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py,Secured Loans,Забезпечені кредити
@@ -5126,6 +5137,7 @@
 apps/erpnext/erpnext/stock/doctype/item_alternative/item_alternative.py,Not allow to set alternative item for the item {0},Не дозволяється встановлювати альтернативний елемент для елемента {0}
 apps/erpnext/erpnext/hr/doctype/leave_block_list/leave_block_list.py,Date is repeated,Дата повторюється
 apps/erpnext/erpnext/accounts/print_format/payment_receipt_voucher/payment_receipt_voucher.html,Authorized Signatory,"Особа, яка має право підпису"
+apps/erpnext/erpnext/education/doctype/instructor/instructor.py,Please setup Instructor Naming System in Education &gt; Education Settings,"Будь ласка, налаштуйте систему іменування інструкторів у програмі Освіта&gt; Налаштування освіти"
 apps/erpnext/erpnext/regional/doctype/gstr_3b_report/gstr_3b_report.html,Net ITC Available(A) - (B),Чистий доступний ITC (A) - (B)
 apps/erpnext/erpnext/education/doctype/fee_schedule/fee_schedule.js,Create Fees,Створіть комісії
 DocType: Project,Total Purchase Cost (via Purchase Invoice),Загальна вартість покупки (через рахунок покупки)
@@ -5146,6 +5158,7 @@
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.js,Message Sent,Повідомлення відправлено
 apps/erpnext/erpnext/accounts/doctype/account/account.py,Account with child nodes cannot be set as ledger,"Рахунок з дочірніх вузлів, не може бути встановлений як книгу"
 DocType: C-Form,II,II
+apps/erpnext/erpnext/assets/report/fixed_asset_register/fixed_asset_register.py,Vendor Name,Ім&#39;я продавця
 DocType: Quiz Result,Wrong,Неправильно
 DocType: Sales Invoice,Rate at which Price list currency is converted to customer's base currency,"Курс, за яким валюта прайс-листа конвертується у базову валюту покупця"
 DocType: Purchase Invoice Item,Net Amount (Company Currency),Чиста сума (Компанія валют)
@@ -5391,6 +5404,7 @@
 DocType: Stock Settings,Auto Material Request,Авто-Замовлення матеріалів
 DocType: Woocommerce Settings,API consumer secret,API споживчої таємниці
 DocType: Delivery Note Item,Available Batch Qty at From Warehouse,Доступна кількість партії на складі відправлення
+,Received Qty Amount,Отримана кількість Кількість
 DocType: Salary Slip,Gross Pay - Total Deduction - Loan Repayment,Gross Pay - Разом Відрахування - Погашення кредиту
 DocType: Bank Account,Last Integration Date,Дата останньої інтеграції
 DocType: Expense Claim,Expense Taxes and Charges,Податкові збори та збори
@@ -5856,6 +5870,8 @@
 DocType: Drug Prescription,Hour,Година
 DocType: Restaurant Order Entry,Last Sales Invoice,Останній продаж рахунків-фактур
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py,Please select Qty against item {0},"Будь-ласка, виберіть Qty проти пункту {0}"
+apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py,Latest Age,Останній вік
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js,Transfer Material to Supplier,Провести Матеріал Постачальнику
 apps/erpnext/erpnext/hr/report/loan_repayment/loan_repayment.py,EMI,ЕМІ
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py,New Serial No cannot have Warehouse. Warehouse must be set by Stock Entry or Purchase Receipt,Новий Серійний номер не може мати склад. Склад повинен бути встановлений Рухом ТМЦ або Прихідною накладною
 DocType: Lead,Lead Type,Тип Lead-а
@@ -5879,7 +5895,6 @@
 apps/erpnext/erpnext/hr/doctype/employee_benefit_application/employee_benefit_application.py,"An amount of {0} already claimed for the component {1},\
 						 set the amount equal or greater than {2}","Сума {0}, яка вже претендувала на компонент {1}, \ встановити суму, рівну або більшу {2}"
 DocType: Shipping Rule,Shipping Rule Conditions,Умови правил доставки
-DocType: Purchase Invoice,Export Type,Тип експорту
 DocType: Salary Slip Loan,Salary Slip Loan,Зарплата Скип Кредит
 DocType: BOM Update Tool,The new BOM after replacement,Нові Норми після заміни
 ,Point of Sale,POS
@@ -6001,7 +6016,6 @@
 DocType: Purchase Order Item,Blanket Order Rate,Швидкість замовлення ковдри
 ,Customer Ledger Summary,Резюме клієнта
 apps/erpnext/erpnext/hooks.py,Certification,Сертифікація
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js,Are you sure you want to make debit note?,Справді дебетувати?
 DocType: Bank Guarantee,Clauses and Conditions,Статті та умови
 DocType: Serial No,Creation Document Type,Створення типу документа
 DocType: Amazon MWS Settings,ES,ES
@@ -6039,8 +6053,6 @@
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py,Financial Services,Фінансові послуги
 DocType: Student Sibling,Student ID,Student ID
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.js,For Quantity must be greater than zero,Для кількості має бути більше нуля
-apps/erpnext/erpnext/hr/doctype/employee_transfer/employee_transfer.py,"Please delete the Employee <a href=""#Form/Employee/{0}"">{0}</a>\
-					to cancel this document","Видаліть працівника <a href=""#Form/Employee/{0}"">{0}</a> \, щоб скасувати цей документ"
 apps/erpnext/erpnext/config/projects.py,Types of activities for Time Logs,Види діяльності для Час Журнали
 DocType: Opening Invoice Creation Tool,Sales,Продаж
 DocType: Stock Entry Detail,Basic Amount,Основна кількість
@@ -6119,6 +6131,7 @@
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py,Print and Stationery,Друк та канцелярські
 DocType: Stock Settings,Show Barcode Field,Показати поле штрих-коду
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js,Send Supplier Emails,Надіслати Постачальник електронних листів
+DocType: Asset Movement,ACC-ASM-.YYYY.-,ACC-ASM-.YYYY.-
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py,"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,Авто створений
 apps/erpnext/erpnext/hr/doctype/employee_onboarding/employee_onboarding.py,Submit this to create the Employee record,"Надішліть це, щоб створити запис працівника"
@@ -6198,7 +6211,6 @@
 DocType: Sales Team,Contact No.,Контакт No.
 apps/erpnext/erpnext/templates/includes/cart/cart_address.html,Billing Address is same as Shipping Address,"Платіжна адреса така ж, як адреса доставки"
 DocType: Bank Reconciliation,Payment Entries,Оплати
-apps/erpnext/erpnext/erpnext_integrations/doctype/shopify_settings/shopify_settings.py,Access token or Shopify URL missing,Токен доступу або URL-адреса Shopify відсутня
 DocType: Location,Latitude,Широта
 DocType: Work Order,Scrap Warehouse,лом Склад
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py,"Warehouse required at Row No {0}, please set default warehouse for the item {1} for the company {2}","Необхідний склад у рядку № {0}, будь ласка, встановіть склад за замовчуванням для товару {1} для компанії {2}"
@@ -6243,7 +6255,6 @@
 DocType: Job Offer Term,Value / Description,Значення / Опис
 apps/erpnext/erpnext/controllers/accounts_controller.py,"Row #{0}: Asset {1} cannot be submitted, it is already {2}","Рядок # {0}: Asset {1} не може бути представлено, вже {2}"
 DocType: Tax Rule,Billing Country,Країна (оплата)
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js,Are you sure you want to make credit note?,"Ви впевнені, що хочете зробити кредитну ноту?"
 DocType: Purchase Order Item,Expected Delivery Date,Очікувана дата поставки
 DocType: Restaurant Order Entry,Restaurant Order Entry,Замовлення ресторану
 apps/erpnext/erpnext/accounts/general_ledger.py,Debit and Credit not equal for {0} #{1}. Difference is {2}.,Дебет і Кредит не рівні для {0} # {1}. Різниця {2}.
@@ -6368,6 +6379,7 @@
 DocType: Purchase Invoice,Taxes and Charges Added,Податки та збори додано
 apps/erpnext/erpnext/assets/doctype/asset/asset.py,Depreciation Row {0}: Next Depreciation Date cannot be before Available-for-use Date,Рядок амортизації {0}: Далі Датою амортизації не може бути до Дати доступної для використання
 ,Sales Funnel,Воронка продажів
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Item Code &gt; Item Group &gt; Brand,Код товару&gt; Група предметів&gt; Бренд
 apps/erpnext/erpnext/setup/doctype/company/company.py,Abbreviation is mandatory,Скорочення є обов'язковим
 DocType: Project,Task Progress,Завдання про хід роботи
 apps/erpnext/erpnext/templates/includes/navbar/navbar_items.html,Cart,Візок
@@ -6613,6 +6625,7 @@
 DocType: Employee Grade,Employee Grade,Оцінка працівників
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py,Piecework,Відрядна робота
 DocType: GSTR 3B Report,June,Червень
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Supplier &gt; Supplier Type,Постачальник&gt; Тип постачальника
 DocType: Share Balance,From No,Від №
 DocType: Shift Type,Early Exit Grace Period,Період дострокового виходу з вигоди
 DocType: Task,Actual Time (in Hours),Фактичний час (в годинах)
@@ -6899,6 +6912,7 @@
 DocType: Warehouse,Warehouse Name,Назва складу
 DocType: Naming Series,Select Transaction,Виберіть операцію
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py,Please enter Approving Role or Approving User,"Будь ласка, введіть затвердження роль або затвердження Користувач"
+apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.py,UOM Conversion factor ({0} -&gt; {1}) not found for item: {2},Коефіцієнт конверсії UOM ({0} -&gt; {1}) не знайдено для елемента: {2}
 apps/erpnext/erpnext/support/doctype/service_level_agreement/service_level_agreement.py,Service Level Agreement with Entity Type {0} and Entity {1} already exists.,Договір про рівень обслуговування з типом {0} та об&#39;єктом {1} вже існує.
 DocType: Journal Entry,Write Off Entry,Списання запис
 DocType: BOM,Rate Of Materials Based On,Вартість матеріалів базується на
@@ -7090,6 +7104,7 @@
 DocType: Quality Inspection Reading,Quality Inspection Reading,Зчитування сертифікату якості
 apps/erpnext/erpnext/stock/doctype/stock_settings/stock_settings.py,`Freeze Stocks Older Than` should be smaller than %d days.,"Значення `Заморозити активи старіші ніж` повинно бути менше, ніж %d днів."
 DocType: Tax Rule,Purchase Tax Template,Шаблон податку на закупку
+apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py,Earliest Age,Найдавніший вік
 apps/erpnext/erpnext/utilities/user_progress.py,Set a sales goal you'd like to achieve for your company.,"Встановіть ціль продажу, яку хочете досягти для своєї компанії."
 DocType: Quality Goal,Revision,Перегляд
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js,Healthcare Services,Послуги охорони здоров&#39;я
@@ -7133,6 +7148,7 @@
 apps/erpnext/erpnext/healthcare/doctype/patient_encounter/patient_encounter.js,Schedule Discharge,Розкладу розряду
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py,Cheques and Deposits incorrectly cleared,"Чеки та депозити неправильно ""очищені"""
 DocType: Homepage Section Card,Homepage Section Card,Картка розділу домашньої сторінки
+,Amount To Be Billed,"Сума, що підлягає сплаті"
 apps/erpnext/erpnext/accounts/doctype/account/account.py,Account {0}: You can not assign itself as parent account,Рахунок {0}: Ви не можете призначити рахунок як батьківський до себе
 DocType: Purchase Invoice Item,Price List Rate,Ціна з прайс-листа
 apps/erpnext/erpnext/utilities/activation.py,Create customer quotes,Створення котирування клієнтів
@@ -7185,6 +7201,7 @@
 DocType: Supplier Scorecard Criteria,Supplier Scorecard Criteria,Критерії оцінки показників постачальника
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py,Please select Start Date and End Date for Item {0},"Будь ласка, виберіть дату початку та дату закінчення Пункт {0}"
 DocType: Maintenance Schedule,MAT-MSH-.YYYY.-,MAT-MSH-.YYYY.-
+,Amount to Receive,Сума для отримання
 apps/erpnext/erpnext/education/doctype/student_group_creation_tool/student_group_creation_tool.py,Course is mandatory in row {0},Курс є обов&#39;язковим в рядку {0}
 apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py,From date can not be greater than than To date,Від дати не може бути більше ніж На сьогодні
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py,To date cannot be before from date,На сьогоднішній день не може бути раніше від дати
@@ -7435,7 +7452,6 @@
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js,BOM and Manufacturing Quantity are required,Норми та кількість виробництва потрібні
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js,Ageing Range 2,Старіння Діапазон 2
 DocType: SG Creation Tool Course,Max Strength,Максимальна міцність
-apps/erpnext/erpnext/accounts/doctype/account/account.py,"Account {0} already exists in child company {1}. The following fields have different values, they should be same:<ul><li>{2}</li></ul>","Рахунок {0} вже існує в дочірній компанії {1}. У наступних полях різні значення, вони повинні бути однаковими: <ul><li> {2} </li></ul>"
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py,Installing presets,Встановлення пресетів
 DocType: Fee Schedule,EDU-FSH-.YYYY.-,EDU-FSH-.YYYY.-
 apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js,No Delivery Note selected for Customer {},Примітка доставки не вибрана для Клієнта {}
@@ -7646,6 +7662,7 @@
 DocType: Delivery Note,Print Without Amount,Друк без розмірі
 apps/erpnext/erpnext/accounts/report/asset_depreciation_ledger/asset_depreciation_ledger.py,Depreciation Date,Дата амортизації
 ,Work Orders in Progress,Робочі замовлення в процесі роботи
+DocType: Customer Credit Limit,Bypass Credit Limit Check,Обхід чекової лімітної чеки
 DocType: Issue,Support Team,Команда підтримки
 apps/erpnext/erpnext/stock/report/batch_item_expiry_status/batch_item_expiry_status.py,Expiry (In Days),Термін дії (в днях)
 DocType: Appraisal,Total Score (Out of 5),Всього балів (з 5)
@@ -7832,6 +7849,7 @@
 DocType: Sales Invoice,Customer GSTIN,GSTIN клієнтів
 DocType: Crop Cycle,List of diseases detected on the field. When selected it'll automatically add a list of tasks to deal with the disease ,"Список захворювань, виявлених на полі. Коли буде обрано, він автоматично додасть список завдань для боротьби з хворобою"
 apps/erpnext/erpnext/manufacturing/page/bom_comparison_tool/bom_comparison_tool.js,BOM 1,BOM 1
+apps/erpnext/erpnext/assets/report/fixed_asset_register/fixed_asset_register.py,Asset Id,Ідентифікатор активів
 apps/erpnext/erpnext/healthcare/doctype/healthcare_service_unit/healthcare_service_unit.js,This is a root healthcare service unit and cannot be edited.,Це коренева служба охорони здоров&#39;я і не може бути відредагована.
 DocType: Asset Repair,Repair Status,Ремонт статусу
 apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.js,"Requested Qty: Quantity requested for purchase, but not ordered.","Запитаний Кількість: Кількість запитується на покупку, але не замовляється."
diff --git a/erpnext/translations/ur.csv b/erpnext/translations/ur.csv
index 57e18b5..c3e4e72 100644
--- a/erpnext/translations/ur.csv
+++ b/erpnext/translations/ur.csv
@@ -282,7 +282,6 @@
 DocType: Loan,Repay Over Number of Periods,دوران ادوار کی تعداد ادا
 apps/erpnext/erpnext/manufacturing/report/bom_stock_report/bom_stock_report.py,Quantity to Produce can not be less than Zero,پیداواری مقدار صفر سے کم نہیں ہوسکتی ہے۔
 DocType: Stock Entry,Additional Costs,اضافی اخراجات
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Customer &gt; Customer Group &gt; Territory,کسٹمر&gt; کسٹمر گروپ&gt; علاقہ۔
 apps/erpnext/erpnext/accounts/doctype/account/account.py,Account with existing transaction can not be converted to group.,موجودہ لین دین کے ساتھ اکاؤنٹ گروپ میں تبدیل نہیں کیا جا سکتا.
 DocType: Lead,Product Enquiry,مصنوعات کی انکوائری
 DocType: Education Settings,Validate Batch for Students in Student Group,طالب علم گروپ کے طلبا کے بیچ کی توثیق
@@ -579,6 +578,7 @@
 DocType: Healthcare Settings,Create documents for sample collection,نمونہ مجموعہ کے لئے دستاویزات بنائیں
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py,Payment against {0} {1} cannot be greater than Outstanding Amount {2},کے خلاف ادائیگی {0} {1} بقایا رقم سے زیادہ نہیں ہو سکتا {2}
 apps/erpnext/erpnext/patches/v11_0/add_healthcare_service_unit_tree_root.py,All Healthcare Service Units,تمام ہیلتھ کیئر سروس یونٹس
+apps/erpnext/erpnext/setup/default_energy_point_rules.py,On Converting Opportunity,مواقع کو تبدیل کرنے پر۔
 DocType: Bank Account,Address HTML,ایڈریس HTML
 DocType: Lead,Mobile No.,موبائل نمبر
 apps/erpnext/erpnext/selling/doctype/pos_closing_voucher/closing_voucher_details.html,Mode of Payments,ادائیگی کے موڈ
@@ -642,7 +642,6 @@
 DocType: Accounting Dimension,Dimension Name,طول و عرض کا نام۔
 apps/erpnext/erpnext/healthcare/setup.py,Resistant,مزاحم
 apps/erpnext/erpnext/hotels/doctype/hotel_room_reservation/hotel_room_reservation.py,Please set Hotel Room Rate on {},براہ کرم ہوٹل روم کی شرح مقرر کریں {}
-apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py,Please setup numbering series for Attendance via Setup &gt; Numbering Series,براہ کرم حاضری کے لئے نمبر بندی سیریز سیٹ اپ&gt; نمبرنگ سیریز کے ذریعے ترتیب دیں۔
 DocType: Journal Entry,Multi Currency,ملٹی کرنسی
 DocType: Bank Statement Transaction Invoice Item,Invoice Type,انوائس کی قسم
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py,Valid from date must be less than valid upto date,درست تاریخ سے زیادہ درست تاریخ سے کم ہونا چاہئے۔
@@ -754,6 +753,7 @@
 apps/erpnext/erpnext/accounts/page/pos/pos.js,Create a new Customer,ایک نئے گاہک بنائیں
 apps/erpnext/erpnext/non_profit/report/expiring_memberships/expiring_memberships.py,Expiring On,ختم ہونے پر
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,"If multiple Pricing Rules continue to prevail, users are asked to set Priority manually to resolve conflict.",ایک سے زیادہ قیمتوں کا تعین قواعد غالب کرنے کے لئے جاری ہے، صارفین تنازعہ کو حل کرنے دستی طور پر ترجیح مقرر کرنے کو کہا جاتا.
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js,Purchase Return,واپس خریداری
 apps/erpnext/erpnext/utilities/activation.py,Create Purchase Orders,خریداری کے آرڈر بنائیں
 ,Purchase Register,خریداری رجسٹر
 apps/erpnext/erpnext/healthcare/doctype/patient/patient.py,Patient not found,مریض نہیں ملا
@@ -768,7 +768,6 @@
 DocType: Location,Area UOM,علاقائی UOM
 apps/erpnext/erpnext/manufacturing/doctype/workstation/workstation.py,Workstation is closed on the following dates as per Holiday List: {0},کارگاہ چھٹیوں فہرست کے مطابق مندرجہ ذیل تاریخوں پر بند کر دیا ہے: {0}
 apps/erpnext/erpnext/selling/page/sales_funnel/sales_funnel.py,Opportunities,مواقع
-apps/erpnext/erpnext/www/all-products/index.html,Clear filters,فلٹرز صاف کریں۔
 DocType: Lab Test Template,Single,سنگل
 DocType: Compensatory Leave Request,Work From Date,تاریخ سے کام
 DocType: Salary Slip,Total Loan Repayment,کل قرض کی واپسی
@@ -812,6 +811,7 @@
 apps/erpnext/erpnext/education/doctype/program_enrollment_tool/program_enrollment_tool.py,Mandatory field - Academic Year,لازمی فیلڈ - تعلیمی سال
 apps/erpnext/erpnext/education/doctype/program_enrollment_tool/program_enrollment_tool.py,Mandatory field - Academic Year,لازمی فیلڈ - تعلیمی سال
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py,{0} {1} is not associated with {2} {3},{2} {1} سے متعلق نہیں ہے {2} {3}
+DocType: Opportunity,Converted By,کے ذریعہ تبدیل کیا گیا۔
 apps/erpnext/erpnext/public/js/hub/components/ReviewArea.vue,You need to login as a Marketplace User before you can add any reviews.,کسی بھی جائزے کو شامل کرنے سے پہلے آپ کو مارکیٹ پلیس صارف کی حیثیت سے لاگ ان کرنے کی ضرورت ہے۔
 apps/erpnext/erpnext/manufacturing/doctype/job_card/job_card.py,Row {0} : Operation is required against the raw material item {1},قطار {0}: خام مال کے سامان کے خلاف کارروائی کی ضرورت ہے {1}
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py,Please set default payable account for the company {0},کمپنی کے لیے ڈیفالٹ قابل ادائیگی اکاؤنٹ سیٹ مہربانی {0}
@@ -838,6 +838,8 @@
 DocType: Sales Invoice,Total Qty,کل مقدار
 apps/erpnext/erpnext/education/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py,Guardian2 Email ID,Guardian2 ای میل آئی ڈی
 apps/erpnext/erpnext/education/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py,Guardian2 Email ID,Guardian2 ای میل آئی ڈی
+apps/erpnext/erpnext/hr/doctype/employee_transfer/employee_transfer.py,"Please delete the Employee <a href=""#Form/Employee/{0}"">{0}</a>\
+					to cancel this document","براہ کرم اس دستاویز کو منسوخ کرنے کے لئے ملازم <a href=""#Form/Employee/{0}"">{0}</a> delete کو حذف کریں۔"
 DocType: Item,Show in Website (Variant),ویب سائٹ میں دکھائیں (مختلف)
 DocType: Employee,Health Concerns,صحت کے خدشات
 DocType: Payroll Entry,Select Payroll Period,پے رول کی مدت کو منتخب
@@ -896,7 +898,6 @@
 DocType: Codification Table,Codification Table,کوڈڈیکشن ٹیبل
 DocType: Timesheet Detail,Hrs,بجے
 apps/erpnext/erpnext/manufacturing/page/bom_comparison_tool/bom_comparison_tool.js,Changes in {0},{0} میں تبدیلیاں
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js,Please select Company,کمپنی کا انتخاب کریں
 DocType: Employee Skill,Employee Skill,ملازم مہارت
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.js,Difference Account,فرق اکاؤنٹ
 DocType: Pricing Rule,Discount on Other Item,دوسرے آئٹم پر چھوٹ۔
@@ -964,6 +965,7 @@
 DocType: BOM,Operating Cost,آپریٹنگ لاگت
 DocType: Crop,Produced Items,تیار کردہ اشیاء
 DocType: Bank Statement Transaction Entry,Match Transaction to Invoices,انوائس پر ٹرانزیکشن ملائیں
+apps/erpnext/erpnext/erpnext_integrations/exotel_integration.py,Error in Exotel incoming call,ایکسٹل میں آنے والی کال میں خرابی۔
 DocType: Sales Order Item,Gross Profit,کل منافع
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js,Unblock Invoice,انوائس انوائس
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py,Increment cannot be 0,اضافہ 0 نہیں ہو سکتا
@@ -1174,6 +1176,7 @@
 DocType: Activity Cost,Activity Type,سرگرمی کی قسم
 DocType: Request for Quotation,For individual supplier,انفرادی سپلائر کے لئے
 DocType: BOM Operation,Base Hour Rate(Company Currency),بیس گھنٹے کی شرح (کمپنی کرنسی)
+,Qty To Be Billed,بل کی مقدار میں
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py,Delivered Amount,ہونے والا رقم
 apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.js,Reserved Qty for Production: Raw materials quantity to make manufacturing items.,پیداوار کے لئے محفوظ مقدار: مینوفیکچرنگ آئٹمز بنانے کے لئے خام مال کی مقدار۔
 DocType: Loyalty Point Entry Redemption,Redemption Date,چھٹکارا کی تاریخ
@@ -1292,7 +1295,7 @@
 DocType: Sales Invoice,Commission Rate (%),کمیشن کی شرح (٪)
 apps/erpnext/erpnext/education/doctype/student_group/student_group.py,Please select Program,براہ مہربانی منتخب کریں پروگرام
 DocType: Project,Estimated Cost,تخمینی لاگت
-DocType: Request for Quotation,Link to material requests,مواد درخواستوں کا لنک
+DocType: Supplier Quotation,Link to material requests,مواد درخواستوں کا لنک
 apps/erpnext/erpnext/public/js/hub/pages/Publish.vue,Publish,شائع کریں
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py,Aerospace,ایرواسپیس
 ,Fichier des Ecritures Comptables [FEC],Fichier des Ecritures Comptables [FEC]
@@ -1305,6 +1308,7 @@
 apps/erpnext/erpnext/utilities/transaction_base.py,Invalid Posting Time,غلط پوسٹنگ وقت
 DocType: Salary Component,Condition and Formula,حالت اور فارمولہ
 DocType: Lead,Campaign Name,مہم کا نام
+apps/erpnext/erpnext/setup/default_energy_point_rules.py,On Task Completion,ٹاسک کی تکمیل پر۔
 apps/erpnext/erpnext/hr/doctype/compensatory_leave_request/compensatory_leave_request.py,There is no leave period in between {0} and {1},{0} اور {1} کے درمیان کوئی چھٹی نہیں ہے
 DocType: Fee Validity,Healthcare Practitioner,ہیلتھ کیئر پریکٹیشنر
 DocType: Hotel Room,Capacity,صلاحیت
@@ -1647,7 +1651,6 @@
 DocType: Quality Feedback Template,Quality Feedback Template,کوالٹی فیڈ بیک ٹیمپلیٹ۔
 apps/erpnext/erpnext/config/education.py,LMS Activity,LMS سرگرمی۔
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py,Internet Publishing,انٹرنیٹ پبلشنگ
-DocType: Prescription Duration,Number,نمبر
 apps/erpnext/erpnext/accounts/doctype/opening_invoice_creation_tool/opening_invoice_creation_tool.js,Creating {0} Invoice,{0} انوائس تخلیق کرنا
 DocType: Medical Code,Medical Code Standard,میڈیکل کوڈ سٹینڈرڈ
 DocType: Soil Texture,Clay Composition (%),مٹی ساخت (٪)
@@ -1722,6 +1725,7 @@
 DocType: Support Settings,Get Started Sections,شروع حصوں
 DocType: Lead,CRM-LEAD-.YYYY.-,CRM- LEAD-YYYY.-
 DocType: Invoice Discounting,Sanctioned,منظور
+,Base Amount,بیس رقم۔
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.js,Total Contribution Amount: {0},کل شراکت کی رقم: {0}
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py,Row #{0}: Please specify Serial No for Item {1},صف # {0}: شے کے لئے کوئی سیریل کی وضاحت کریں {1}
 DocType: Payroll Entry,Salary Slips Submitted,تنخواہ سلپس پیش کی گئی
@@ -1944,6 +1948,7 @@
 DocType: Accounting Dimension,Dimension Defaults,طول و عرض ڈیفالٹس
 apps/erpnext/erpnext/crm/report/prospects_engaged_but_not_converted/prospects_engaged_but_not_converted.js,Minimum Lead Age (Days),کم از کم کے لیڈ عمر (دن)
 apps/erpnext/erpnext/crm/report/prospects_engaged_but_not_converted/prospects_engaged_but_not_converted.js,Minimum Lead Age (Days),کم از کم کے لیڈ عمر (دن)
+apps/erpnext/erpnext/assets/report/fixed_asset_register/fixed_asset_register.py,Available For Use Date,تاریخ استعمال کے لئے دستیاب ہے۔
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py,All BOMs,تمام BOMs
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js,Create Inter Company Journal Entry,انٹر کمپنی جرنل انٹری بنائیں۔
 DocType: Company,Parent Company,والدین کی کمپنی
@@ -2007,6 +2012,7 @@
 ,IRS 1099,آئی آر ایس 1099۔
 DocType: Salary Slip,Leave Without Pay,بغیر تنخواہ چھٹی
 DocType: Payment Request,Outward,باہر
+apps/erpnext/erpnext/setup/default_energy_point_rules.py,On {0} Creation,{0} تخلیق پر۔
 apps/erpnext/erpnext/regional/doctype/gstr_3b_report/gstr_3b_report.html,State/UT Tax,ریاست / UT ٹیکس
 ,Trial Balance for Party,پارٹی کے لئے مقدمے کی سماعت توازن
 ,Gross and Net Profit Report,مجموعی اور خالص منافع کی رپورٹ۔
@@ -2123,6 +2129,7 @@
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js,Make Stock Entry,اسٹاک اندراج کریں۔
 DocType: Hotel Room Reservation,Hotel Reservation User,ہوٹل ریزرویشن صارف
 apps/erpnext/erpnext/projects/doctype/project/project.js,Set Status,حیثیت طے کریں۔
+apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py,Please setup numbering series for Attendance via Setup &gt; Numbering Series,براہ کرم حاضری کے لئے نمبر بندی سیریز سیٹ اپ&gt; نمبرنگ سیریز کے ذریعے ترتیب دیں۔
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py,Please select prefix first,پہلے سابقہ براہ مہربانی منتخب کریں
 DocType: Contract,Fulfilment Deadline,مکمل آخری وقت
 apps/erpnext/erpnext/public/js/hub/pages/Home.vue,Near you,آپ کے قریب
@@ -2138,6 +2145,7 @@
 DocType: Announcement,All Students,تمام طلباء
 apps/erpnext/erpnext/assets/doctype/asset/asset.py,Item {0} must be a non-stock item,{0} آئٹم ایک غیر اسٹاک شے ہونا ضروری ہے
 apps/erpnext/erpnext/stock/doctype/batch/batch.js,View Ledger,لنک لیجر
+DocType: Cost Center,Lft,Lft
 DocType: Grading Scale,Intervals,وقفے
 DocType: Bank Statement Transaction Entry,Reconciled Transactions,منسلک لین دین
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py,Earliest,قدیم ترین
@@ -2252,6 +2260,7 @@
 apps/erpnext/erpnext/hr/doctype/employee_benefit_application/employee_benefit_application.py,As per your assigned Salary Structure you cannot apply for benefits,آپ کے مکلف تنخواہ کی تشکیل کے مطابق آپ فوائد کے لئے درخواست نہیں دے سکتے ہیں
 apps/erpnext/erpnext/stock/doctype/item/item.py,Website Image should be a public file or website URL,ویب سائٹ تصویری ایک عوامی فائل یا ویب سائٹ یو آر ایل ہونا چاہئے
 DocType: Purchase Invoice Item,BOM,BOM
+apps/erpnext/erpnext/stock/doctype/item/item.py,Duplicate entry in Manufacturers table,مینوفیکچررز کی میز میں ڈپلیکیٹ اندراج۔
 apps/erpnext/erpnext/setup/doctype/item_group/item_group.js,This is a root item group and cannot be edited.,یہ ایک جڑ شے گروپ ہے اور میں ترمیم نہیں کیا جا سکتا.
 apps/erpnext/erpnext/accounts/doctype/account/account.js,Merge,ضم
 DocType: Journal Entry Account,Purchase Order,خریداری کے آرڈر
@@ -2393,7 +2402,6 @@
 DocType: Asset,Depreciation Schedules,ہراس کے شیڈول
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.js,Create Sales Invoice,سیل انوائس بنائیں۔
 apps/erpnext/erpnext/regional/doctype/gstr_3b_report/gstr_3b_report.html,Ineligible ITC,نااہل آئی ٹی سی۔
-apps/erpnext/erpnext/erpnext_integrations/doctype/shopify_settings/shopify_settings.py,"Support for public app is deprecated. Please setup private app, for more details refer user manual",عوامی اپلی کیشن کو سپورٹ دیا گیا ہے. براہ کرم نجی ایپ سیٹ کریں، مزید تفصیلات کے لئے صارف دستی کا حوالہ دیتے ہیں
 DocType: Task,Dependent Tasks,منحصر کام
 apps/erpnext/erpnext/regional/report/gstr_1/gstr_1.py,Following accounts might be selected in GST Settings:,مندرجہ بالا اکاؤنٹس کو جی ایس ایس کی ترتیبات میں منتخب کیا جا سکتا ہے:
 apps/erpnext/erpnext/manufacturing/report/bom_stock_report/bom_stock_report.js,Quantity to Produce,مقدار پیدا کرنے کے لئے۔
@@ -2640,6 +2648,7 @@
 DocType: Water Analysis,Container,کنٹینر
 apps/erpnext/erpnext/regional/report/gstr_1/gstr_1.py,Please set valid GSTIN No. in Company Address,براہ کرم کمپنی ایڈریس میں درست جی ایس ٹی این نمبر مقرر کریں۔
 apps/erpnext/erpnext/education/utils.py,Student {0} - {1} appears Multiple times in row {2} & {3},طالب علم {0} - {1} ظاہر ہوتا قطار میں کئی بار {2} اور عمومی {3}
+apps/erpnext/erpnext/selling/doctype/customer/customer.py,Following fields are mandatory to create address:,مندرجہ ذیل فیلڈز ایڈریس بنانے کے لئے لازمی ہیں۔
 DocType: Item Alternative,Two-way,دو طرفہ
 DocType: Item,Manufacturers,مینوفیکچررز۔
 ,Employee Billing Summary,ملازم بلنگ کا خلاصہ۔
@@ -2714,9 +2723,9 @@
 DocType: Employee,HR-EMP-,HR- EMP-
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py,User {0} doesn't have any default POS Profile. Check Default at Row {1} for this User.,یوزر {0} میں کوئی ڈیفالٹ پی ایس او پروفائل نہیں ہے. اس صارف کے لئے قطار {1} قطار پر ڈیفالٹ چیک کریں.
 DocType: Quality Meeting Minutes,Quality Meeting Minutes,کوالٹی میٹنگ منٹ۔
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Supplier &gt; Supplier Type,سپلائر&gt; سپلائر کی قسم
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py,Employee Referral,ملازم ریفرل
 DocType: Student Group,Set 0 for no limit,کوئی حد 0 سیٹ کریں
+DocType: Cost Center,rgt,rgt
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py,The day(s) on which you are applying for leave are holidays. You need not apply for leave.,آپ کی چھٹی کے لئے درخواست دے رہے ہیں جس دن (ے) تعطیلات ہیں. آپ کو چھوڑ کے لئے درخواست دینے کی ضرورت نہیں ہے.
 DocType: Customer,Primary Address and Contact Detail,ابتدائی پتہ اور رابطے کی تفصیل
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.js,Resend Payment Email,ادائیگی ای میل بھیج
@@ -2824,7 +2833,6 @@
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py,Against Supplier Invoice {0} dated {1},پردایک خلاف انوائس {0} ء {1}
 DocType: Customer,Default Price List,پہلے سے طے شدہ قیمت کی فہرست
 apps/erpnext/erpnext/assets/doctype/asset/asset.py,Asset Movement record {0} created,اثاثہ تحریک ریکارڈ {0} پیدا
-apps/erpnext/erpnext/utilities/page/leaderboard/leaderboard.js,No items found.,کوئی چیز نہیں ملی.
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py,You cannot delete Fiscal Year {0}. Fiscal Year {0} is set as default in Global Settings,آپ مالی سال {0} کو حذف نہیں کر سکتے ہیں. مالی سال {0} گلوبل ترتیبات میں ڈیفالٹ کے طور پر مقرر کیا جاتا ہے
 DocType: Share Transfer,Equity/Liability Account,مساوات / ذمہ داری اکاؤنٹ
 apps/erpnext/erpnext/setup/doctype/customer_group/customer_group.py,A customer with the same name already exists,ایک ہی نام کے ساتھ گاہک پہلے ہی موجود ہے
@@ -2840,6 +2848,7 @@
 apps/erpnext/erpnext/selling/doctype/customer/customer.py,Credit limit has been crossed for customer {0} ({1}/{2}),گاہک کے لئے کریڈٹ کی حد کو کراس کر دیا گیا ہے {0} ({1} / {2})
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py,Customer required for 'Customerwise Discount',&#39;Customerwise ڈسکاؤنٹ کے لئے کی ضرورت ہے کسٹمر
 apps/erpnext/erpnext/config/accounting.py,Update bank payment dates with journals.,روزنامچے کے ساتھ بینک کی ادائیگی کی تاریخوں کو اپ ڈیٹ کریں.
+,Billed Qty,بل کی مقدار
 apps/erpnext/erpnext/stock/doctype/item/item_dashboard.py,Pricing,قیمتوں کا تعین
 DocType: Employee,Attendance Device ID (Biometric/RF tag ID),حاضری کا آلہ ID (بائیو میٹرک / RF ٹیگ ID)
 DocType: Quotation,Term Details,ٹرم تفصیلات
@@ -2862,6 +2871,7 @@
 DocType: Share Transfer,Asset Account,اکاؤنٹ اثاثہ
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js,New release date should be in the future,نئی رہائی کی تاریخ مستقبل میں ہونی چاہئے۔
 DocType: Purchase Invoice,End date of current invoice's period,موجودہ انوائس کی مدت کے ختم ہونے کی تاریخ
+apps/erpnext/erpnext/hr/doctype/employee/employee.py,Please setup Employee Naming System in Human Resource &gt; HR Settings,برائے کرم انسانی وسائل&gt; HR کی ترتیبات میں ملازمین کے نام دینے کا نظام مرتب کریں۔
 DocType: Lab Test,Technician Name,ٹیکنشین کا نام
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py,"Cannot ensure delivery by Serial No as \
 					Item {0} is added with and without Ensure Delivery by \
@@ -2869,6 +2879,7 @@
 DocType: Accounts Settings,Unlink Payment on Cancellation of Invoice,انوائس کی منسوخی پر ادائیگی کا لنک ختم کریں
 DocType: Bank Reconciliation,From Date,تاریخ سے
 apps/erpnext/erpnext/hr/doctype/vehicle_log/vehicle_log.py,Current Odometer reading entered should be greater than initial Vehicle Odometer {0},درج کردہ موجودہ Odometer پڑھنا ابتدائی گاڑی Odometer سے زیادہ ہونا چاہئے {0}
+,Purchase Order Items To Be Received or Billed,خریداری آرڈر اشیا موصول ہونے یا بل کرنے کے لئے۔
 DocType: Restaurant Reservation,No Show,کوئی شو نہیں
 apps/erpnext/erpnext/regional/india/utils.py,You must be a registered supplier to generate e-Way Bill,ای وے بل تیار کرنے کے ل You آپ کو رجسٹرڈ سپلائر ہونا ضروری ہے۔
 DocType: Shipping Rule Country,Shipping Rule Country,شپنگ حکمرانی ملک
@@ -2909,6 +2920,7 @@
 apps/erpnext/erpnext/templates/generators/item/item_add_to_cart.html,View in Cart,ٹوکری میں دیکھیں
 DocType: Employee Checkin,Shift Actual Start,شفٹ اصل آغاز۔
 DocType: Tally Migration,Is Day Book Data Imported,یہ دن کا ڈیٹا امپورٹڈ ہے۔
+,Purchase Order Items To Be Received or Billed1,خریداری آرڈر اشیا موصول ہونے یا بل ڈالنے کے لئے 1۔
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py,Marketing Expenses,مارکیٹنگ کے اخراجات
 apps/erpnext/erpnext/stock/doctype/pick_list/pick_list.py,{0} units of {1} is not available.,{1} کے {0} یونٹ دستیاب نہیں ہیں۔
 ,Item Shortage Report,آئٹم کمی رپورٹ
@@ -3270,6 +3282,7 @@
 ,Campaign Efficiency,مہم مستعدی
 ,Campaign Efficiency,مہم مستعدی
 DocType: Discussion,Discussion,بحث
+apps/erpnext/erpnext/setup/default_energy_point_rules.py,On Sales Order Submission,سیلز آرڈر جمع کروانے پر۔
 DocType: Bank Transaction,Transaction ID,ٹرانزیکشن کی شناخت
 DocType: Payroll Entry,Deduct Tax For Unsubmitted Tax Exemption Proof,غیر قانونی ٹیکس چھوٹ ثبوت کے لئے ٹیکس کم
 DocType: Volunteer,Anytime,کسی بھی وقت
@@ -3277,7 +3290,6 @@
 DocType: Employee Tax Exemption Proof Submission,Employee Tax Exemption Proof Submission,ملازم ٹیکس چھوٹ ثبوت جمع کرانے
 DocType: Patient,Surgical History,جراحی تاریخ
 DocType: Bank Statement Settings Item,Mapped Header,نقشہ ہیڈر
-apps/erpnext/erpnext/hr/doctype/employee/employee.py,Please setup Employee Naming System in Human Resource &gt; HR Settings,برائے کرم انسانی وسائل&gt; HR کی ترتیبات میں ملازمین کے نام دینے کا نظام مرتب کریں۔
 DocType: Employee,Resignation Letter Date,استعفی تاریخ
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Pricing Rules are further filtered based on quantity.,قیمتوں کا تعین کے قواعد مزید مقدار کی بنیاد پر فلٹر کر رہے ہیں.
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py,Please set the Date Of Joining for employee {0},ملازم کے لئے شامل ہونے کے تاریخ مقرر مہربانی {0}
@@ -3291,6 +3303,7 @@
 DocType: Bank Statement Settings,Mapped Items,نقشہ کردہ اشیاء
 DocType: Amazon MWS Settings,IT,یہ
 DocType: Chapter,Chapter,باب
+,Fixed Asset Register,فکسڈ اثاثہ کا اندراج۔
 apps/erpnext/erpnext/utilities/user_progress.py,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,Select BOM and Qty for Production,پیداوار کے لئے BOM اور قی کریں
@@ -3977,7 +3990,6 @@
 DocType: Project User,Project Status,منصوبے کی حیثیت
 DocType: UOM,Check this to disallow fractions. (for Nos),کسور کو رد کرنا اس کی جانچ پڑتال. (نمبر کے لئے)
 DocType: Student Admission Program,Naming Series (for Student Applicant),نام دینے سیریز (طالب علم کی درخواست گزار کے لئے)
-apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.py,UOM Conversion factor ({0} -&gt; {1}) not found for item: {2},UOM کے تبادلوں کا عنصر ({0} -&gt; {1}) آئٹم کے لئے نہیں ملا: {2}
 apps/erpnext/erpnext/hr/doctype/retention_bonus/retention_bonus.py,Bonus Payment Date cannot be a past date,بونس ادائیگی کی تاریخ پچھلے تاریخ نہیں ہوسکتی ہے
 DocType: Travel Request,Copy of Invitation/Announcement,دعوت نامہ / اعلان کی نقل
 DocType: Practitioner Service Unit Schedule,Practitioner Service Unit Schedule,پریکٹیشنر سروس یونٹ شیڈول
@@ -4201,7 +4213,6 @@
 DocType: Journal Entry,Accounting Entries,اکاؤنٹنگ اندراجات
 DocType: Job Card Time Log,Job Card Time Log,جاب کارڈ ٹائم لاگ
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,"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; فیلڈ میں لے جائے گا.
-apps/erpnext/erpnext/education/doctype/instructor/instructor.py,Please setup Instructor Naming System in Education &gt; Education Settings,براہ کرم تعلیم&gt; تعلیم کی ترتیبات میں انسٹرکٹر نام دینے کا نظام مرتب کریں۔
 DocType: Journal Entry,Paid Loan,ادا کردہ قرض
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py,Duplicate Entry. Please check Authorization Rule {0},انٹری نقل. براہ مہربانی چیک کریں کی اجازت حکمرانی {0}
 DocType: Journal Entry Account,Reference Due Date,حوالہ کی تاریخ کی تاریخ
@@ -4218,7 +4229,6 @@
 apps/erpnext/erpnext/templates/pages/projects.html,No time sheets,کوئی وقت شیٹس
 DocType: GoCardless Mandate,GoCardless Customer,GoCardless کسٹمر
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py,Leave Type {0} cannot be carry-forwarded,{0} لے بھیج دیا جائے نہیں کر سکتے ہیں کی قسم چھوڑ دو
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Item Code &gt; Item Group &gt; Brand,آئٹم کوڈ&gt; آئٹم گروپ&gt; برانڈ۔
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py,Maintenance Schedule is not generated for all the items. Please click on 'Generate Schedule',بحالی کے شیڈول تمام اشیاء کے لئے پیدا نہیں کر رہا. &#39;پیدا شیڈول&#39; پر کلک کریں براہ مہربانی
 ,To Produce,پیدا کرنے کے لئے
 DocType: Leave Encashment,Payroll,پے رول
@@ -4332,7 +4342,6 @@
 DocType: Stock Ledger Entry,Actual Qty After Transaction,ٹرانزیکشن کے بعد اصل مقدار
 ,Pending SO Items For Purchase Request,خریداری کی درخواست کے لئے بہت اشیا زیر التواء
 apps/erpnext/erpnext/education/doctype/student_admission/student_admission.py,Student Admissions,طالب علم داخلہ
-apps/erpnext/erpnext/accounts/party.py,{0} {1} is disabled,ترک ھو گیا ھے{0} {1}
 DocType: Supplier,Billing Currency,بلنگ کی کرنسی
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py,Extra Large,اضافی بڑا
 DocType: Loan,Loan Application,قرض کی درخواست
@@ -4409,7 +4418,6 @@
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py,Only Leave Applications with status 'Approved' and 'Rejected' can be submitted,صرف حیثیت کے ساتھ درخواستیں چھوڑ دو &#39;منظور&#39; اور &#39;مسترد&#39; جمع کی جا سکتی
 apps/erpnext/erpnext/accounts/doctype/accounting_dimension/accounting_dimension.py,Creating Dimensions...,طول و عرض کی تشکیل…
 apps/erpnext/erpnext/education/doctype/student_group_creation_tool/student_group_creation_tool.py,Student Group Name is mandatory in row {0},طالب علم گروپ کا نام صف {0} میں ضروری ہے
-DocType: Customer Credit Limit,Bypass credit limit_check,بائی پاس کریڈٹ کی حد_چیک۔
 DocType: Homepage,Products to be shown on website homepage,مصنوعات کی ویب سائٹ کے ہوم پیج پر دکھایا جائے گا
 DocType: HR Settings,Password Policy,پاس ورڈ کی پالیسی
 apps/erpnext/erpnext/setup/doctype/customer_group/customer_group.js,This is a root customer group and cannot be edited.,یہ ایک جڑ کسٹمر گروپ ہے اور میں ترمیم نہیں کیا جا سکتا.
@@ -4993,6 +5001,7 @@
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py,No {0} found for Inter Company Transactions.,انٹر کمپنی کی ٹرانسمیشن کے لئے کوئی {0} نہیں ملا.
 DocType: Travel Itinerary,Rented Car,کرایہ کار
 apps/erpnext/erpnext/public/js/hub/components/profile_dialog.js,About your Company,آپ کی کمپنی کے بارے میں
+apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.js,Show Stock Ageing Data,اسٹاک ایجنگ ڈیٹا دکھائیں۔
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py,Credit To account must be a Balance Sheet account,اکاؤنٹ کریڈٹ ایک بیلنس شیٹ اکاؤنٹ ہونا ضروری ہے
 DocType: Donor,Donor,ڈونر
 DocType: Global Defaults,Disable In Words,الفاظ میں غیر فعال کریں
@@ -5006,8 +5015,10 @@
 DocType: Patient,Patient ID,مریض کی شناخت
 DocType: Practitioner Schedule,Schedule Name,شیڈول کا نام
 DocType: Currency Exchange,For Buying,خریدنے کے لئے
+apps/erpnext/erpnext/setup/default_energy_point_rules.py,On Purchase Order Submission,خریداری کا آرڈر جمع کروانے پر۔
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js,Add All Suppliers,تمام سپلائرز شامل کریں
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py,Row #{0}: Allocated Amount cannot be greater than outstanding amount.,صف # {0}: مختص رقم بقایا رقم سے زیادہ نہیں ہو سکتا.
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Customer &gt; Customer Group &gt; Territory,کسٹمر&gt; کسٹمر گروپ&gt; علاقہ۔
 DocType: Tally Migration,Parties,پارٹیاں۔
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js,Browse BOM,براؤز BOM
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py,Secured Loans,محفوظ قرضوں
@@ -5037,6 +5048,7 @@
 DocType: Subscription,Past Due Date,ماضی کی تاریخ
 apps/erpnext/erpnext/hr/doctype/leave_block_list/leave_block_list.py,Date is repeated,تاریخ دہرایا گیا ہے
 apps/erpnext/erpnext/accounts/print_format/payment_receipt_voucher/payment_receipt_voucher.html,Authorized Signatory,مجاز دستخط
+apps/erpnext/erpnext/education/doctype/instructor/instructor.py,Please setup Instructor Naming System in Education &gt; Education Settings,براہ کرم تعلیم&gt; تعلیم کی ترتیبات میں انسٹرکٹر نام دینے کا نظام مرتب کریں۔
 apps/erpnext/erpnext/regional/doctype/gstr_3b_report/gstr_3b_report.html,Net ITC Available(A) - (B),نیٹ آئی ٹی سی دستیاب ہے (A) - (B)
 apps/erpnext/erpnext/education/doctype/fee_schedule/fee_schedule.js,Create Fees,فیس بنائیں
 DocType: Project,Total Purchase Cost (via Purchase Invoice),کل خریداری کی لاگت (انوائس خریداری کے ذریعے)
@@ -5057,6 +5069,7 @@
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.js,Message Sent,پیغام بھیجا
 apps/erpnext/erpnext/accounts/doctype/account/account.py,Account with child nodes cannot be set as ledger,بچے نوڈس کے ساتھ اکاؤنٹ اکاؤنٹ کے طور پر مقرر نہیں کیا جا سکتا
 DocType: C-Form,II,II
+apps/erpnext/erpnext/assets/report/fixed_asset_register/fixed_asset_register.py,Vendor Name,بیچنے والے کا نام
 DocType: Quiz Result,Wrong,غلط
 DocType: Sales Invoice,Rate at which Price list currency is converted to customer's base currency,شرح جس قیمت کی فہرست کرنسی میں گاہکوں کی بنیاد کرنسی تبدیل کیا جاتا ہے
 DocType: Purchase Invoice Item,Net Amount (Company Currency),نیول رقم (کمپنی کرنسی)
@@ -5295,6 +5308,7 @@
 DocType: Stock Settings,Auto Material Request,آٹو مواد کی درخواست
 DocType: Woocommerce Settings,API consumer secret,API صارفین کا راز
 DocType: Delivery Note Item,Available Batch Qty at From Warehouse,گودام سے پر دستیاب بیچ مقدار
+,Received Qty Amount,مقدار کی رقم موصول ہوئی۔
 DocType: Salary Slip,Gross Pay - Total Deduction - Loan Repayment,مجموعی پے - کل کٹوتی - قرض کی واپسی
 DocType: Bank Account,Last Integration Date,آخری انضمام کی تاریخ
 DocType: Expense Claim,Expense Taxes and Charges,اخراجات ٹیکس اور معاوضے۔
@@ -5753,6 +5767,8 @@
 DocType: Drug Prescription,Hour,قیامت
 DocType: Restaurant Order Entry,Last Sales Invoice,آخری سیلز انوائس
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py,Please select Qty against item {0},براہ کرم مقدار کے خلاف مقدار کا انتخاب کریں {0}
+apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py,Latest Age,تازہ ترین عمر۔
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js,Transfer Material to Supplier,سپلائر کے مواد کی منتقلی
 apps/erpnext/erpnext/hr/report/loan_repayment/loan_repayment.py,EMI,EMI
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py,New Serial No cannot have Warehouse. Warehouse must be set by Stock Entry or Purchase Receipt,نیا سیریل کوئی گودام ہیں کر سکتے ہیں. گودام اسٹاک اندراج یا خریداری کی رسید کی طرف سے مقرر کیا جانا چاہیے
 DocType: Lead,Lead Type,لیڈ کی قسم
@@ -5774,7 +5790,6 @@
 apps/erpnext/erpnext/hr/doctype/employee_benefit_application/employee_benefit_application.py,"An amount of {0} already claimed for the component {1},\
 						 set the amount equal or greater than {2}",اجزاء {1} کے لئے پہلے ہی دعوی کردہ {0} ، \ رقم کو {2} کے برابر یا اس سے زیادہ مقرر کریں
 DocType: Shipping Rule,Shipping Rule Conditions,شپنگ حکمرانی ضوابط
-DocType: Purchase Invoice,Export Type,برآمد کی قسم
 DocType: Salary Slip Loan,Salary Slip Loan,تنخواہ سلپ قرض
 DocType: BOM Update Tool,The new BOM after replacement,تبدیل کرنے کے بعد نئے BOM
 ,Point of Sale,فروخت پوائنٹ
@@ -5893,7 +5908,6 @@
 DocType: Purchase Order Item,Blanket Order Rate,کمبل آرڈر کی شرح
 ,Customer Ledger Summary,کسٹمر لیجر کا خلاصہ۔
 apps/erpnext/erpnext/hooks.py,Certification,تصدیق
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js,Are you sure you want to make debit note?,کیا آپ واقعی ڈیبٹ نوٹ بنانا چاہتے ہیں؟
 DocType: Bank Guarantee,Clauses and Conditions,بندوں اور شرائط
 DocType: Serial No,Creation Document Type,تخلیق دستاویز کی قسم
 DocType: Amazon MWS Settings,ES,ES
@@ -5931,8 +5945,6 @@
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py,Financial Services,مالیاتی خدمات
 DocType: Student Sibling,Student ID,طالب علم کی شناخت
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.js,For Quantity must be greater than zero,مقدار کے لئے صفر سے زیادہ ہونا ضروری ہے
-apps/erpnext/erpnext/hr/doctype/employee_transfer/employee_transfer.py,"Please delete the Employee <a href=""#Form/Employee/{0}"">{0}</a>\
-					to cancel this document","براہ کرم اس دستاویز کو منسوخ کرنے کے لئے ملازم <a href=""#Form/Employee/{0}"">{0}</a> delete کو حذف کریں۔"
 apps/erpnext/erpnext/config/projects.py,Types of activities for Time Logs,وقت لاگز کے لئے سرگرمیوں کی اقسام
 DocType: Opening Invoice Creation Tool,Sales,سیلز
 DocType: Stock Entry Detail,Basic Amount,بنیادی رقم
@@ -6011,6 +6023,7 @@
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py,Print and Stationery,پرنٹ اور سٹیشنری
 DocType: Stock Settings,Show Barcode Field,دکھائیں بارکوڈ فیلڈ
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js,Send Supplier Emails,پردایک ای میلز بھیجیں
+DocType: Asset Movement,ACC-ASM-.YYYY.-,ACC-ASM -YYYY.-
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py,"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,آٹو تیار
 apps/erpnext/erpnext/hr/doctype/employee_onboarding/employee_onboarding.py,Submit this to create the Employee record,ملازم کا ریکارڈ بنانے کے لئے اسے جمع کرو
@@ -6088,7 +6101,6 @@
 DocType: Sales Team,Contact No.,رابطہ نمبر
 apps/erpnext/erpnext/templates/includes/cart/cart_address.html,Billing Address is same as Shipping Address,بلنگ ایڈریس شپنگ ایڈریس کی طرح ہے۔
 DocType: Bank Reconciliation,Payment Entries,ادائیگی لکھے
-apps/erpnext/erpnext/erpnext_integrations/doctype/shopify_settings/shopify_settings.py,Access token or Shopify URL missing,رسائی ٹوکری یا Shopify یو آر ایل کو لاپتہ
 DocType: Location,Latitude,طول
 DocType: Work Order,Scrap Warehouse,سکریپ گودام
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py,"Warehouse required at Row No {0}, please set default warehouse for the item {1} for the company {2}",صف نمبر {0} میں گودام کی ضرورت ہے، براہ کرم کمپنی {2} کے لئے آئٹم {1} کے لئے ڈیفالٹ گودام مقرر کریں.
@@ -6132,7 +6144,6 @@
 DocType: Job Offer Term,Value / Description,ویلیو / تفصیل
 apps/erpnext/erpnext/controllers/accounts_controller.py,"Row #{0}: Asset {1} cannot be submitted, it is already {2}",قطار # {0}: اثاثہ {1} جمع نہیں کیا جا سکتا، یہ پہلے سے ہی ہے {2}
 DocType: Tax Rule,Billing Country,بلنگ کا ملک
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js,Are you sure you want to make credit note?,کیا آپ واقعی کریڈٹ نوٹ بنانا چاہتے ہیں؟
 DocType: Purchase Order Item,Expected Delivery Date,متوقع تاریخ کی ترسیل
 DocType: Restaurant Order Entry,Restaurant Order Entry,ریسٹورنٹ آرڈر انٹری
 apps/erpnext/erpnext/accounts/general_ledger.py,Debit and Credit not equal for {0} #{1}. Difference is {2}.,ڈیبٹ اور کریڈٹ {0} # کے لئے برابر نہیں {1}. فرق ہے {2}.
@@ -6256,6 +6267,7 @@
 DocType: Purchase Invoice,Taxes and Charges Added,ٹیکس اور الزامات شامل کر دیا گیا
 apps/erpnext/erpnext/assets/doctype/asset/asset.py,Depreciation Row {0}: Next Depreciation Date cannot be before Available-for-use Date,استحکام صف {0}: اگلے قیمتوں کا تعین تاریخ دستیاب - استعمال کے لئے تاریخ سے پہلے نہیں ہوسکتا ہے
 ,Sales Funnel,سیلز قیف
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Item Code &gt; Item Group &gt; Brand,آئٹم کوڈ&gt; آئٹم گروپ&gt; برانڈ۔
 apps/erpnext/erpnext/setup/doctype/company/company.py,Abbreviation is mandatory,مخفف لازمی ہے
 DocType: Project,Task Progress,ٹاسک پیش رفت
 apps/erpnext/erpnext/templates/includes/navbar/navbar_items.html,Cart,ٹوکری
@@ -6496,6 +6508,7 @@
 DocType: Employee Grade,Employee Grade,ملازم گریڈ
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py,Piecework,Piecework
 DocType: GSTR 3B Report,June,جون
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Supplier &gt; Supplier Type,سپلائر&gt; سپلائر کی قسم
 DocType: Share Balance,From No,نمبر سے نہیں
 DocType: Shift Type,Early Exit Grace Period,ابتدائی ایکزٹ گریس پیریڈ
 DocType: Task,Actual Time (in Hours),(گھنٹوں میں) اصل وقت
@@ -6778,6 +6791,7 @@
 DocType: Warehouse,Warehouse Name,گودام نام
 DocType: Naming Series,Select Transaction,منتخب ٹرانزیکشن
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py,Please enter Approving Role or Approving User,کردار کی منظوری یا صارف منظوری داخل کریں
+apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.py,UOM Conversion factor ({0} -&gt; {1}) not found for item: {2},UOM کے تبادلوں کا عنصر ({0} -&gt; {1}) آئٹم کے لئے نہیں ملا: {2}
 DocType: Journal Entry,Write Off Entry,انٹری لکھنے
 DocType: BOM,Rate Of Materials Based On,شرح معدنیات کی بنیاد پر
 DocType: Education Settings,"If enabled, field Academic Term will be Mandatory in Program Enrollment Tool.",اگر فعال ہو تو، فیلڈ تعلیمی ٹرم پروگرام کے اندراج کے آلے میں لازمی ہوگا.
@@ -6966,6 +6980,7 @@
 DocType: Quality Inspection Reading,Quality Inspection Reading,معیار معائنہ پڑھنا
 apps/erpnext/erpnext/stock/doctype/stock_settings/stock_settings.py,`Freeze Stocks Older Than` should be smaller than %d days.,`جھروکے سٹاکس پرانے Than`٪ d دن سے چھوٹا ہونا چاہئے.
 DocType: Tax Rule,Purchase Tax Template,ٹیکس سانچہ خریداری
+apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py,Earliest Age,ابتدائی عمر۔
 apps/erpnext/erpnext/utilities/user_progress.py,Set a sales goal you'd like to achieve for your company.,آپ کی کمپنی کے لئے حاصل کرنے کے لئے ایک فروخت کا مقصد مقرر کریں.
 DocType: Quality Goal,Revision,نظرثانی
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js,Healthcare Services,صحت کی خدمات
@@ -7009,6 +7024,7 @@
 apps/erpnext/erpnext/healthcare/doctype/patient_encounter/patient_encounter.js,Schedule Discharge,شیڈول ڈسچارج
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py,Cheques and Deposits incorrectly cleared,چیک اور ڈپازٹس غلط کی منظوری دے دی
 DocType: Homepage Section Card,Homepage Section Card,مرکزی صفحہ سیکشن کارڈ۔
+,Amount To Be Billed,بل ادا کرنے کی رقم
 apps/erpnext/erpnext/accounts/doctype/account/account.py,Account {0}: You can not assign itself as parent account,اکاؤنٹ {0}: آپ والدین کے اکاؤنٹ کے طور پر خود کی وضاحت نہیں کر سکتے ہیں
 DocType: Purchase Invoice Item,Price List Rate,قیمت کی فہرست شرح
 apps/erpnext/erpnext/utilities/activation.py,Create customer quotes,کسٹمر کی قیمت درج بنائیں
@@ -7061,6 +7077,7 @@
 DocType: Supplier Scorecard Criteria,Supplier Scorecard Criteria,سپلائر اسکور کارڈ معیار
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py,Please select Start Date and End Date for Item {0},شے کے لئے شروع کرنے کی تاریخ اور اختتام تاریخ کا انتخاب کریں براہ کرم {0}
 DocType: Maintenance Schedule,MAT-MSH-.YYYY.-,MAT-MSH -YYYY-
+,Amount to Receive,وصول کرنے کی رقم۔
 apps/erpnext/erpnext/education/doctype/student_group_creation_tool/student_group_creation_tool.py,Course is mandatory in row {0},قطار {0} کورس لازمی ہے
 apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py,From date can not be greater than than To date,تاریخ سے آج کی تاریخ سے زیادہ نہیں ہوسکتی ہے۔
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py,To date cannot be before from date,تاریخ کی تاریخ کی طرف سے پہلے نہیں ہو سکتا
@@ -7512,6 +7529,7 @@
 DocType: Delivery Note,Print Without Amount,رقم کے بغیر پرنٹ
 apps/erpnext/erpnext/accounts/report/asset_depreciation_ledger/asset_depreciation_ledger.py,Depreciation Date,ہراس تاریخ
 ,Work Orders in Progress,پیشرفت میں کام کے حکم
+DocType: Customer Credit Limit,Bypass Credit Limit Check,بائی پاس کریڈٹ حد کی جانچ پڑتال۔
 DocType: Issue,Support Team,سپورٹ ٹیم
 apps/erpnext/erpnext/stock/report/batch_item_expiry_status/batch_item_expiry_status.py,Expiry (In Days),ختم ہونے کی (دن میں)
 DocType: Appraisal,Total Score (Out of 5),(5 میں سے) کل اسکور
@@ -7694,6 +7712,7 @@
 DocType: Sales Invoice,Customer GSTIN,کسٹمر GSTIN
 DocType: Crop Cycle,List of diseases detected on the field. When selected it'll automatically add a list of tasks to deal with the disease ,میدان پر موجود بیماریوں کی فہرست. جب منتخب ہوجائے تو یہ خود بخود کاموں کی فہرست میں اضافہ کرے گی تاکہ بیماری سے نمٹنے کے لئے
 apps/erpnext/erpnext/manufacturing/page/bom_comparison_tool/bom_comparison_tool.js,BOM 1,BOM 1
+apps/erpnext/erpnext/assets/report/fixed_asset_register/fixed_asset_register.py,Asset Id,اثاثہ کی شناخت
 apps/erpnext/erpnext/healthcare/doctype/healthcare_service_unit/healthcare_service_unit.js,This is a root healthcare service unit and cannot be edited.,یہ جڑ صحت کی دیکھ بھال سروس یونٹ ہے اور اس میں ترمیم نہیں کیا جاسکتا ہے.
 DocType: Asset Repair,Repair Status,مرمت کی حیثیت
 apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.js,"Requested Qty: Quantity requested for purchase, but not ordered.",درخواست کردہ مقدار: مقدار میں خریداری کے لئے درخواست کی گئی ، لیکن حکم نہیں دیا گیا۔
diff --git a/erpnext/translations/uz.csv b/erpnext/translations/uz.csv
index d05c6ff..7471f5d 100644
--- a/erpnext/translations/uz.csv
+++ b/erpnext/translations/uz.csv
@@ -288,7 +288,6 @@
 DocType: Loan,Repay Over Number of Periods,Davr sonini qaytaring
 apps/erpnext/erpnext/manufacturing/report/bom_stock_report/bom_stock_report.py,Quantity to Produce can not be less than Zero,Ishlab chiqarish miqdori noldan kam bo&#39;lmasligi kerak
 DocType: Stock Entry,Additional Costs,Qo&#39;shimcha xarajatlar
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Customer &gt; Customer Group &gt; Territory,Xaridor&gt; Mijozlar guruhi&gt; Hudud
 apps/erpnext/erpnext/accounts/doctype/account/account.py,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
@@ -585,6 +584,7 @@
 DocType: Healthcare Settings,Create documents for sample collection,Namuna to&#39;plash uchun hujjatlarni yaratish
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py,Payment against {0} {1} cannot be greater than Outstanding Amount {2},{0} {1} ga nisbatan to&#39;lov Olingan miqdordan ortiq bo&#39;lmasligi mumkin {2}
 apps/erpnext/erpnext/patches/v11_0/add_healthcare_service_unit_tree_root.py,All Healthcare Service Units,Barcha sog&#39;liqni saqlash bo&#39;limlari
+apps/erpnext/erpnext/setup/default_energy_point_rules.py,On Converting Opportunity,Imkoniyatni o&#39;zgartirish to&#39;g&#39;risida
 DocType: Bank Account,Address HTML,HTML-manzil
 DocType: Lead,Mobile No.,Mobil telefon raqami
 apps/erpnext/erpnext/selling/doctype/pos_closing_voucher/closing_voucher_details.html,Mode of Payments,To&#39;lov tartibi
@@ -648,7 +648,6 @@
 DocType: Accounting Dimension,Dimension Name,O&#39;lchov nomi
 apps/erpnext/erpnext/healthcare/setup.py,Resistant,Chidamli
 apps/erpnext/erpnext/hotels/doctype/hotel_room_reservation/hotel_room_reservation.py,Please set Hotel Room Rate on {},"Iltimos, Hotel Room Rate ni {} belgilang."
-apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py,Please setup numbering series for Attendance via Setup &gt; Numbering Series,Iltimos Setup&gt; Raqamlash seriyalari orqali qatnashish uchun raqamlash seriyasini sozlang
 DocType: Journal Entry,Multi Currency,Ko&#39;p valyuta
 DocType: Bank Statement Transaction Invoice Item,Invoice Type,Faktura turi
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py,Valid from date must be less than valid upto date,Yaroqlilik muddati sanadan kam bo&#39;lishi kerak
@@ -763,6 +762,7 @@
 apps/erpnext/erpnext/accounts/page/pos/pos.js,Create a new Customer,Yangi xaridorni yarating
 apps/erpnext/erpnext/non_profit/report/expiring_memberships/expiring_memberships.py,Expiring On,Vaqt o&#39;tishi bilan
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,"If multiple Pricing Rules continue to prevail, users are asked to set Priority manually to resolve conflict.","Agar bir nechta narx qoidalari ustunlik qila boshlasa, foydalanuvchilardan nizoni hal qilish uchun birinchi o&#39;ringa qo&#39;l o&#39;rnatish talab qilinadi."
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js,Purchase Return,Xaridni qaytarish
 apps/erpnext/erpnext/utilities/activation.py,Create Purchase Orders,Buyurtma buyurtmalarini yaratish
 ,Purchase Register,Xarid qilish Register
 apps/erpnext/erpnext/healthcare/doctype/patient/patient.py,Patient not found,Kasal topilmadi
@@ -778,7 +778,6 @@
 DocType: Location,Area UOM,Maydoni UOM
 apps/erpnext/erpnext/manufacturing/doctype/workstation/workstation.py,Workstation is closed on the following dates as per Holiday List: {0},Ish stantsiyasi quyidagi holatlarda Dam olish Ro&#39;yxatiga binoan yopiladi: {0}
 apps/erpnext/erpnext/selling/page/sales_funnel/sales_funnel.py,Opportunities,Imkoniyatlar
-apps/erpnext/erpnext/www/all-products/index.html,Clear filters,Filtrlarni tozalang
 DocType: Lab Test Template,Single,Yagona
 DocType: Compensatory Leave Request,Work From Date,Sana boshlab ishlash
 DocType: Salary Slip,Total Loan Repayment,Jami kreditni qaytarish
@@ -821,6 +820,7 @@
 DocType: Account,Old Parent,Eski ota-ona
 apps/erpnext/erpnext/education/doctype/program_enrollment_tool/program_enrollment_tool.py,Mandatory field - Academic Year,Majburiy maydon - Akademik yil
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py,{0} {1} is not associated with {2} {3},{0} {1} {2} {3} bilan bog&#39;lanmagan
+DocType: Opportunity,Converted By,O‘zgartirilgan:
 apps/erpnext/erpnext/public/js/hub/components/ReviewArea.vue,You need to login as a Marketplace User before you can add any reviews.,Sharhlar qo&#39;shishdan oldin siz Marketplace foydalanuvchisi sifatida tizimga kirishingiz kerak.
 apps/erpnext/erpnext/manufacturing/doctype/job_card/job_card.py,Row {0} : Operation is required against the raw material item {1},Row {0}: {1} xom ashyo moddasiga qarshi operatsiyalar talab qilinadi
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py,Please set default payable account for the company {0},"Iltimos, {0} kompaniyangiz uchun to&#39;langan pulli hisobni tanlang"
@@ -846,6 +846,8 @@
 DocType: BOM,Work Order,Ish tartibi
 DocType: Sales Invoice,Total Qty,Jami Miqdor
 apps/erpnext/erpnext/education/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py,Guardian2 Email ID,Guardian2 Email identifikatori
+apps/erpnext/erpnext/hr/doctype/employee_transfer/employee_transfer.py,"Please delete the Employee <a href=""#Form/Employee/{0}"">{0}</a>\
+					to cancel this document","Ushbu hujjatni bekor qilish uchun <a href=""#Form/Employee/{0}"">{0}</a> \ xodimini o&#39;chiring"
 DocType: Item,Show in Website (Variant),Saytda ko&#39;rsatish (variant)
 DocType: Employee,Health Concerns,Sog&#39;liq muammolari
 DocType: Payroll Entry,Select Payroll Period,Ajratish davrini tanlang
@@ -905,7 +907,6 @@
 DocType: Codification Table,Codification Table,Kodlashtirish jadvali
 DocType: Timesheet Detail,Hrs,Hr
 apps/erpnext/erpnext/manufacturing/page/bom_comparison_tool/bom_comparison_tool.js,Changes in {0},{0} -dagi o&#39;zgarishlar
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js,Please select Company,"Iltimos, Kompaniya-ni tanlang"
 DocType: Employee Skill,Employee Skill,Xodimlarning malakasi
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.js,Difference Account,Farq hisob
 DocType: Pricing Rule,Discount on Other Item,Boshqa band bo&#39;yicha chegirma
@@ -973,6 +974,7 @@
 DocType: BOM,Operating Cost,Operatsion xarajatlar
 DocType: Crop,Produced Items,Ishlab chiqarilgan narsalar
 DocType: Bank Statement Transaction Entry,Match Transaction to Invoices,Xarajatlarni hisob-kitob qilish
+apps/erpnext/erpnext/erpnext_integrations/exotel_integration.py,Error in Exotel incoming call,Exotel kirish qo&#39;ng&#39;irog&#39;idagi xato
 DocType: Sales Order Item,Gross Profit,Yalpi foyda
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js,Unblock Invoice,Billingni to&#39;siqdan olib tashlash
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py,Increment cannot be 0,Artish 0 bo&#39;lishi mumkin emas
@@ -1184,6 +1186,7 @@
 DocType: Activity Cost,Activity Type,Faollik turi
 DocType: Request for Quotation,For individual supplier,Shaxsiy yetkazib beruvchilar uchun
 DocType: BOM Operation,Base Hour Rate(Company Currency),Asosiy soatingiz (Kompaniya valyutasi)
+,Qty To Be Billed,Hisobni to&#39;lash kerak
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py,Delivered Amount,Miqdori topshirilgan
 apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.js,Reserved Qty for Production: Raw materials quantity to make manufacturing items.,Ishlab chiqarish uchun zahiralangan miqdor: ishlab chiqarish buyumlarini tayyorlash uchun xom ashyo miqdori.
 DocType: Loyalty Point Entry Redemption,Redemption Date,Qaytarilish sanasi
@@ -1302,7 +1305,7 @@
 DocType: Sales Invoice,Commission Rate (%),Komissiya darajasi (%)
 apps/erpnext/erpnext/education/doctype/student_group/student_group.py,Please select Program,"Iltimos, Dasturni tanlang"
 DocType: Project,Estimated Cost,Bashoratli narxlar
-DocType: Request for Quotation,Link to material requests,Materiallar so&#39;rovlariga havola
+DocType: Supplier Quotation,Link to material requests,Materiallar so&#39;rovlariga havola
 apps/erpnext/erpnext/public/js/hub/pages/Publish.vue,Publish,Nashr qiling
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py,Aerospace,Aerokosmos
 ,Fichier des Ecritures Comptables [FEC],Fichier des Ecritures Kompartiyalari [FEC]
@@ -1315,6 +1318,7 @@
 apps/erpnext/erpnext/utilities/transaction_base.py,Invalid Posting Time,Noto&#39;g&#39;ri joylashtirish vaqti
 DocType: Salary Component,Condition and Formula,Vaziyat va formulalar
 DocType: Lead,Campaign Name,Kampaniya nomi
+apps/erpnext/erpnext/setup/default_energy_point_rules.py,On Task Completion,Vazifalarni tugatish to&#39;g&#39;risida
 apps/erpnext/erpnext/hr/doctype/compensatory_leave_request/compensatory_leave_request.py,There is no leave period in between {0} and {1},{0} va {1} o&#39;rtasida hech qanday ijara muddati mavjud emas
 DocType: Fee Validity,Healthcare Practitioner,Sog&#39;liqni saqlash amaliyoti
 DocType: Hotel Room,Capacity,Imkoniyatlar
@@ -1659,7 +1663,6 @@
 DocType: Quality Feedback Template,Quality Feedback Template,Sifat bo&#39;yicha fikrlar shablonlari
 apps/erpnext/erpnext/config/education.py,LMS Activity,LMS faoliyati
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py,Internet Publishing,Internet-nashriyot
-DocType: Prescription Duration,Number,Raqam
 apps/erpnext/erpnext/accounts/doctype/opening_invoice_creation_tool/opening_invoice_creation_tool.js,Creating {0} Invoice,{0} Billingni yaratish
 DocType: Medical Code,Medical Code Standard,Tibbiyot kodeksi
 DocType: Soil Texture,Clay Composition (%),Gil tarkibi (%)
@@ -1734,6 +1737,7 @@
 DocType: Support Settings,Get Started Sections,Boshlash bo&#39;limlari
 DocType: Lead,CRM-LEAD-.YYYY.-,CRM-LEAD-YYYYY.-
 DocType: Invoice Discounting,Sanctioned,Sanktsiya
+,Base Amount,Baza miqdori
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.js,Total Contribution Amount: {0},Jami qo&#39;shilgan qiymat: {0}
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py,Row #{0}: Please specify Serial No for Item {1},"Row # {0}: Iltimos, mahsulot uchun {1}"
 DocType: Payroll Entry,Salary Slips Submitted,Ish haqi miqdori berildi
@@ -1951,6 +1955,7 @@
 apps/erpnext/erpnext/utilities/user_progress.py,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.
 DocType: Accounting Dimension,Dimension Defaults,O&#39;lchov standartlari
 apps/erpnext/erpnext/crm/report/prospects_engaged_but_not_converted/prospects_engaged_but_not_converted.js,Minimum Lead Age (Days),Minimal qo&#39;rg&#39;oshin yoshi (kunlar)
+apps/erpnext/erpnext/assets/report/fixed_asset_register/fixed_asset_register.py,Available For Use Date,Foydalanish sanasi uchun mavjud
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py,All BOMs,Barcha BOMlar
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js,Create Inter Company Journal Entry,Inter Company jurnaliga yozuv yarating
 DocType: Company,Parent Company,Bosh kompaniya
@@ -2015,6 +2020,7 @@
 ,IRS 1099,IRS 1099
 DocType: Salary Slip,Leave Without Pay,To&#39;lovsiz qoldiring
 DocType: Payment Request,Outward,Tashqaridan
+apps/erpnext/erpnext/setup/default_energy_point_rules.py,On {0} Creation,{0} Yaratilishda
 apps/erpnext/erpnext/regional/doctype/gstr_3b_report/gstr_3b_report.html,State/UT Tax,Davlat / UT solig&#39;i
 ,Trial Balance for Party,Tomonlar uchun sinov balansi
 ,Gross and Net Profit Report,Yalpi va sof foyda haqida hisobot
@@ -2130,6 +2136,7 @@
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js,Make Stock Entry,Birjaga kirishni amalga oshiring
 DocType: Hotel Room Reservation,Hotel Reservation User,Mehmonxona Rezervasyoni
 apps/erpnext/erpnext/projects/doctype/project/project.js,Set Status,Holatni o&#39;rnating
+apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py,Please setup numbering series for Attendance via Setup &gt; Numbering Series,Iltimos Setup&gt; Raqamlash seriyalari orqali qatnashish uchun raqamlash seriyasini sozlang
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py,Please select prefix first,"Iltimos, avval prefiksni tanlang"
 DocType: Contract,Fulfilment Deadline,Tugatish muddati
 apps/erpnext/erpnext/public/js/hub/pages/Home.vue,Near you,Yoningizda
@@ -2145,6 +2152,7 @@
 DocType: Announcement,All Students,Barcha talabalar
 apps/erpnext/erpnext/assets/doctype/asset/asset.py,Item {0} must be a non-stock item,{0} elementi qimmatli bo&#39;lmagan mahsulot bo&#39;lishi kerak
 apps/erpnext/erpnext/stock/doctype/batch/batch.js,View Ledger,Ledger-ni ko&#39;rib chiqing
+DocType: Cost Center,Lft,Lft
 DocType: Grading Scale,Intervals,Intervallar
 DocType: Bank Statement Transaction Entry,Reconciled Transactions,Qabul qilingan operatsiyalar
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py,Earliest,Eng qadimgi
@@ -2260,6 +2268,7 @@
 apps/erpnext/erpnext/hr/doctype/employee_benefit_application/employee_benefit_application.py,As per your assigned Salary Structure you cannot apply for benefits,Sizning belgilangan Ma&#39;ruza tuzilishiga ko&#39;ra siz nafaqa olish uchun ariza bera olmaysiz
 apps/erpnext/erpnext/stock/doctype/item/item.py,Website Image should be a public file or website URL,Veb-sayt rasmiy umumiy fayl yoki veb-sayt URL bo&#39;lishi kerak
 DocType: Purchase Invoice Item,BOM,BOM
+apps/erpnext/erpnext/stock/doctype/item/item.py,Duplicate entry in Manufacturers table,Ishlab chiqaruvchilar jadvalidagi yozuvlarning nusxalari
 apps/erpnext/erpnext/setup/doctype/item_group/item_group.js,This is a root item group and cannot be edited.,Bu ildiz elementlar guruhidir va tahrirlanmaydi.
 apps/erpnext/erpnext/accounts/doctype/account/account.js,Merge,Birlashtirish
 DocType: Journal Entry Account,Purchase Order,Xarid buyurtmasi
@@ -2404,7 +2413,6 @@
 DocType: Asset,Depreciation Schedules,Amortizatsiya jadvallari
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.js,Create Sales Invoice,Savdo fakturasini yarating
 apps/erpnext/erpnext/regional/doctype/gstr_3b_report/gstr_3b_report.html,Ineligible ITC,Nomaqbul ITC
-apps/erpnext/erpnext/erpnext_integrations/doctype/shopify_settings/shopify_settings.py,"Support for public app is deprecated. Please setup private app, for more details refer user manual",Davlat ilovasini qo&#39;llab-quvvatlash bekor qilindi. Batafsil ma&#39;lumot uchun foydalanuvchi qo&#39;llanmasini ko&#39;ring
 DocType: Task,Dependent Tasks,Bog&#39;lanish vazifalari
 apps/erpnext/erpnext/regional/report/gstr_1/gstr_1.py,Following accounts might be selected in GST Settings:,GST sozlamalarida quyidagi hisoblarni tanlash mumkin:
 apps/erpnext/erpnext/manufacturing/report/bom_stock_report/bom_stock_report.js,Quantity to Produce,Ishlab chiqarish miqdori
@@ -2654,6 +2662,7 @@
 DocType: Water Analysis,Container,Idish
 apps/erpnext/erpnext/regional/report/gstr_1/gstr_1.py,Please set valid GSTIN No. in Company Address,"Iltimos, kompaniya manzilida haqiqiy GSTIN raqamini kiriting"
 apps/erpnext/erpnext/education/utils.py,Student {0} - {1} appears Multiple times in row {2} & {3},Isoning shogirdi {0} - {1} qatori {2} &amp; {3}
+apps/erpnext/erpnext/selling/doctype/customer/customer.py,Following fields are mandatory to create address:,Manzil yaratish uchun quyidagi maydonlar majburiydir:
 DocType: Item Alternative,Two-way,Ikki tomonlama
 DocType: Item,Manufacturers,Ishlab chiqaruvchilar
 apps/erpnext/erpnext/accounts/deferred_revenue.py,Error while processing deferred accounting for {0},{0} uchun buxgalteriya hisobini qayta ishlashda xatolik
@@ -2728,9 +2737,9 @@
 DocType: Employee,HR-EMP-,HR-EMP-
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py,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: Quality Meeting Minutes,Quality Meeting Minutes,Sifatli uchrashuv protokoli
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Supplier &gt; Supplier Type,Ta&#39;minotchi&gt; Ta&#39;minotchi turi
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py,Employee Referral,Xodimga murojaat
 DocType: Student Group,Set 0 for no limit,Hech qanday chegara uchun 0-ni tanlang
+DocType: Cost Center,rgt,rgt
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py,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.
 DocType: Customer,Primary Address and Contact Detail,Birlamchi manzil va aloqa ma&#39;lumotlari
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.js,Resend Payment Email,To&#39;lov E-pochtasini qayta yuboring
@@ -2838,7 +2847,6 @@
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py,Against Supplier Invoice {0} dated {1},{1} {0} etkazib beruvchi hisob-fakturasiga qarshi
 DocType: Customer,Default Price List,Standart narx ro&#39;yxati
 apps/erpnext/erpnext/assets/doctype/asset/asset.py,Asset Movement record {0} created,Aktivlar harakati qaydlari {0} yaratildi
-apps/erpnext/erpnext/utilities/page/leaderboard/leaderboard.js,No items found.,Hech qanday mahsulot topilmadi.
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py,You cannot delete Fiscal Year {0}. Fiscal Year {0} is set as default in Global Settings,Moliyaviy yil {0} ni o&#39;chirib bo&#39;lmaydi. Moliyaviy yil {0} global sozlamalarda sukut o&#39;rnatilgan
 DocType: Share Transfer,Equity/Liability Account,Haqiqiylik / Mas&#39;uliyat hisobi
 apps/erpnext/erpnext/setup/doctype/customer_group/customer_group.py,A customer with the same name already exists,Xuddi shu nomga ega bo&#39;lgan mijoz allaqachon mavjud
@@ -2854,6 +2862,7 @@
 apps/erpnext/erpnext/selling/doctype/customer/customer.py,Credit limit has been crossed for customer {0} ({1}/{2}),Xaridor uchun {0} ({1} / {2}) krediti cheklanganligi
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py,Customer required for 'Customerwise Discount',&quot;Customerwise-ning dasturi&quot;
 apps/erpnext/erpnext/config/accounting.py,Update bank payment dates with journals.,Bankdagi to&#39;lov kunlarini jurnallar bilan yangilang.
+,Billed Qty,Qty hisoblangan
 apps/erpnext/erpnext/stock/doctype/item/item_dashboard.py,Pricing,Raqobatchilar
 DocType: Employee,Attendance Device ID (Biometric/RF tag ID),Ishtirok etish moslamasi identifikatori (Biometrik / RF yorlig&#39;i identifikatori)
 DocType: Quotation,Term Details,Terim detallari
@@ -2875,6 +2884,7 @@
 DocType: Share Transfer,Asset Account,Shaxs hisoblari
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js,New release date should be in the future,Yangi chiqarilgan sana kelajakda bo&#39;lishi kerak
 DocType: Purchase Invoice,End date of current invoice's period,Joriy hisob-kitob davri tugash sanasi
+apps/erpnext/erpnext/hr/doctype/employee/employee.py,Please setup Employee Naming System in Human Resource &gt; HR Settings,"Iltimos, xodimlarni nomlash tizimini inson resurslari&gt; Kadrlar sozlamalarida o&#39;rnating"
 DocType: Lab Test,Technician Name,Texnik nom
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py,"Cannot ensure delivery by Serial No as \
 					Item {0} is added with and without Ensure Delivery by \
@@ -2882,6 +2892,7 @@
 DocType: Accounts Settings,Unlink Payment on Cancellation of Invoice,Billingni bekor qilish bo&#39;yicha to&#39;lovni uzish
 DocType: Bank Reconciliation,From Date,Sana bo&#39;yicha
 apps/erpnext/erpnext/hr/doctype/vehicle_log/vehicle_log.py,Current Odometer reading entered should be greater than initial Vehicle Odometer {0},Qo`yilgan O`chiratkichni o`zgartirishni o`zgartirish dastlabki Avtomobil Odometridan {0}
+,Purchase Order Items To Be Received or Billed,Qabul qilinishi yoki to&#39;ldirilishi kerak bo&#39;lgan buyurtma buyumlari
 DocType: Restaurant Reservation,No Show,Ko&#39;rish yo&#39;q
 apps/erpnext/erpnext/regional/india/utils.py,You must be a registered supplier to generate e-Way Bill,Elektron yo&#39;lni yaratish uchun siz ro&#39;yxatdan o&#39;tgan etkazib beruvchingiz bo&#39;lishingiz kerak
 DocType: Shipping Rule Country,Shipping Rule Country,Yuk tashish qoidalari mamlakat
@@ -2924,6 +2935,7 @@
 apps/erpnext/erpnext/templates/generators/item/item_add_to_cart.html,View in Cart,Savatda ko&#39;rish
 DocType: Employee Checkin,Shift Actual Start,Shift haqiqiy boshlanishi
 DocType: Tally Migration,Is Day Book Data Imported,Kunlik kitob ma&#39;lumotlari import qilinadi
+,Purchase Order Items To Be Received or Billed1,Qabul qilinishi yoki to&#39;lanishi kerak bo&#39;lgan buyurtma buyumlari1
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py,Marketing Expenses,Marketing xarajatlari
 apps/erpnext/erpnext/stock/doctype/pick_list/pick_list.py,{0} units of {1} is not available.,{0} {1} birliklari mavjud emas.
 ,Item Shortage Report,Mavzu kamchiliklari haqida hisobot
@@ -3148,7 +3160,6 @@
 apps/erpnext/erpnext/public/js/call_popup/call_popup.js,View all issues from {0},{0} dan barcha muammolarni ko&#39;rish
 DocType: Quality Inspection,MAT-QA-.YYYY.-,MAT-QA-.YYYY.-
 DocType: Quality Meeting Table,Quality Meeting Table,Sifatli uchrashuv jadvali
-apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,"Iltimos, sozlash&gt; Sozlamalar&gt; Nomlash seriyalari orqali {0} uchun nomlash seriyasini o&#39;rnating"
 apps/erpnext/erpnext/templates/pages/help.html,Visit the forums,Forumlarga tashrif buyuring
 DocType: Student,Student Mobile Number,Isoning shogirdi mobil raqami
 DocType: Item,Has Variants,Varyantlar mavjud
@@ -3290,6 +3301,7 @@
 DocType: Homepage Section,Section Cards,Bo&#39;lim kartalari
 ,Campaign Efficiency,Kampaniya samaradorligi
 DocType: Discussion,Discussion,Munozara
+apps/erpnext/erpnext/setup/default_energy_point_rules.py,On Sales Order Submission,Savdo buyurtmasini topshirish to&#39;g&#39;risida
 DocType: Bank Transaction,Transaction ID,Jurnal identifikatori
 DocType: Payroll Entry,Deduct Tax For Unsubmitted Tax Exemption Proof,Belgilangan soliq imtiyozlarini tasdiqlash uchun olinadigan soliq
 DocType: Volunteer,Anytime,Har doim
@@ -3297,7 +3309,6 @@
 DocType: Employee Tax Exemption Proof Submission,Employee Tax Exemption Proof Submission,Ish beruvchi soliq imtiyozlari tasdiqlash
 DocType: Patient,Surgical History,Jarrohlik tarixi
 DocType: Bank Statement Settings Item,Mapped Header,Joylashtirilgan sarlavha
-apps/erpnext/erpnext/hr/doctype/employee/employee.py,Please setup Employee Naming System in Human Resource &gt; HR Settings,"Iltimos, xodimlarni nomlash tizimini inson resurslari&gt; Kadrlar sozlamalarida o&#39;rnating"
 DocType: Employee,Resignation Letter Date,Ishdan bo&#39;shatish xati
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Pricing Rules are further filtered based on quantity.,Raqobatchilar qoidalari miqdori bo&#39;yicha qo&#39;shimcha ravishda filtrlanadi.
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py,Please set the Date Of Joining for employee {0},"Iltimos, xodimingizga {0}"
@@ -3311,6 +3322,7 @@
 DocType: Bank Statement Settings,Mapped Items,Eşlenmiş ma&#39;lumotlar
 DocType: Amazon MWS Settings,IT,IT
 DocType: Chapter,Chapter,Bo&#39;lim
+,Fixed Asset Register,Ruxsat berilgan mulk registri
 apps/erpnext/erpnext/utilities/user_progress.py,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,Select BOM and Qty for Production,Ishlab chiqarish uchun BOM va Qty ni tanlang
@@ -3446,7 +3458,6 @@
 apps/erpnext/erpnext/templates/emails/reorder_item.html,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"
 apps/erpnext/erpnext/controllers/accounts_controller.py,Account {0} is invalid. Account Currency must be {1},Hisob {0} yaroqsiz. Hisob valyutasi {1} bo&#39;lishi kerak
 apps/erpnext/erpnext/hr/doctype/salary_structure_assignment/salary_structure_assignment.py,From Date {0} cannot be after employee's relieving Date {1},"{0} sanasidan, xodimning ozod etilgan kunidan keyin bo&#39;lishi mumkin emas {1}"
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py,Debit Note {0} has been created automatically,{0} debet eslatmasi avtomatik ravishda yaratildi
 apps/erpnext/erpnext/accounts/doctype/payment_order/payment_order.js,Create Payment Entries,To&#39;lov yozuvlarini yarating
 DocType: Supplier,Is Internal Supplier,Ichki ta&#39;minotchi
 DocType: Employee,Create User Permission,Foydalanuvchi uchun ruxsat yaratish
@@ -4005,7 +4016,6 @@
 DocType: Project User,Project Status,Loyiha holati
 DocType: UOM,Check this to disallow fractions. (for Nos),Fraktsiyalarni taqiqlash uchun buni tanlang. (Nos uchun)
 DocType: Student Admission Program,Naming Series (for Student Applicant),Nom turkumi (talabalar uchun)
-apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.py,UOM Conversion factor ({0} -&gt; {1}) not found for item: {2},UOM konversiyalash koeffitsienti ({0} -&gt; {1}) quyidagi element uchun topilmadi: {2}
 apps/erpnext/erpnext/hr/doctype/retention_bonus/retention_bonus.py,Bonus Payment Date cannot be a past date,Bonus To&#39;lov sanasi o&#39;tgan sana bo&#39;la olmaydi
 DocType: Travel Request,Copy of Invitation/Announcement,Taklifnomaning nusxasi
 DocType: Practitioner Service Unit Schedule,Practitioner Service Unit Schedule,Amaliyotshunoslik xizmati bo&#39;limi jadvali
@@ -4153,6 +4163,7 @@
 apps/erpnext/erpnext/utilities/user_progress.py,Setup Company,Kompaniya o&#39;rnatish
 ,Lab Test Report,Laborotoriya test hisobot
 DocType: Employee Benefit Application,Employee Benefit Application,Ish beruvchining nafaqasi
+apps/erpnext/erpnext/accounts/doctype/invoice_discounting/invoice_discounting.py,Row({0}): {1} is already discounted in {2},Satr ({0}): {1} allaqachon {2} da chegirma qilingan
 apps/erpnext/erpnext/hr/doctype/additional_salary/additional_salary.py,Additional Salary Component Exists.,Ish haqi bo&#39;yicha qo&#39;shimcha komponentlar mavjud.
 DocType: Purchase Invoice,Unregistered,Ro&#39;yxatdan o&#39;tmagan
 DocType: Student Applicant,Application Date,Ilova sanasi
@@ -4229,7 +4240,6 @@
 DocType: Journal Entry,Accounting Entries,Buxgalteriya yozuvlari
 DocType: Job Card Time Log,Job Card Time Log,Ish kartalari vaqt jurnali
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,"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."
-apps/erpnext/erpnext/education/doctype/instructor/instructor.py,Please setup Instructor Naming System in Education &gt; Education Settings,"Iltimos, Ta&#39;limni sozlashda o&#39;qituvchiga nom berish tizimini sozlang"
 DocType: Journal Entry,Paid Loan,Pulli kredit
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py,Duplicate Entry. Please check Authorization Rule {0},"Ikki nusxadagi yozuv. Iltimos, tasdiqlash qoidasini {0}"
 DocType: Journal Entry Account,Reference Due Date,Malumot sanasi
@@ -4246,7 +4256,6 @@
 apps/erpnext/erpnext/templates/pages/projects.html,No time sheets,Vaqt yo&#39;q
 DocType: GoCardless Mandate,GoCardless Customer,GoCardsiz mijoz
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py,Leave Type {0} cannot be carry-forwarded,{0} to`xtab turish mumkin emas
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Item Code &gt; Item Group &gt; Brand,Element kodi&gt; Mahsulotlar guruhi&gt; Tovar
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py,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
 DocType: Leave Encashment,Payroll,Ish haqi
@@ -4361,7 +4370,6 @@
 DocType: Stock Ledger Entry,Actual Qty After Transaction,Jurnal so&#39;ng haqiqiy miqdori
 ,Pending SO Items For Purchase Request,Buyurtma so&#39;rovini bajarish uchun buyurtmalarni bekor qilish
 apps/erpnext/erpnext/education/doctype/student_admission/student_admission.py,Student Admissions,Talabalarni qabul qilish
-apps/erpnext/erpnext/accounts/party.py,{0} {1} is disabled,{0} {1} o&#39;chirib qo&#39;yilgan
 DocType: Supplier,Billing Currency,To&#39;lov valyutasi
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py,Extra Large,Juda katta
 DocType: Loan,Loan Application,Kreditlash uchun ariza
@@ -4438,7 +4446,6 @@
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py,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/accounts/doctype/accounting_dimension/accounting_dimension.py,Creating Dimensions...,O&#39;lchovlar yaratilmoqda ...
 apps/erpnext/erpnext/education/doctype/student_group_creation_tool/student_group_creation_tool.py,Student Group Name is mandatory in row {0},Isoning shogirdi guruhi nomi {0} qatorida majburiydir.
-DocType: Customer Credit Limit,Bypass credit limit_check,Kredit limiti_checkini chetlab o&#39;tish
 DocType: Homepage,Products to be shown on website homepage,Veb-saytning asosiy sahifasida ko&#39;rsatiladigan mahsulotlar
 DocType: HR Settings,Password Policy,Parol siyosati
 apps/erpnext/erpnext/setup/doctype/customer_group/customer_group.js,This is a root customer group and cannot be edited.,Bu ildiz mijozlar guruhidir va tahrirlanmaydi.
@@ -4730,6 +4737,7 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py,Row {0}: Advance against Customer must be credit,Row {0}: mijozga qarshi avans kredit bo&#39;lishi kerak
 DocType: Quality Meeting,Quality Meeting,Sifat uchrashuvi
 apps/erpnext/erpnext/accounts/doctype/account/account.js,Non-Group to Group,Guruh bo&#39;lmagan guruhga
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,"Iltimos, sozlash&gt; Sozlamalar&gt; Nomlash seriyalari orqali {0} uchun nomlash seriyasini o&#39;rnating"
 DocType: Employee,ERPNext User,ERPNext Foydalanuvchi
 apps/erpnext/erpnext/education/doctype/student_group_creation_tool/student_group_creation_tool.py,Batch is mandatory in row {0},{0} qatorida paketli bo&#39;lish kerak
 DocType: Company,Default Buying Terms,Odatiy sotib olish shartlari
@@ -5024,6 +5032,7 @@
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py,No {0} found for Inter Company Transactions.,Inter kompaniyasi operatsiyalari uchun {0} topilmadi.
 DocType: Travel Itinerary,Rented Car,Avtomobil lizing
 apps/erpnext/erpnext/public/js/hub/components/profile_dialog.js,About your Company,Sizning kompaniyangiz haqida
+apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.js,Show Stock Ageing Data,Birja qarishi haqidagi ma&#39;lumotni ko&#39;rsatish
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py,Credit To account must be a Balance Sheet account,Hisobga olish uchun Hisob balansi yozuvi bo&#39;lishi kerak
 DocType: Donor,Donor,Donor
 DocType: Global Defaults,Disable In Words,So&#39;zlarda o&#39;chirib qo&#39;yish
@@ -5038,8 +5047,10 @@
 DocType: Practitioner Schedule,Schedule Name,Jadval nomi
 apps/erpnext/erpnext/regional/doctype/gstr_3b_report/gstr_3b_report.py,Please enter GSTIN and state for the Company Address {0},"Iltimos, GSTIN-ni kiriting va kompaniyaning manzili {0} ni ko&#39;rsating."
 DocType: Currency Exchange,For Buying,Sotib olish uchun
+apps/erpnext/erpnext/setup/default_energy_point_rules.py,On Purchase Order Submission,Xarid buyurtmasini berish to&#39;g&#39;risida
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js,Add All Suppliers,Barcha etkazib beruvchilarni qo&#39;shish
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py,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/accounts/doctype/pricing_rule/pricing_rule.js,Customer &gt; Customer Group &gt; Territory,Xaridor&gt; Mijozlar guruhi&gt; Hudud
 DocType: Tally Migration,Parties,Tomonlar
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js,Browse BOM,BOM-ga ko&#39;z tashlang
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py,Secured Loans,Kafolatlangan kreditlar
@@ -5071,6 +5082,7 @@
 apps/erpnext/erpnext/stock/doctype/item_alternative/item_alternative.py,Not allow to set alternative item for the item {0},{0} elementi uchun muqobil elementni o&#39;rnatishga ruxsat berish
 apps/erpnext/erpnext/hr/doctype/leave_block_list/leave_block_list.py,Date is repeated,Sana takrorlanadi
 apps/erpnext/erpnext/accounts/print_format/payment_receipt_voucher/payment_receipt_voucher.html,Authorized Signatory,Vakolatli vakil
+apps/erpnext/erpnext/education/doctype/instructor/instructor.py,Please setup Instructor Naming System in Education &gt; Education Settings,"Iltimos, Ta&#39;limni sozlashda o&#39;qituvchiga nom berish tizimini sozlang"
 apps/erpnext/erpnext/regional/doctype/gstr_3b_report/gstr_3b_report.html,Net ITC Available(A) - (B),Mavjud ITC (A) - (B)
 apps/erpnext/erpnext/education/doctype/fee_schedule/fee_schedule.js,Create Fees,Narxlarni yarating
 DocType: Project,Total Purchase Cost (via Purchase Invoice),Jami xarid qiymati (Xarid qilish byudjeti orqali)
@@ -5091,6 +5103,7 @@
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.js,Message Sent,Xabar yuborildi
 apps/erpnext/erpnext/accounts/doctype/account/account.py,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/assets/report/fixed_asset_register/fixed_asset_register.py,Vendor Name,Sotuvchi nomi
 DocType: Quiz Result,Wrong,Noto&#39;g&#39;ri
 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)
@@ -5334,6 +5347,7 @@
 DocType: Stock Settings,Auto Material Request,Avtomatik material talab
 DocType: Woocommerce Settings,API consumer secret,API iste&#39;molchi sirlari
 DocType: Delivery Note Item,Available Batch Qty at From Warehouse,QXIdan mavjud bo&#39;lgan ommaviy miqdori
+,Received Qty Amount,Qty miqdorini oldi
 DocType: Salary Slip,Gross Pay - Total Deduction - Loan Repayment,Brüt to&#39;lash - Jami cheklov - Kreditni qaytarish
 DocType: Bank Account,Last Integration Date,So&#39;nggi integratsiya sanasi
 DocType: Expense Claim,Expense Taxes and Charges,Xarajatlar solig&#39;i va yig&#39;imlar
@@ -5792,6 +5806,8 @@
 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,Please select Qty against item {0},"Iltimos, {0} elementiga qarshi Qty ni tanlang"
+apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py,Latest Age,So&#39;nggi asr
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js,Transfer Material to Supplier,Materialni etkazib beruvchiga topshirish
 apps/erpnext/erpnext/hr/report/loan_repayment/loan_repayment.py,EMI,EMI
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py,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
@@ -5815,7 +5831,6 @@
 apps/erpnext/erpnext/hr/doctype/employee_benefit_application/employee_benefit_application.py,"An amount of {0} already claimed for the component {1},\
 						 set the amount equal or greater than {2}","{1} tarkibiy qismi uchun da&#39;vo qilingan {0} miqdori, {2} dan katta yoki katta miqdorni belgilash"
 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
 DocType: BOM Update Tool,The new BOM after replacement,O&#39;zgartirish o&#39;rniga yangi BOM
 ,Point of Sale,Sotuv nuqtasi
@@ -5934,7 +5949,6 @@
 DocType: Purchase Order Item,Blanket Order Rate,Yorqinlik darajasi
 ,Customer Ledger Summary,Xaridor kassirlarining xulosasi
 apps/erpnext/erpnext/hooks.py,Certification,Sertifikatlash
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js,Are you sure you want to make debit note?,Haqiqatan ham debet eslatma yozmoqchimisiz?
 DocType: Bank Guarantee,Clauses and Conditions,Maqolalar va shartlar
 DocType: Serial No,Creation Document Type,Hujjatning tuzilishi
 DocType: Amazon MWS Settings,ES,RaI
@@ -5972,8 +5986,6 @@
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py,Financial Services,Moliyaviy xizmatlar
 DocType: Student Sibling,Student ID,Isoning shogirdi kimligi
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.js,For Quantity must be greater than zero,Miqdor uchun noldan katta bo&#39;lishi kerak
-apps/erpnext/erpnext/hr/doctype/employee_transfer/employee_transfer.py,"Please delete the Employee <a href=""#Form/Employee/{0}"">{0}</a>\
-					to cancel this document","Ushbu hujjatni bekor qilish uchun <a href=""#Form/Employee/{0}"">{0}</a> \ xodimini o&#39;chiring"
 apps/erpnext/erpnext/config/projects.py,Types of activities for Time Logs,Vaqt qaydlari uchun faoliyat turlari
 DocType: Opening Invoice Creation Tool,Sales,Savdo
 DocType: Stock Entry Detail,Basic Amount,Asosiy miqdori
@@ -6052,6 +6064,7 @@
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py,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,Send Supplier Emails,Yetkazib beruvchi elektron pochta xabarlarini yuborish
+DocType: Asset Movement,ACC-ASM-.YYYY.-,ACC-ASM-.YYYY.-
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py,"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
 apps/erpnext/erpnext/hr/doctype/employee_onboarding/employee_onboarding.py,Submit this to create the Employee record,Xodimlar yozuvini yaratish uchun uni yuboring
@@ -6129,7 +6142,6 @@
 DocType: Sales Team,Contact No.,Aloqa raqami.
 apps/erpnext/erpnext/templates/includes/cart/cart_address.html,Billing Address is same as Shipping Address,To‘lov manzili yetkazib berish manzili bilan bir xil
 DocType: Bank Reconciliation,Payment Entries,To&#39;lov yozuvlari
-apps/erpnext/erpnext/erpnext_integrations/doctype/shopify_settings/shopify_settings.py,Access token or Shopify URL missing,Kirish nishonchasini yoki URL manzilini yetkazib bo&#39;lmaydi
 DocType: Location,Latitude,Enlem
 DocType: Work Order,Scrap Warehouse,Hurda ombori
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py,"Warehouse required at Row No {0}, please set default warehouse for the item {1} for the company {2}","{0} satrida talab qilingan omborxona, iltimos, {2} uchun kompaniya {1} uchun odatiy omborni o&#39;rnating"
@@ -6172,7 +6184,6 @@
 DocType: Job Offer Term,Value / Description,Qiymati / ta&#39;rifi
 apps/erpnext/erpnext/controllers/accounts_controller.py,"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
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js,Are you sure you want to make credit note?,Haqiqatan ham kredit eslatma yozmoqchimisiz?
 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,Debit and Credit not equal for {0} #{1}. Difference is {2}.,Debet va kredit {0} # {1} uchun teng emas. Farqi {2} dir.
@@ -6297,6 +6308,7 @@
 DocType: Purchase Invoice,Taxes and Charges Added,Soliqlar va to&#39;lovlar qo&#39;shildi
 apps/erpnext/erpnext/assets/doctype/asset/asset.py,Depreciation Row {0}: Next Depreciation Date cannot be before Available-for-use Date,Amortizatsiya sathi {0}: Keyingi Amortizatsiya tarixi foydalanish uchun tayyor bo&#39;lgan sanadan oldin bo&#39;lishi mumkin emas
 ,Sales Funnel,Savdo huni
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Item Code &gt; Item Group &gt; Brand,Element kodi&gt; Mahsulotlar guruhi&gt; Tovar
 apps/erpnext/erpnext/setup/doctype/company/company.py,Abbreviation is mandatory,Qisqartirish majburiydir
 DocType: Project,Task Progress,Vazifa muvaffaqiyati
 apps/erpnext/erpnext/templates/includes/navbar/navbar_items.html,Cart,Savat
@@ -6540,6 +6552,7 @@
 DocType: Employee Grade,Employee Grade,Ishchilar darajasi
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py,Piecework,Perework
 DocType: GSTR 3B Report,June,Iyun
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Supplier &gt; Supplier Type,Ta&#39;minotchi&gt; Ta&#39;minotchi turi
 DocType: Share Balance,From No,Yo&#39;q
 DocType: Shift Type,Early Exit Grace Period,Erta chiqish imtiyoz davri
 DocType: Task,Actual Time (in Hours),Haqiqiy vaqt (soati)
@@ -6824,6 +6837,7 @@
 DocType: Warehouse,Warehouse Name,Ombor nomi
 DocType: Naming Series,Select Transaction,Jurnalni tanlang
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py,Please enter Approving Role or Approving User,"Iltimos, rozni rozilikni kiriting yoki foydalanuvchini tasdiqlang"
+apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.py,UOM Conversion factor ({0} -&gt; {1}) not found for item: {2},UOM konversiyalash koeffitsienti ({0} -&gt; {1}) quyidagi element uchun topilmadi: {2}
 apps/erpnext/erpnext/support/doctype/service_level_agreement/service_level_agreement.py,Service Level Agreement with Entity Type {0} and Entity {1} already exists.,{0} turi va {1} subyekt bilan xizmat ko&#39;rsatish darajasi to&#39;g&#39;risidagi kelishuv allaqachon mavjud.
 DocType: Journal Entry,Write Off Entry,Yozuvni yozing
 DocType: BOM,Rate Of Materials Based On,Materiallar asoslari
@@ -7014,6 +7028,7 @@
 DocType: Quality Inspection Reading,Quality Inspection Reading,Sifatni tekshirishni o&#39;qish
 apps/erpnext/erpnext/stock/doctype/stock_settings/stock_settings.py,`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/stock/report/stock_balance/stock_balance.py,Earliest Age,Erta yosh
 apps/erpnext/erpnext/utilities/user_progress.py,Set a sales goal you'd like to achieve for your company.,Sizning kompaniya uchun erishmoqchi bo&#39;lgan savdo maqsadini belgilang.
 DocType: Quality Goal,Revision,Tuzatish
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js,Healthcare Services,Sog&#39;liqni saqlash xizmatlari
@@ -7057,6 +7072,7 @@
 apps/erpnext/erpnext/healthcare/doctype/patient_encounter/patient_encounter.js,Schedule Discharge,Chiqib ketishni rejalashtirish
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py,Cheques and Deposits incorrectly cleared,Chexlar va depozitlar noto&#39;g&#39;ri tozalanadi
 DocType: Homepage Section Card,Homepage Section Card,Bosh sahifa bo&#39;limining kartasi
+,Amount To Be Billed,Hisobga olinadigan miqdor
 apps/erpnext/erpnext/accounts/doctype/account/account.py,Account {0}: You can not assign itself as parent account,Hisob {0}: Siz uni yuqori hisob sifatida belgilashingiz mumkin emas
 DocType: Purchase Invoice Item,Price List Rate,Narxlar ro&#39;yxati darajasi
 apps/erpnext/erpnext/utilities/activation.py,Create customer quotes,Xaridor taklifini yarating
@@ -7109,6 +7125,7 @@
 DocType: Supplier Scorecard Criteria,Supplier Scorecard Criteria,Yetkazib beruvchi Kuzatuv Kriteri
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py,Please select Start Date and End Date for Item {0},"Iltimos, {0} uchun mahsulotning boshlanish sanasi va tugash sanasini tanlang"
 DocType: Maintenance Schedule,MAT-MSH-.YYYY.-,MAT-MSH-.YYYY.-
+,Amount to Receive,Qabul qilish uchun summa
 apps/erpnext/erpnext/education/doctype/student_group_creation_tool/student_group_creation_tool.py,Course is mandatory in row {0},Kurs {0} qatorida majburiydir.
 apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py,From date can not be greater than than To date,Sanadan boshlab hozirgi kundan katta bo&#39;lishi mumkin emas
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py,To date cannot be before from date,Bugungi kunga qadar tarixdan oldin bo&#39;la olmaydi
@@ -7356,7 +7373,6 @@
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js,BOM and Manufacturing Quantity are required,BOM va ishlab chiqarish miqdori talab qilinadi
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js,Ageing Range 2,Qarish oralig&#39;i 2
 DocType: SG Creation Tool Course,Max Strength,Maks kuch
-apps/erpnext/erpnext/accounts/doctype/account/account.py,"Account {0} already exists in child company {1}. The following fields have different values, they should be same:<ul><li>{2}</li></ul>","{0} hisobi {1} bolalar kompaniyasida allaqachon mavjud. Quyidagi maydonlar turli xil qiymatlarga ega, ular bir xil bo&#39;lishi kerak: <ul><li> {2} </li></ul>"
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py,Installing presets,Oldindan o&#39;rnatish
 DocType: Fee Schedule,EDU-FSH-.YYYY.-,EDU-FSH-YYYYY.-
 apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js,No Delivery Note selected for Customer {},Buyurtmachilar uchun {}
@@ -7564,6 +7580,7 @@
 DocType: Delivery Note,Print Without Amount,Miqdorsiz chop etish
 apps/erpnext/erpnext/accounts/report/asset_depreciation_ledger/asset_depreciation_ledger.py,Depreciation Date,Amortizatsiya sanasi
 ,Work Orders in Progress,Ishlar buyurtmasi
+DocType: Customer Credit Limit,Bypass Credit Limit Check,Kredit aylanishini cheklash
 DocType: Issue,Support Team,Yordam jamoasi
 apps/erpnext/erpnext/stock/report/batch_item_expiry_status/batch_item_expiry_status.py,Expiry (In Days),Vaqt muddati (kunlar)
 DocType: Appraisal,Total Score (Out of 5),Jami ball (5 dan)
@@ -7747,6 +7764,7 @@
 DocType: Sales Invoice,Customer GSTIN,Xaridor GSTIN
 DocType: Crop Cycle,List of diseases detected on the field. When selected it'll automatically add a list of tasks to deal with the disease ,"Bu sohada aniqlangan kasalliklar ro&#39;yxati. Tanlangan bo&#39;lsa, u avtomatik ravishda kasallik bilan shug&#39;ullanadigan vazifalar ro&#39;yxatini qo&#39;shib qo&#39;yadi"
 apps/erpnext/erpnext/manufacturing/page/bom_comparison_tool/bom_comparison_tool.js,BOM 1,BOM 1
+apps/erpnext/erpnext/assets/report/fixed_asset_register/fixed_asset_register.py,Asset Id,Obyekt identifikatori
 apps/erpnext/erpnext/healthcare/doctype/healthcare_service_unit/healthcare_service_unit.js,This is a root healthcare service unit and cannot be edited.,Bu ildiz sog&#39;liqni saqlash xizmati bo&#39;linmasi va tahrir qilinishi mumkin emas.
 DocType: Asset Repair,Repair Status,Ta&#39;mirlash holati
 apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.js,"Requested Qty: Quantity requested for purchase, but not ordered.","Talab qilingan miqdor: Xarid qilish uchun so&#39;ralgan, ammo buyurtma qilinmagan."
diff --git a/erpnext/translations/vi.csv b/erpnext/translations/vi.csv
index 129db51..597307e 100644
--- a/erpnext/translations/vi.csv
+++ b/erpnext/translations/vi.csv
@@ -289,7 +289,6 @@
 DocType: Loan,Repay Over Number of Periods,Trả Trong số kỳ
 apps/erpnext/erpnext/manufacturing/report/bom_stock_report/bom_stock_report.py,Quantity to Produce can not be less than Zero,Số lượng sản xuất không thể ít hơn không
 DocType: Stock Entry,Additional Costs,Chi phí bổ sung
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,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/account/account.py,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
@@ -587,6 +586,7 @@
 DocType: Healthcare Settings,Create documents for sample collection,Tạo tài liệu để lấy mẫu
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py,Payment against {0} {1} cannot be greater than Outstanding Amount {2},Thanh toán đối với {0} {1} không thể lớn hơn số tiền đang nợ {2}
 apps/erpnext/erpnext/patches/v11_0/add_healthcare_service_unit_tree_root.py,All Healthcare Service Units,Tất cả các đơn vị dịch vụ y tế
+apps/erpnext/erpnext/setup/default_energy_point_rules.py,On Converting Opportunity,Về cơ hội chuyển đổi
 DocType: Bank Account,Address HTML,Địa chỉ HTML
 DocType: Lead,Mobile No.,Số Điện thoại di động.
 apps/erpnext/erpnext/selling/doctype/pos_closing_voucher/closing_voucher_details.html,Mode of Payments,Phương thức thanh toán
@@ -651,7 +651,6 @@
 DocType: Accounting Dimension,Dimension Name,Tên kích thước
 apps/erpnext/erpnext/healthcare/setup.py,Resistant,Kháng cự
 apps/erpnext/erpnext/hotels/doctype/hotel_room_reservation/hotel_room_reservation.py,Please set Hotel Room Rate on {},Vui lòng đặt Giá phòng khách sạn vào {}
-apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py,Please setup numbering series for Attendance via Setup &gt; Numbering Series,Vui lòng thiết lập chuỗi đánh số cho Tham dự thông qua Cài đặt&gt; Sê-ri đánh số
 DocType: Journal Entry,Multi Currency,Đa ngoại tệ
 DocType: Bank Statement Transaction Invoice Item,Invoice Type,Loại hóa đơn
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py,Valid from date must be less than valid upto date,Có hiệu lực từ ngày phải nhỏ hơn ngày hợp lệ
@@ -768,6 +767,7 @@
 apps/erpnext/erpnext/accounts/page/pos/pos.js,Create a new Customer,Tạo một khách hàng mới
 apps/erpnext/erpnext/non_profit/report/expiring_memberships/expiring_memberships.py,Expiring On,Hết hạn vào
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,"If multiple Pricing Rules continue to prevail, users are asked to set Priority manually to resolve conflict.","Nếu nhiều quy giá tiếp tục chiếm ưu thế, người dùng được yêu cầu để thiết lập ưu tiên bằng tay để giải quyết xung đột."
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js,Purchase Return,Mua Quay lại
 apps/erpnext/erpnext/utilities/activation.py,Create Purchase Orders,Tạo đơn đặt hàng mua
 ,Purchase Register,Đăng ký mua
 apps/erpnext/erpnext/healthcare/doctype/patient/patient.py,Patient not found,Bệnh nhân không tìm thấy
@@ -783,7 +783,6 @@
 DocType: Location,Area UOM,ĐVT diện tính
 apps/erpnext/erpnext/manufacturing/doctype/workstation/workstation.py,Workstation is closed on the following dates as per Holiday List: {0},Trạm được đóng cửa vào các ngày sau đây theo Danh sách kỳ nghỉ: {0}
 apps/erpnext/erpnext/selling/page/sales_funnel/sales_funnel.py,Opportunities,Cơ hội
-apps/erpnext/erpnext/www/all-products/index.html,Clear filters,Xóa bộ lọc
 DocType: Lab Test Template,Single,DUy nhất
 DocType: Compensatory Leave Request,Work From Date,Làm việc từ ngày
 DocType: Salary Slip,Total Loan Repayment,Tổng số trả nợ
@@ -827,6 +826,7 @@
 apps/erpnext/erpnext/education/doctype/program_enrollment_tool/program_enrollment_tool.py,Mandatory field - Academic Year,Trường Bắt buộc - Năm Học
 apps/erpnext/erpnext/education/doctype/program_enrollment_tool/program_enrollment_tool.py,Mandatory field - Academic Year,Trường Bắt buộc - Năm Học
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py,{0} {1} is not associated with {2} {3},{0} {1} không liên kết với {2} {3}
+DocType: Opportunity,Converted By,Chuyển đổi bởi
 apps/erpnext/erpnext/public/js/hub/components/ReviewArea.vue,You need to login as a Marketplace User before you can add any reviews.,Bạn cần đăng nhập với tư cách là Người dùng Thị trường trước khi bạn có thể thêm bất kỳ đánh giá nào.
 apps/erpnext/erpnext/manufacturing/doctype/job_card/job_card.py,Row {0} : Operation is required against the raw material item {1},Hàng {0}: Hoạt động được yêu cầu đối với vật liệu thô {1}
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py,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}
@@ -853,6 +853,8 @@
 DocType: Sales Invoice,Total Qty,Tổng số Số lượng
 apps/erpnext/erpnext/education/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py,Guardian2 Email ID,ID Email Guardian2
 apps/erpnext/erpnext/education/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py,Guardian2 Email ID,ID Email Guardian2
+apps/erpnext/erpnext/hr/doctype/employee_transfer/employee_transfer.py,"Please delete the Employee <a href=""#Form/Employee/{0}"">{0}</a>\
+					to cancel this document","Vui lòng xóa Nhân viên <a href=""#Form/Employee/{0}"">{0}</a> \ để hủy tài liệu này"
 DocType: Item,Show in Website (Variant),Hiện tại Website (Ngôn ngữ địa phương)
 DocType: Employee,Health Concerns,Mối quan tâm về sức khỏe
 DocType: Payroll Entry,Select Payroll Period,Chọn lương Thời gian
@@ -913,7 +915,6 @@
 DocType: Codification Table,Codification Table,Bảng mã hoá
 DocType: Timesheet Detail,Hrs,giờ
 apps/erpnext/erpnext/manufacturing/page/bom_comparison_tool/bom_comparison_tool.js,Changes in {0},Thay đổi trong {0}
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js,Please select Company,Vui lòng chọn Công ty
 DocType: Employee Skill,Employee Skill,Kỹ năng nhân viên
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.js,Difference Account,Tài khoản chênh lệch
 DocType: Pricing Rule,Discount on Other Item,Giảm giá cho mặt hàng khác
@@ -982,6 +983,7 @@
 DocType: BOM,Operating Cost,Chi phí hoạt động
 DocType: Crop,Produced Items,Sản phẩm Sản phẩm
 DocType: Bank Statement Transaction Entry,Match Transaction to Invoices,Giao dịch khớp với hóa đơn
+apps/erpnext/erpnext/erpnext_integrations/exotel_integration.py,Error in Exotel incoming call,Lỗi trong cuộc gọi đến Exotel
 DocType: Sales Order Item,Gross Profit,Lợi nhuận gộp
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js,Unblock Invoice,Bỏ chặn hóa đơn
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py,Increment cannot be 0,Tăng không thể là 0
@@ -1197,6 +1199,7 @@
 DocType: Activity Cost,Activity Type,Loại hoạt động
 DocType: Request for Quotation,For individual supplier,Đối với nhà cung cấp cá nhân
 DocType: BOM Operation,Base Hour Rate(Company Currency),Cơ sở tỷ giá giờ (Công ty ngoại tệ)
+,Qty To Be Billed,Số lượng được thanh toán
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py,Delivered Amount,Số tiền gửi
 apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.js,Reserved Qty for Production: Raw materials quantity to make manufacturing items.,Dành riêng cho sản xuất: Số lượng nguyên liệu để sản xuất các mặt hàng sản xuất.
 DocType: Loyalty Point Entry Redemption,Redemption Date,Ngày cứu chuộc
@@ -1318,7 +1321,7 @@
 apps/erpnext/erpnext/education/doctype/student_group/student_group.py,Please select Program,Vui lòng chọn Chương trình
 apps/erpnext/erpnext/education/doctype/student_group/student_group.py,Please select Program,Vui lòng chọn Chương trình
 DocType: Project,Estimated Cost,Chi phí ước tính
-DocType: Request for Quotation,Link to material requests,Liên kết để yêu cầu tài liệu
+DocType: Supplier Quotation,Link to material requests,Liên kết để yêu cầu tài liệu
 apps/erpnext/erpnext/public/js/hub/pages/Publish.vue,Publish,Công bố
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py,Aerospace,Hàng không vũ trụ
 ,Fichier des Ecritures Comptables [FEC],Fichier des Ecritures Comptables [FEC]
@@ -1331,6 +1334,7 @@
 apps/erpnext/erpnext/utilities/transaction_base.py,Invalid Posting Time,Thời gian gửi không hợp lệ
 DocType: Salary Component,Condition and Formula,Điều kiện và công thức
 DocType: Lead,Campaign Name,Tên chiến dịch
+apps/erpnext/erpnext/setup/default_energy_point_rules.py,On Task Completion,Khi hoàn thành nhiệm vụ
 apps/erpnext/erpnext/hr/doctype/compensatory_leave_request/compensatory_leave_request.py,There is no leave period in between {0} and {1},Không có khoảng thời gian nghỉ giữa {0} và {1}
 DocType: Fee Validity,Healthcare Practitioner,Người hành nghề y
 DocType: Hotel Room,Capacity,Sức chứa
@@ -1676,7 +1680,6 @@
 DocType: Quality Feedback Template,Quality Feedback Template,Mẫu phản hồi chất lượng
 apps/erpnext/erpnext/config/education.py,LMS Activity,Hoạt động LMS
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py,Internet Publishing,Xuất bản Internet
-DocType: Prescription Duration,Number,Con số
 apps/erpnext/erpnext/accounts/doctype/opening_invoice_creation_tool/opening_invoice_creation_tool.js,Creating {0} Invoice,Tạo {0} Hóa đơn
 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 (%)
@@ -1751,6 +1754,7 @@
 DocType: Support Settings,Get Started Sections,Mục bắt đầu
 DocType: Lead,CRM-LEAD-.YYYY.-,CRM-LEAD-.YYYY.-
 DocType: Invoice Discounting,Sanctioned,xử phạt
+,Base Amount,Lượng cơ sở
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.js,Total Contribution Amount: {0},Tổng số tiền đóng góp: {0}
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py,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: Payroll Entry,Salary Slips Submitted,Đã gửi phiếu lương
@@ -1973,6 +1977,7 @@
 DocType: Accounting Dimension,Dimension Defaults,Mặc định kích thước
 apps/erpnext/erpnext/crm/report/prospects_engaged_but_not_converted/prospects_engaged_but_not_converted.js,Minimum Lead Age (Days),Độ tuổi đầu mối kinh doanh tối thiểu (Ngày)
 apps/erpnext/erpnext/crm/report/prospects_engaged_but_not_converted/prospects_engaged_but_not_converted.js,Minimum Lead Age (Days),Độ tuổi đầu mối kinh doanh tối thiểu (Ngày)
+apps/erpnext/erpnext/assets/report/fixed_asset_register/fixed_asset_register.py,Available For Use Date,Có sẵn cho ngày sử dụng
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py,All BOMs,Tất cả BOMs
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js,Create Inter Company Journal Entry,Tạo Nhật ký công ty Inter
 DocType: Company,Parent Company,Công ty mẹ
@@ -2037,6 +2042,7 @@
 ,IRS 1099,IRS 1099
 DocType: Salary Slip,Leave Without Pay,Nghỉ không lương
 DocType: Payment Request,Outward,Bề ngoài
+apps/erpnext/erpnext/setup/default_energy_point_rules.py,On {0} Creation,Trên {0} Tạo
 apps/erpnext/erpnext/regional/doctype/gstr_3b_report/gstr_3b_report.html,State/UT Tax,Thuế nhà nước / UT
 ,Trial Balance for Party,số dư thử nghiệm cho bên đối tác
 ,Gross and Net Profit Report,Báo cáo lợi nhuận gộp và lãi ròng
@@ -2154,6 +2160,7 @@
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js,Make Stock Entry,Nhập kho
 DocType: Hotel Room Reservation,Hotel Reservation User,Khách đặt phòng khách sạn
 apps/erpnext/erpnext/projects/doctype/project/project.js,Set Status,Đặt trạng thái
+apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py,Please setup numbering series for Attendance via Setup &gt; Numbering Series,Vui lòng thiết lập chuỗi đánh số cho Tham dự thông qua Cài đặt&gt; Sê-ri đánh số
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py,Please select prefix first,Vui lòng chọn tiền tố đầu tiên
 DocType: Contract,Fulfilment Deadline,Hạn chót thực hiện
 apps/erpnext/erpnext/public/js/hub/pages/Home.vue,Near you,Gần bạn
@@ -2169,6 +2176,7 @@
 DocType: Announcement,All Students,Tất cả học sinh
 apps/erpnext/erpnext/assets/doctype/asset/asset.py,Item {0} must be a non-stock item,Mục {0} phải là mục Không-Tồn kho
 apps/erpnext/erpnext/stock/doctype/batch/batch.js,View Ledger,Xem sổ cái
+DocType: Cost Center,Lft,lft
 DocType: Grading Scale,Intervals,khoảng thời gian
 DocType: Bank Statement Transaction Entry,Reconciled Transactions,Giao dịch hòa giải
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py,Earliest,Sớm nhất
@@ -2284,6 +2292,7 @@
 apps/erpnext/erpnext/hr/doctype/employee_benefit_application/employee_benefit_application.py,As per your assigned Salary Structure you cannot apply for benefits,"Theo Cơ cấu tiền lương được chỉ định của bạn, bạn không thể nộp đơn xin trợ cấp"
 apps/erpnext/erpnext/stock/doctype/item/item.py,Website Image should be a public file or website URL,Hình ảnh website phải là một tập tin công cộng hoặc URL của trang web
 DocType: Purchase Invoice Item,BOM,BOM
+apps/erpnext/erpnext/stock/doctype/item/item.py,Duplicate entry in Manufacturers table,Mục trùng lặp trong bảng nhà sản xuất
 apps/erpnext/erpnext/setup/doctype/item_group/item_group.js,This is a root item group and cannot be edited.,Đây là một nhóm mục gốc và không thể được chỉnh sửa.
 apps/erpnext/erpnext/accounts/doctype/account/account.js,Merge,Hợp nhất
 DocType: Journal Entry Account,Purchase Order,Mua hàng
@@ -2430,7 +2439,6 @@
 DocType: Asset,Depreciation Schedules,Lịch khấu hao
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.js,Create Sales Invoice,Tạo hóa đơn bán hàng
 apps/erpnext/erpnext/regional/doctype/gstr_3b_report/gstr_3b_report.html,Ineligible ITC,ITC không đủ điều kiện
-apps/erpnext/erpnext/erpnext_integrations/doctype/shopify_settings/shopify_settings.py,"Support for public app is deprecated. Please setup private app, for more details refer user manual",Hỗ trợ cho ứng dụng công khai không còn được dùng nữa. Vui lòng thiết lập ứng dụng riêng tư để biết thêm chi tiết tham khảo hướng dẫn sử dụng
 DocType: Task,Dependent Tasks,Nhiệm vụ phụ thuộc
 apps/erpnext/erpnext/regional/report/gstr_1/gstr_1.py,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/manufacturing/report/bom_stock_report/bom_stock_report.js,Quantity to Produce,Số lượng sản xuất
@@ -2685,6 +2693,7 @@
 DocType: Water Analysis,Container,Thùng đựng hàng
 apps/erpnext/erpnext/regional/report/gstr_1/gstr_1.py,Please set valid GSTIN No. in Company Address,Vui lòng đặt số GSTIN hợp lệ trong Địa chỉ công ty
 apps/erpnext/erpnext/education/utils.py,Student {0} - {1} appears Multiple times in row {2} & {3},Sinh viên {0} - {1} xuất hiện nhiều lần trong hàng {2} &amp; {3}
+apps/erpnext/erpnext/selling/doctype/customer/customer.py,Following fields are mandatory to create address:,Các trường sau là bắt buộc để tạo địa chỉ:
 DocType: Item Alternative,Two-way,Hai chiều
 DocType: Item,Manufacturers,Nhà sản xuất của
 apps/erpnext/erpnext/accounts/deferred_revenue.py,Error while processing deferred accounting for {0},Lỗi trong khi xử lý kế toán trả chậm cho {0}
@@ -2760,9 +2769,9 @@
 DocType: Employee,HR-EMP-,HR-EMP-
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py,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: Quality Meeting Minutes,Quality Meeting Minutes,Biên bản cuộc họp chất lượng
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Supplier &gt; Supplier Type,Nhà cung cấp&gt; Loại nhà cung cấp
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py,Employee Referral,Nhân viên giới thiệu
 DocType: Student Group,Set 0 for no limit,Đặt 0 để không giới hạn
+DocType: Cost Center,rgt,rgt
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py,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.
 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,Resend Payment Email,Gửi lại Email Thanh toán
@@ -2872,7 +2881,6 @@
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py,Against Supplier Invoice {0} dated {1},Gắn với hóa đơn NCC {0} ngày {1}
 DocType: Customer,Default Price List,Mặc định Giá liệt kê
 apps/erpnext/erpnext/assets/doctype/asset/asset.py,Asset Movement record {0} created,kỷ lục Phong trào Asset {0} đã tạo
-apps/erpnext/erpnext/utilities/page/leaderboard/leaderboard.js,No items found.,Không tìm thấy vật nào.
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py,You cannot delete Fiscal Year {0}. Fiscal Year {0} is set as default in Global Settings,Bạn không thể xóa năm tài chính {0}. Năm tài chính {0} được thiết lập mặc định như trong Global Settings
 DocType: Share Transfer,Equity/Liability Account,Vốn chủ sở hữu / Tài khoản trách nhiệm pháp lý
 apps/erpnext/erpnext/setup/doctype/customer_group/customer_group.py,A customer with the same name already exists,Một khách hàng có cùng tên đã tồn tại
@@ -2888,6 +2896,7 @@
 apps/erpnext/erpnext/selling/doctype/customer/customer.py,Credit limit has been crossed for customer {0} ({1}/{2}),Hạn mức tín dụng đã được gạch chéo cho khách hàng {0} ({1} / {2})
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py,Customer required for 'Customerwise Discount',"Khách hàng phải có cho 'Giảm giá phù hợp KH """
 apps/erpnext/erpnext/config/accounting.py,Update bank payment dates with journals.,Cập nhật ngày thanh toán ngân hàng với các tạp chí.
+,Billed Qty,Hóa đơn số lượng
 apps/erpnext/erpnext/stock/doctype/item/item_dashboard.py,Pricing,Vật giá
 DocType: Employee,Attendance Device ID (Biometric/RF tag ID),ID thiết bị tham dự (ID thẻ sinh trắc học / RF)
 DocType: Quotation,Term Details,Chi tiết điều khoản
@@ -2911,6 +2920,7 @@
 DocType: Share Transfer,Asset Account,Tài khoản nội dung
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js,New release date should be in the future,Ngày phát hành mới sẽ có trong tương lai
 DocType: Purchase Invoice,End date of current invoice's period,Ngày kết thúc của thời kỳ hóa đơn hiện tại của
+apps/erpnext/erpnext/hr/doctype/employee/employee.py,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 Nhân sự&gt; Cài đặt nhân sự
 DocType: Lab Test,Technician Name,Tên kỹ thuật viên
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py,"Cannot ensure delivery by Serial No as \
 					Item {0} is added with and without Ensure Delivery by \
@@ -2918,6 +2928,7 @@
 DocType: Accounts Settings,Unlink Payment on Cancellation of Invoice,Bỏ liên kết Thanh toán Hủy hóa đơn
 DocType: Bank Reconciliation,From Date,Từ ngày
 apps/erpnext/erpnext/hr/doctype/vehicle_log/vehicle_log.py,Current Odometer reading entered should be greater than initial Vehicle Odometer {0},Hiện đo dặm đọc vào phải lớn hơn ban đầu Xe máy đo dặm {0}
+,Purchase Order Items To Be Received or Billed,Mua các mặt hàng để được nhận hoặc thanh toán
 DocType: Restaurant Reservation,No Show,Không hiển thị
 apps/erpnext/erpnext/regional/india/utils.py,You must be a registered supplier to generate e-Way Bill,Bạn phải là nhà cung cấp đã đăng ký để tạo Hóa đơn điện tử
 DocType: Shipping Rule Country,Shipping Rule Country,QUy tắc vận chuyển quốc gia
@@ -2960,6 +2971,7 @@
 apps/erpnext/erpnext/templates/generators/item/item_add_to_cart.html,View in Cart,Xem Giỏ hàng
 DocType: Employee Checkin,Shift Actual Start,Thay đổi thực tế bắt đầu
 DocType: Tally Migration,Is Day Book Data Imported,Là dữ liệu sách ngày nhập khẩu
+,Purchase Order Items To Be Received or Billed1,Mua các mặt hàng để được nhận hoặc thanh toán1
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py,Marketing Expenses,Chi phí tiếp thị
 apps/erpnext/erpnext/stock/doctype/pick_list/pick_list.py,{0} units of {1} is not available.,{0} đơn vị của {1} không có sẵn.
 ,Item Shortage Report,Thiếu mục Báo cáo
@@ -3188,7 +3200,6 @@
 apps/erpnext/erpnext/public/js/call_popup/call_popup.js,View all issues from {0},Xem tất cả các vấn đề từ {0}
 DocType: Quality Inspection,MAT-QA-.YYYY.-,MAT-QA-.YYYY.-
 DocType: Quality Meeting Table,Quality Meeting Table,Bàn họp chất lượng
-apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,Vui lòng đặt Sê-ri đặt tên cho {0} qua Cài đặt&gt; Cài đặt&gt; Sê-ri đặt tên
 apps/erpnext/erpnext/templates/pages/help.html,Visit the forums,Truy cập diễn đàn
 DocType: Student,Student Mobile Number,Số di động Sinh viên
 DocType: Item,Has Variants,Có biến thể
@@ -3333,6 +3344,7 @@
 ,Campaign Efficiency,Hiệu quả Chiến dịch
 ,Campaign Efficiency,Hiệu quả Chiến dịch
 DocType: Discussion,Discussion,Thảo luận
+apps/erpnext/erpnext/setup/default_energy_point_rules.py,On Sales Order Submission,Khi nộp đơn đặt hàng
 DocType: Bank Transaction,Transaction ID,ID giao dịch
 DocType: Payroll Entry,Deduct Tax For Unsubmitted Tax Exemption Proof,Khấu trừ thuế đối với chứng từ miễn thuế chưa nộp
 DocType: Volunteer,Anytime,Bất cứ lúc nào
@@ -3340,7 +3352,6 @@
 DocType: Employee Tax Exemption Proof Submission,Employee Tax Exemption Proof Submission,Gửi bằng chứng miễn thuế cho nhân viên
 DocType: Patient,Surgical History,Lịch sử phẫu thuật
 DocType: Bank Statement Settings Item,Mapped Header,Tiêu đề được ánh xạ
-apps/erpnext/erpnext/hr/doctype/employee/employee.py,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 Nhân sự&gt; Cài đặt nhân sự
 DocType: Employee,Resignation Letter Date,Ngày viết đơn nghỉ hưu
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Pricing Rules are further filtered based on quantity.,Nội quy định giá được tiếp tục lọc dựa trên số lượng.
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py,Please set the Date Of Joining for employee {0},Vui lòng đặt Ngày Tham gia cho nhân viên {0}
@@ -3355,6 +3366,7 @@
 DocType: Bank Statement Settings,Mapped Items,Mục được ánh xạ
 DocType: Amazon MWS Settings,IT,CNTT
 DocType: Chapter,Chapter,Chương
+,Fixed Asset Register,Đăng ký tài sản cố định
 apps/erpnext/erpnext/utilities/user_progress.py,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,Select BOM and Qty for Production,Chọn BOM và Số lượng cho sản xuất
@@ -3490,7 +3502,6 @@
 apps/erpnext/erpnext/templates/emails/reorder_item.html,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
 apps/erpnext/erpnext/controllers/accounts_controller.py,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/hr/doctype/salary_structure_assignment/salary_structure_assignment.py,From Date {0} cannot be after employee's relieving Date {1},Từ ngày {0} không thể sau ngày giảm lương của nhân viên {1}
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py,Debit Note {0} has been created automatically,Ghi chú ghi nợ {0} đã được tạo tự động
 apps/erpnext/erpnext/accounts/doctype/payment_order/payment_order.js,Create Payment Entries,Tạo các mục thanh toán
 DocType: Supplier,Is Internal Supplier,Nhà cung cấp nội bộ
 DocType: Employee,Create User Permission,Tạo phép người dùng
@@ -4054,7 +4065,6 @@
 DocType: Project User,Project Status,Tình trạng dự án
 DocType: UOM,Check this to disallow fractions. (for Nos),Kiểm tra này để không cho phép các phần phân đoạn. (Cho Nos)
 DocType: Student Admission Program,Naming Series (for Student Applicant),Đặt tên Series (cho sinh viên nộp đơn)
-apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.py,UOM Conversion factor ({0} -&gt; {1}) not found for item: {2},Không tìm thấy yếu tố chuyển đổi UOM ({0} -&gt; {1}) cho mục: {2}
 apps/erpnext/erpnext/hr/doctype/retention_bonus/retention_bonus.py,Bonus Payment Date cannot be a past date,Ngày thanh toán thưởng không thể là ngày qua
 DocType: Travel Request,Copy of Invitation/Announcement,Bản sao Lời mời / Thông báo
 DocType: Practitioner Service Unit Schedule,Practitioner Service Unit Schedule,Đơn vị dịch vụ học viên
@@ -4203,6 +4213,7 @@
 apps/erpnext/erpnext/utilities/user_progress.py,Setup Company,Thiết lập công ty
 ,Lab Test Report,Báo cáo thử nghiệm Lab
 DocType: Employee Benefit Application,Employee Benefit Application,Đơn xin hưởng quyền lợi cho nhân viên
+apps/erpnext/erpnext/accounts/doctype/invoice_discounting/invoice_discounting.py,Row({0}): {1} is already discounted in {2},Hàng ({0}): {1} đã được giảm giá trong {2}
 apps/erpnext/erpnext/hr/doctype/additional_salary/additional_salary.py,Additional Salary Component Exists.,Thành phần lương bổ sung tồn tại.
 DocType: Purchase Invoice,Unregistered,Chưa đăng ký
 DocType: Student Applicant,Application Date,Ngày nộp hồ sơ
@@ -4282,7 +4293,6 @@
 DocType: Journal Entry,Accounting Entries,Các bút toán hạch toán
 DocType: Job Card Time Log,Job Card Time Log,Nhật ký thẻ công việc
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,"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;."
-apps/erpnext/erpnext/education/doctype/instructor/instructor.py,Please setup Instructor Naming System in Education &gt; Education Settings,Vui lòng thiết lập Hệ thống đặt tên giảng viên trong giáo dục&gt; Cài đặt giáo dục
 DocType: Journal Entry,Paid Loan,Khoản vay đã trả
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py,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
@@ -4299,7 +4309,6 @@
 apps/erpnext/erpnext/templates/pages/projects.html,No time sheets,Không tờ thời gian
 DocType: GoCardless Mandate,GoCardless Customer,Khách hàng GoCard
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py,Leave Type {0} cannot be carry-forwarded,Để lại Loại {0} có thể không được thực hiện chuyển tiếp-
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Item Code &gt; Item Group &gt; Brand,Mã hàng&gt; Nhóm vật phẩm&gt; Thương hiệu
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py,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
 DocType: Leave Encashment,Payroll,Bảng lương
@@ -4415,7 +4424,6 @@
 DocType: Stock Ledger Entry,Actual Qty After Transaction,Số lượng thực tế Sau khi giao dịch
 ,Pending SO Items For Purchase Request,Trong khi chờ SO mục Đối với mua Yêu cầu
 apps/erpnext/erpnext/education/doctype/student_admission/student_admission.py,Student Admissions,Tuyển sinh
-apps/erpnext/erpnext/accounts/party.py,{0} {1} is disabled,{0} {1} bị vô hiệu
 DocType: Supplier,Billing Currency,Ngoại tệ thanh toán
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py,Extra Large,Cực lớn
 DocType: Loan,Loan Application,Đơn xin vay tiền
@@ -4492,7 +4500,6 @@
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py,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/accounts/doctype/accounting_dimension/accounting_dimension.py,Creating Dimensions...,Tạo kích thước ...
 apps/erpnext/erpnext/education/doctype/student_group_creation_tool/student_group_creation_tool.py,Student Group Name is mandatory in row {0},Tên sinh viên Group là bắt buộc trong hàng {0}
-DocType: Customer Credit Limit,Bypass credit limit_check,Bỏ qua giới hạn tín dụng_check
 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
 DocType: HR Settings,Password Policy,Chính sách mật khẩu
 apps/erpnext/erpnext/setup/doctype/customer_group/customer_group.js,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.
@@ -4798,6 +4805,7 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py,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: Quality Meeting,Quality Meeting,Cuộc họp chất lượng
 apps/erpnext/erpnext/accounts/doctype/account/account.js,Non-Group to Group,Không nhóm tới Nhóm
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,Vui lòng đặt Sê-ri đặt tên cho {0} qua Cài đặt&gt; Cài đặt&gt; Sê-ri đặt tên
 DocType: Employee,ERPNext User,Người dùng ERPNext
 apps/erpnext/erpnext/education/doctype/student_group_creation_tool/student_group_creation_tool.py,Batch is mandatory in row {0},Hàng loạt là bắt buộc ở hàng {0}
 apps/erpnext/erpnext/education/doctype/student_group_creation_tool/student_group_creation_tool.py,Batch is mandatory in row {0},Hàng loạt là bắt buộc ở hàng {0}
@@ -5097,6 +5105,7 @@
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py,No {0} found for Inter Company Transactions.,Không tìm thấy {0} nào cho Giao dịch của Công ty Inter.
 DocType: Travel Itinerary,Rented Car,Xe thuê
 apps/erpnext/erpnext/public/js/hub/components/profile_dialog.js,About your Company,Giới thiệu về công ty của bạn
+apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.js,Show Stock Ageing Data,Hiển thị dữ liệu lão hóa chứng khoán
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py,Credit To account must be a Balance Sheet account,Để tín dụng tài khoản phải có một tài khoản Cân đối kế toán
 DocType: Donor,Donor,Nhà tài trợ
 DocType: Global Defaults,Disable In Words,"Vô hiệu hóa ""Số tiền bằng chữ"""
@@ -5111,8 +5120,10 @@
 DocType: Practitioner Schedule,Schedule Name,Tên Lịch
 apps/erpnext/erpnext/regional/doctype/gstr_3b_report/gstr_3b_report.py,Please enter GSTIN and state for the Company Address {0},Vui lòng nhập GSTIN và nêu địa chỉ Công ty {0}
 DocType: Currency Exchange,For Buying,Để mua
+apps/erpnext/erpnext/setup/default_energy_point_rules.py,On Purchase Order Submission,Khi nộp đơn đặt hàng
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js,Add All Suppliers,Thêm Tất cả Nhà cung cấp
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py,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/accounts/doctype/pricing_rule/pricing_rule.js,Customer &gt; Customer Group &gt; Territory,Khách hàng&gt; Nhóm khách hàng&gt; Lãnh thổ
 DocType: Tally Migration,Parties,Các bên
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js,Browse BOM,duyệt BOM
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py,Secured Loans,Các khoản cho vay được bảo đảm
@@ -5144,6 +5155,7 @@
 apps/erpnext/erpnext/stock/doctype/item_alternative/item_alternative.py,Not allow to set alternative item for the item {0},Không cho phép đặt mục thay thế cho mục {0}
 apps/erpnext/erpnext/hr/doctype/leave_block_list/leave_block_list.py,Date is repeated,Ngày lặp lại
 apps/erpnext/erpnext/accounts/print_format/payment_receipt_voucher/payment_receipt_voucher.html,Authorized Signatory,Ký Ủy quyền
+apps/erpnext/erpnext/education/doctype/instructor/instructor.py,Please setup Instructor Naming System in Education &gt; Education Settings,Vui lòng thiết lập Hệ thống đặt tên giảng viên trong giáo dục&gt; Cài đặt giáo dục
 apps/erpnext/erpnext/regional/doctype/gstr_3b_report/gstr_3b_report.html,Net ITC Available(A) - (B),ITC ròng có sẵn (A) - (B)
 apps/erpnext/erpnext/education/doctype/fee_schedule/fee_schedule.js,Create Fees,Tạo phí
 DocType: Project,Total Purchase Cost (via Purchase Invoice),Tổng Chi phí mua hàng (thông qua danh đơn thu mua)
@@ -5164,6 +5176,7 @@
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.js,Message Sent,Gửi tin nhắn
 apps/erpnext/erpnext/accounts/doctype/account/account.py,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/assets/report/fixed_asset_register/fixed_asset_register.py,Vendor Name,Tên nhà cung cấp
 DocType: Quiz Result,Wrong,Sai rồi
 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)
@@ -5409,6 +5422,7 @@
 DocType: Stock Settings,Auto Material Request,Vật liệu tự động Yêu cầu
 DocType: Woocommerce Settings,API consumer secret,Bí mật người tiêu dùng API
 DocType: Delivery Note Item,Available Batch Qty at From Warehouse,Số lượng có sẵn hàng loạt tại Từ kho
+,Received Qty Amount,Số tiền nhận được
 DocType: Salary Slip,Gross Pay - Total Deduction - Loan Repayment,Tổng trả- Tổng Trích - trả nợ
 DocType: Bank Account,Last Integration Date,Ngày tích hợp cuối cùng
 DocType: Expense Claim,Expense Taxes and Charges,Chi phí thuế và phí
@@ -5873,6 +5887,8 @@
 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,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/report/stock_balance/stock_balance.py,Latest Age,Giai đoạn cuối
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js,Transfer Material to Supplier,Chuyển Vật liệu để Nhà cung cấp
 apps/erpnext/erpnext/hr/report/loan_repayment/loan_repayment.py,EMI,EMI
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py,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
@@ -5896,7 +5912,6 @@
 apps/erpnext/erpnext/hr/doctype/employee_benefit_application/employee_benefit_application.py,"An amount of {0} already claimed for the component {1},\
 						 set the amount equal or greater than {2}","Một số tiền {0} đã được xác nhận quyền sở hữu cho thành phần {1}, \ đặt số tiền bằng hoặc lớn hơn {2}"
 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
 DocType: BOM Update Tool,The new BOM after replacement,BOM mới sau khi thay thế
 ,Point of Sale,Điểm bán hàng
@@ -6018,7 +6033,6 @@
 DocType: Purchase Order Item,Blanket Order Rate,Tỷ lệ đặt hàng chăn
 ,Customer Ledger Summary,Tóm tắt sổ cái khách hàng
 apps/erpnext/erpnext/hooks.py,Certification,Chứng nhận
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js,Are you sure you want to make debit note?,Bạn có chắc chắn muốn ghi chú nợ?
 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: Amazon MWS Settings,ES,ES
@@ -6056,8 +6070,6 @@
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py,Financial Services,Dịch vụ tài chính
 DocType: Student Sibling,Student ID,thẻ học sinh
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.js,For Quantity must be greater than zero,Đối với Số lượng phải lớn hơn 0
-apps/erpnext/erpnext/hr/doctype/employee_transfer/employee_transfer.py,"Please delete the Employee <a href=""#Form/Employee/{0}"">{0}</a>\
-					to cancel this document","Vui lòng xóa Nhân viên <a href=""#Form/Employee/{0}"">{0}</a> \ để hủy tài liệu này"
 apps/erpnext/erpnext/config/projects.py,Types of activities for Time Logs,Các loại hoạt động Thời gian Logs
 DocType: Opening Invoice Creation Tool,Sales,Bán hàng
 DocType: Stock Entry Detail,Basic Amount,Số tiền cơ bản
@@ -6136,6 +6148,7 @@
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py,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,Send Supplier Emails,Gửi email Nhà cung cấp
+DocType: Asset Movement,ACC-ASM-.YYYY.-,ACC-ASM-.YYYY.-
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py,"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
 apps/erpnext/erpnext/hr/doctype/employee_onboarding/employee_onboarding.py,Submit this to create the Employee record,Gửi thông tin này để tạo hồ sơ Nhân viên
@@ -6216,7 +6229,6 @@
 DocType: Sales Team,Contact No.,Mã số Liên hệ
 apps/erpnext/erpnext/templates/includes/cart/cart_address.html,Billing Address is same as Shipping Address,Địa chỉ thanh toán giống với địa chỉ giao hàng
 DocType: Bank Reconciliation,Payment Entries,bút toán thanh toán
-apps/erpnext/erpnext/erpnext_integrations/doctype/shopify_settings/shopify_settings.py,Access token or Shopify URL missing,Thiếu mã thông báo truy cập hoặc URL Shopify
 DocType: Location,Latitude,Latitude
 DocType: Work Order,Scrap Warehouse,phế liệu kho
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py,"Warehouse required at Row No {0}, please set default warehouse for the item {1} for the company {2}","Kho yêu cầu tại Hàng số {0}, vui lòng đặt kho mặc định cho mặt hàng {1} cho công ty {2}"
@@ -6260,7 +6272,6 @@
 DocType: Job Offer Term,Value / Description,Giá trị / Mô tả
 apps/erpnext/erpnext/controllers/accounts_controller.py,"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
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js,Are you sure you want to make credit note?,Bạn có chắc chắn muốn ghi chú tín dụng?
 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,Debit and Credit not equal for {0} #{1}. Difference is {2}.,Nợ và có không bằng với {0} # {1}. Sự khác biệt là {2}.
@@ -6385,6 +6396,7 @@
 DocType: Purchase Invoice,Taxes and Charges Added,Thuế và phí bổ sung
 apps/erpnext/erpnext/assets/doctype/asset/asset.py,Depreciation Row {0}: Next Depreciation Date cannot be before Available-for-use Date,Hàng khấu hao {0}: Ngày khấu hao tiếp theo không được trước ngày có sẵn để sử dụng
 ,Sales Funnel,Kênh bán hàng
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Item Code &gt; Item Group &gt; Brand,Mã hàng&gt; Nhóm vật phẩm&gt; Thương hiệu
 apps/erpnext/erpnext/setup/doctype/company/company.py,Abbreviation is mandatory,Tên viết tắt là bắt buộc
 DocType: Project,Task Progress,Tiến độ công việc
 apps/erpnext/erpnext/templates/includes/navbar/navbar_items.html,Cart,Giỏ hàng
@@ -6630,6 +6642,7 @@
 DocType: Employee Grade,Employee Grade,Nhân viên hạng
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py,Piecework,Việc làm ăn khoán
 DocType: GSTR 3B Report,June,Tháng 6
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Supplier &gt; Supplier Type,Nhà cung cấp&gt; Loại nhà cung cấp
 DocType: Share Balance,From No,Từ Không
 DocType: Shift Type,Early Exit Grace Period,Thời gian xuất cảnh sớm
 DocType: Task,Actual Time (in Hours),Thời gian thực tế (tính bằng giờ)
@@ -6916,6 +6929,7 @@
 DocType: Warehouse,Warehouse Name,Tên kho
 DocType: Naming Series,Select Transaction,Chọn giao dịch
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py,Please enter Approving Role or Approving User,Vui lòng nhập Phê duyệt hoặc phê duyệt Vai trò tài
+apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.py,UOM Conversion factor ({0} -&gt; {1}) not found for item: {2},Không tìm thấy yếu tố chuyển đổi UOM ({0} -&gt; {1}) cho mục: {2}
 apps/erpnext/erpnext/support/doctype/service_level_agreement/service_level_agreement.py,Service Level Agreement with Entity Type {0} and Entity {1} already exists.,Thỏa thuận cấp độ dịch vụ với Loại thực thể {0} và Thực thể {1} đã tồn tại.
 DocType: Journal Entry,Write Off Entry,Viết Tắt bút toán
 DocType: BOM,Rate Of Materials Based On,Tỷ giá vật liệu dựa trên
@@ -7107,6 +7121,7 @@
 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,`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/stock/report/stock_balance/stock_balance.py,Earliest Age,Tuổi sớm nhất
 apps/erpnext/erpnext/utilities/user_progress.py,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.
 DocType: Quality Goal,Revision,Sửa đổi
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js,Healthcare Services,Dịch vụ chăm sóc sức khỏe
@@ -7150,6 +7165,7 @@
 apps/erpnext/erpnext/healthcare/doctype/patient_encounter/patient_encounter.js,Schedule Discharge,Lên lịch xả
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py,Cheques and Deposits incorrectly cleared,Chi phiếu và tiền gửi không đúng xóa
 DocType: Homepage Section Card,Homepage Section Card,Thẻ trang chủ
+,Amount To Be Billed,Số tiền được thanh toán
 apps/erpnext/erpnext/accounts/doctype/account/account.py,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ẹ
 DocType: Purchase Invoice Item,Price List Rate,bảng báo giá
 apps/erpnext/erpnext/utilities/activation.py,Create customer quotes,Tạo dấu ngoặc kép của khách hàng
@@ -7202,6 +7218,7 @@
 DocType: Supplier Scorecard Criteria,Supplier Scorecard Criteria,Tiêu chí Điểm Tiêu chí của Nhà cung cấp
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py,Please select Start Date and End Date for Item {0},Vui lòng chọn ngày bắt đầu và ngày kết thúc cho hàng {0}
 DocType: Maintenance Schedule,MAT-MSH-.YYYY.-,MAT-MSH-.YYYY.-
+,Amount to Receive,Số tiền nhận
 apps/erpnext/erpnext/education/doctype/student_group_creation_tool/student_group_creation_tool.py,Course is mandatory in row {0},Tất nhiên là bắt buộc trong hàng {0}
 apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py,From date can not be greater than than To date,Từ ngày không thể lớn hơn đến ngày
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py,To date cannot be before from date,Cho đến ngày không có thể trước khi từ ngày
@@ -7453,7 +7470,6 @@
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js,BOM and Manufacturing Quantity are required,BOM và số lượng sx được yêu cầu
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js,Ageing Range 2,Ageing đun 2
 DocType: SG Creation Tool Course,Max Strength,Sức tối đa
-apps/erpnext/erpnext/accounts/doctype/account/account.py,"Account {0} already exists in child company {1}. The following fields have different values, they should be same:<ul><li>{2}</li></ul>","Tài khoản {0} đã tồn tại trong công ty con {1}. Các trường sau có các giá trị khác nhau, chúng phải giống nhau: <ul><li> {2} </li></ul>"
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py,Installing presets,Cài đặt các giá trị cài sẵn
 DocType: Fee Schedule,EDU-FSH-.YYYY.-,EDU-FSH-.YYYY.-
 apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js,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 {}
@@ -7665,6 +7681,7 @@
 DocType: Delivery Note,Print Without Amount,In không có số lượng
 apps/erpnext/erpnext/accounts/report/asset_depreciation_ledger/asset_depreciation_ledger.py,Depreciation Date,Khấu hao ngày
 ,Work Orders in Progress,Đơn đặt hàng đang tiến hành
+DocType: Customer Credit Limit,Bypass Credit Limit Check,Bỏ qua kiểm tra giới hạn tín dụng
 DocType: Issue,Support Team,Hỗ trợ trong team
 apps/erpnext/erpnext/stock/report/batch_item_expiry_status/batch_item_expiry_status.py,Expiry (In Days),Hạn sử dụng (theo ngày)
 DocType: Appraisal,Total Score (Out of 5),Tổng số điểm ( trong số 5)
@@ -7851,6 +7868,7 @@
 DocType: Sales Invoice,Customer GSTIN,Số tài khoản GST của khách hàng
 DocType: Crop Cycle,List of diseases detected on the field. When selected it'll automatically add a list of tasks to deal with the disease ,"Danh sách các bệnh được phát hiện trên thực địa. Khi được chọn, nó sẽ tự động thêm một danh sách các tác vụ để đối phó với bệnh"
 apps/erpnext/erpnext/manufacturing/page/bom_comparison_tool/bom_comparison_tool.js,BOM 1,BOM 1
+apps/erpnext/erpnext/assets/report/fixed_asset_register/fixed_asset_register.py,Asset Id,Id tài sản
 apps/erpnext/erpnext/healthcare/doctype/healthcare_service_unit/healthcare_service_unit.js,This is a root healthcare service unit and cannot be edited.,Đây là đơn vị dịch vụ chăm sóc sức khỏe gốc và không thể chỉnh sửa được.
 DocType: Asset Repair,Repair Status,Trạng thái Sửa chữa
 apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.js,"Requested Qty: Quantity requested for purchase, but not ordered.","Yêu cầu Số lượng: Số lượng yêu cầu mua, nhưng không ra lệnh."
diff --git a/erpnext/translations/zh.csv b/erpnext/translations/zh.csv
index 4303ea5..50aae04 100644
--- a/erpnext/translations/zh.csv
+++ b/erpnext/translations/zh.csv
@@ -288,7 +288,6 @@
 DocType: Loan,Repay Over Number of Periods,偿还期的超过数
 apps/erpnext/erpnext/manufacturing/report/bom_stock_report/bom_stock_report.py,Quantity to Produce can not be less than Zero,生产数量不能少于零
 DocType: Stock Entry,Additional Costs,额外费用
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Customer &gt; Customer Group &gt; Territory,客户&gt;客户组&gt;地区
 apps/erpnext/erpnext/accounts/doctype/account/account.py,Account with existing transaction can not be converted to group.,有交易的科目不能被转换为组。
 DocType: Lead,Product Enquiry,产品查询
 DocType: Education Settings,Validate Batch for Students in Student Group,验证学生组学生的批次
@@ -586,6 +585,7 @@
 DocType: Healthcare Settings,Create documents for sample collection,创建样本收集文件
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py,Payment against {0} {1} cannot be greater than Outstanding Amount {2},对{0} {1}的付款不能大于总未付金额{2}
 apps/erpnext/erpnext/patches/v11_0/add_healthcare_service_unit_tree_root.py,All Healthcare Service Units,所有医疗服务单位
+apps/erpnext/erpnext/setup/default_energy_point_rules.py,On Converting Opportunity,转换机会
 DocType: Bank Account,Address HTML,地址HTML
 DocType: Lead,Mobile No.,手机号码
 apps/erpnext/erpnext/selling/doctype/pos_closing_voucher/closing_voucher_details.html,Mode of Payments,付款方式
@@ -650,7 +650,6 @@
 DocType: Accounting Dimension,Dimension Name,尺寸名称
 apps/erpnext/erpnext/healthcare/setup.py,Resistant,耐
 apps/erpnext/erpnext/hotels/doctype/hotel_room_reservation/hotel_room_reservation.py,Please set Hotel Room Rate on {},请在{}上设置酒店房价
-apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py,Please setup numbering series for Attendance via Setup &gt; Numbering Series,请通过设置&gt;编号系列设置出勤编号系列
 DocType: Journal Entry,Multi Currency,多币种
 DocType: Bank Statement Transaction Invoice Item,Invoice Type,费用清单类型
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py,Valid from date must be less than valid upto date,从日期开始有效必须低于最新有效期
@@ -768,6 +767,7 @@
 apps/erpnext/erpnext/accounts/page/pos/pos.js,Create a new Customer,创建一个新的客户
 apps/erpnext/erpnext/non_profit/report/expiring_memberships/expiring_memberships.py,Expiring On,即将到期
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,"If multiple Pricing Rules continue to prevail, users are asked to set Priority manually to resolve conflict.",如果几条价格规则同时使用，系统将提醒用户设置优先级。
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js,Purchase Return,采购退货
 apps/erpnext/erpnext/utilities/activation.py,Create Purchase Orders,创建采购订单
 ,Purchase Register,采购台帐
 apps/erpnext/erpnext/healthcare/doctype/patient/patient.py,Patient not found,患者未找到
@@ -783,7 +783,6 @@
 DocType: Location,Area UOM,区基础单位
 apps/erpnext/erpnext/manufacturing/doctype/workstation/workstation.py,Workstation is closed on the following dates as per Holiday List: {0},工作站在以下假期关闭：{0}
 apps/erpnext/erpnext/selling/page/sales_funnel/sales_funnel.py,Opportunities,机会
-apps/erpnext/erpnext/www/all-products/index.html,Clear filters,清除过滤器
 DocType: Lab Test Template,Single,单身
 DocType: Compensatory Leave Request,Work From Date,从日期开始工作
 DocType: Salary Slip,Total Loan Repayment,总贷款还款
@@ -827,6 +826,7 @@
 apps/erpnext/erpnext/education/doctype/program_enrollment_tool/program_enrollment_tool.py,Mandatory field - Academic Year,必修课 - 学年
 apps/erpnext/erpnext/education/doctype/program_enrollment_tool/program_enrollment_tool.py,Mandatory field - Academic Year,必修课 - 学年
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py,{0} {1} is not associated with {2} {3},{0} {1}与{2} {3}无关
+DocType: Opportunity,Converted By,转换依据
 apps/erpnext/erpnext/public/js/hub/components/ReviewArea.vue,You need to login as a Marketplace User before you can add any reviews.,在添加任何评论之前，您需要以市场用户身份登录。
 apps/erpnext/erpnext/manufacturing/doctype/job_card/job_card.py,Row {0} : Operation is required against the raw material item {1},行{0}：对原材料项{1}需要操作
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py,Please set default payable account for the company {0},请为公司{0}设置默认应付账款科目
@@ -853,6 +853,8 @@
 DocType: Sales Invoice,Total Qty,总数量
 apps/erpnext/erpnext/education/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py,Guardian2 Email ID,Guardian2电子邮件ID
 apps/erpnext/erpnext/education/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py,Guardian2 Email ID,Guardian2电子邮件ID
+apps/erpnext/erpnext/hr/doctype/employee_transfer/employee_transfer.py,"Please delete the Employee <a href=""#Form/Employee/{0}"">{0}</a>\
+					to cancel this document","请删除员工<a href=""#Form/Employee/{0}"">{0}</a> \以取消此文档"
 DocType: Item,Show in Website (Variant),在网站上展示（变体）
 DocType: Employee,Health Concerns,健康问题
 DocType: Payroll Entry,Select Payroll Period,选择工资名单的时间段
@@ -913,7 +915,6 @@
 DocType: Codification Table,Codification Table,编纂表
 DocType: Timesheet Detail,Hrs,小时
 apps/erpnext/erpnext/manufacturing/page/bom_comparison_tool/bom_comparison_tool.js,Changes in {0},{0}中的更改
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js,Please select Company,请选择公司
 DocType: Employee Skill,Employee Skill,员工技能
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.js,Difference Account,差异科目
 DocType: Pricing Rule,Discount on Other Item,其他物品的折扣
@@ -982,6 +983,7 @@
 DocType: BOM,Operating Cost,营业成本
 DocType: Crop,Produced Items,生产物料
 DocType: Bank Statement Transaction Entry,Match Transaction to Invoices,将交易记录与费用清单匹配
+apps/erpnext/erpnext/erpnext_integrations/exotel_integration.py,Error in Exotel incoming call,Exotel来电错误
 DocType: Sales Order Item,Gross Profit,毛利
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js,Unblock Invoice,解锁该费用清单
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py,Increment cannot be 0,增量不能为0
@@ -1196,6 +1198,7 @@
 DocType: Activity Cost,Activity Type,活动类型
 DocType: Request for Quotation,For individual supplier,单个供应商
 DocType: BOM Operation,Base Hour Rate(Company Currency),基数小时率（公司货币）
+,Qty To Be Billed,计费数量
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py,Delivered Amount,已交付金额
 apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.js,Reserved Qty for Production: Raw materials quantity to make manufacturing items.,生产保留数量：生产制造项目的原材料数量。
 DocType: Loyalty Point Entry Redemption,Redemption Date,赎回日期
@@ -1317,7 +1320,7 @@
 apps/erpnext/erpnext/education/doctype/student_group/student_group.py,Please select Program,请选择程序
 apps/erpnext/erpnext/education/doctype/student_group/student_group.py,Please select Program,请选择程序
 DocType: Project,Estimated Cost,估计成本
-DocType: Request for Quotation,Link to material requests,链接到物料申请
+DocType: Supplier Quotation,Link to material requests,链接到物料申请
 apps/erpnext/erpnext/public/js/hub/pages/Publish.vue,Publish,发布
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py,Aerospace,航天
 ,Fichier des Ecritures Comptables [FEC],Fichier des Ecritures Comptables [FEC]
@@ -1330,6 +1333,7 @@
 apps/erpnext/erpnext/utilities/transaction_base.py,Invalid Posting Time,记帐时间无效
 DocType: Salary Component,Condition and Formula,条件和公式
 DocType: Lead,Campaign Name,活动名称
+apps/erpnext/erpnext/setup/default_energy_point_rules.py,On Task Completion,完成任务
 apps/erpnext/erpnext/hr/doctype/compensatory_leave_request/compensatory_leave_request.py,There is no leave period in between {0} and {1},{0}和{1}之间没有休假期限
 DocType: Fee Validity,Healthcare Practitioner,医疗从业者
 DocType: Hotel Room,Capacity,容量
@@ -1686,7 +1690,6 @@
 DocType: Quality Feedback Template,Quality Feedback Template,质量反馈模板
 apps/erpnext/erpnext/config/education.py,LMS Activity,LMS活动
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py,Internet Publishing,互联网出版
-DocType: Prescription Duration,Number,数
 apps/erpnext/erpnext/accounts/doctype/opening_invoice_creation_tool/opening_invoice_creation_tool.js,Creating {0} Invoice,创建{0}费用清单
 DocType: Medical Code,Medical Code Standard,医疗代码标准
 DocType: Soil Texture,Clay Composition (%),粘土成分（％）
@@ -1761,6 +1764,7 @@
 DocType: Support Settings,Get Started Sections,入门部分
 DocType: Lead,CRM-LEAD-.YYYY.-,CRM-LEAD-.YYYY.-
 DocType: Invoice Discounting,Sanctioned,核准
+,Base Amount,基本金额
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.js,Total Contribution Amount: {0},总贡献金额：{0}
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py,Row #{0}: Please specify Serial No for Item {1},行＃{0}：请为物料{1}指定序号
 DocType: Payroll Entry,Salary Slips Submitted,工资单已提交
@@ -1982,6 +1986,7 @@
 DocType: Accounting Dimension,Dimension Defaults,尺寸默认值
 apps/erpnext/erpnext/crm/report/prospects_engaged_but_not_converted/prospects_engaged_but_not_converted.js,Minimum Lead Age (Days),最低交货期长 （天）
 apps/erpnext/erpnext/crm/report/prospects_engaged_but_not_converted/prospects_engaged_but_not_converted.js,Minimum Lead Age (Days),最低交货期（天）
+apps/erpnext/erpnext/assets/report/fixed_asset_register/fixed_asset_register.py,Available For Use Date,可用日期
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py,All BOMs,全部物料清单
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js,Create Inter Company Journal Entry,创建国际公司日记帐分录
 DocType: Company,Parent Company,母公司
@@ -2046,6 +2051,7 @@
 ,IRS 1099,IRS 1099
 DocType: Salary Slip,Leave Without Pay,无薪休假
 DocType: Payment Request,Outward,向外
+apps/erpnext/erpnext/setup/default_energy_point_rules.py,On {0} Creation,在{0}创建时
 apps/erpnext/erpnext/regional/doctype/gstr_3b_report/gstr_3b_report.html,State/UT Tax,州/ UT税
 ,Trial Balance for Party,往来单位试算平衡表
 ,Gross and Net Profit Report,毛利润和净利润报告
@@ -2163,6 +2169,7 @@
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js,Make Stock Entry,进入股票
 DocType: Hotel Room Reservation,Hotel Reservation User,酒店预订用户
 apps/erpnext/erpnext/projects/doctype/project/project.js,Set Status,设置状态
+apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py,Please setup numbering series for Attendance via Setup &gt; Numbering Series,请通过“设置”&gt;“编号序列”为出勤设置编号序列
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py,Please select prefix first,请先选择前缀
 DocType: Contract,Fulfilment Deadline,履行截止日期
 apps/erpnext/erpnext/public/js/hub/pages/Home.vue,Near you,在你旁边
@@ -2178,6 +2185,7 @@
 DocType: Announcement,All Students,所有学生
 apps/erpnext/erpnext/assets/doctype/asset/asset.py,Item {0} must be a non-stock item,物料{0}必须是一个非库存物料
 apps/erpnext/erpnext/stock/doctype/batch/batch.js,View Ledger,查看总帐
+DocType: Cost Center,Lft,Lft
 DocType: Grading Scale,Intervals,间隔
 DocType: Bank Statement Transaction Entry,Reconciled Transactions,已核对的交易
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py,Earliest,最早
@@ -2293,6 +2301,7 @@
 apps/erpnext/erpnext/hr/doctype/employee_benefit_application/employee_benefit_application.py,As per your assigned Salary Structure you cannot apply for benefits,根据您指定的薪资结构，您无法申请福利
 apps/erpnext/erpnext/stock/doctype/item/item.py,Website Image should be a public file or website URL,网站形象应该是一个公共文件或网站网址
 DocType: Purchase Invoice Item,BOM,BOM
+apps/erpnext/erpnext/stock/doctype/item/item.py,Duplicate entry in Manufacturers table,制造商表中的条目重复
 apps/erpnext/erpnext/setup/doctype/item_group/item_group.js,This is a root item group and cannot be edited.,这是一个根物料群组，无法被编辑。
 apps/erpnext/erpnext/accounts/doctype/account/account.js,Merge,合并
 DocType: Journal Entry Account,Purchase Order,采购订单
@@ -2439,7 +2448,6 @@
 DocType: Asset,Depreciation Schedules,折旧计划
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.js,Create Sales Invoice,创建销售发票
 apps/erpnext/erpnext/regional/doctype/gstr_3b_report/gstr_3b_report.html,Ineligible ITC,不合格的ITC
-apps/erpnext/erpnext/erpnext_integrations/doctype/shopify_settings/shopify_settings.py,"Support for public app is deprecated. Please setup private app, for more details refer user manual",对公共应用程序的支持已被弃用。请设置私人应用程序，更多详细信息请参阅用户手册
 DocType: Task,Dependent Tasks,相关任务
 apps/erpnext/erpnext/regional/report/gstr_1/gstr_1.py,Following accounts might be selected in GST Settings:,以下科目可能在GST设置中选择：
 apps/erpnext/erpnext/manufacturing/report/bom_stock_report/bom_stock_report.js,Quantity to Produce,生产数量
@@ -2691,6 +2699,7 @@
 DocType: Water Analysis,Container,容器
 apps/erpnext/erpnext/regional/report/gstr_1/gstr_1.py,Please set valid GSTIN No. in Company Address,请在公司地址中设置有效的GSTIN号码
 apps/erpnext/erpnext/education/utils.py,Student {0} - {1} appears Multiple times in row {2} & {3},学生{0}  -  {1}出现连续中多次{2}和{3}
+apps/erpnext/erpnext/selling/doctype/customer/customer.py,Following fields are mandatory to create address:,必须填写以下字段才能创建地址：
 DocType: Item Alternative,Two-way,双向
 DocType: Item,Manufacturers,制造商
 apps/erpnext/erpnext/accounts/deferred_revenue.py,Error while processing deferred accounting for {0},处理{0}的延迟记帐时出错
@@ -2766,9 +2775,9 @@
 DocType: Employee,HR-EMP-,HR-EMP-
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py,User {0} doesn't have any default POS Profile. Check Default at Row {1} for this User.,用户{0}没有任何默认的POS配置文件。检查此用户的行{1}处的默认值。
 DocType: Quality Meeting Minutes,Quality Meeting Minutes,质量会议纪要
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Supplier &gt; Supplier Type,供应商&gt;供应商类型
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py,Employee Referral,员工推荐
 DocType: Student Group,Set 0 for no limit,为不限制设为0
+DocType: Cost Center,rgt,RGT
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py,The day(s) on which you are applying for leave are holidays. You need not apply for leave.,您申请的休假日期是节假日，无需申请休假。
 DocType: Customer,Primary Address and Contact Detail,主要地址和联系人信息
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.js,Resend Payment Email,重新发送付款电子邮件
@@ -2878,7 +2887,6 @@
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py,Against Supplier Invoice {0} dated {1},针对的日期为{1}的供应商费用清单{0}
 DocType: Customer,Default Price List,默认价格清单
 apps/erpnext/erpnext/assets/doctype/asset/asset.py,Asset Movement record {0} created,资产移动记录{0}创建
-apps/erpnext/erpnext/utilities/page/leaderboard/leaderboard.js,No items found.,未找到任何项目。
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py,You cannot delete Fiscal Year {0}. Fiscal Year {0} is set as default in Global Settings,您不能删除会计年度{0}。会计年度{0}被设置为默认的全局设置
 DocType: Share Transfer,Equity/Liability Account,权益/负债科目
 apps/erpnext/erpnext/setup/doctype/customer_group/customer_group.py,A customer with the same name already exists,已存在同名客户
@@ -2894,6 +2902,7 @@
 apps/erpnext/erpnext/selling/doctype/customer/customer.py,Credit limit has been crossed for customer {0} ({1}/{2}),客户{0}（{1} / {2}）的信用额度已超过
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py,Customer required for 'Customerwise Discount',”客户折扣“需要指定客户
 apps/erpnext/erpnext/config/accounting.py,Update bank payment dates with journals.,用日记账更新银行付款时间
+,Billed Qty,开票数量
 apps/erpnext/erpnext/stock/doctype/item/item_dashboard.py,Pricing,价钱
 DocType: Employee,Attendance Device ID (Biometric/RF tag ID),考勤设备ID（生物识别/ RF标签ID）
 DocType: Quotation,Term Details,条款信息
@@ -2917,6 +2926,7 @@
 DocType: Share Transfer,Asset Account,资产科目
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js,New release date should be in the future,新的发布日期应该是将来的
 DocType: Purchase Invoice,End date of current invoice's period,当前费用清单周期的结束日期
+apps/erpnext/erpnext/hr/doctype/employee/employee.py,Please setup Employee Naming System in Human Resource &gt; HR Settings,请在人力资源&gt;人力资源设置中设置员工命名系统
 DocType: Lab Test,Technician Name,技术员姓名
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py,"Cannot ensure delivery by Serial No as \
 					Item {0} is added with and without Ensure Delivery by \
@@ -2924,6 +2934,7 @@
 DocType: Accounts Settings,Unlink Payment on Cancellation of Invoice,取消费用清单时去掉关联的付款
 DocType: Bank Reconciliation,From Date,起始日期
 apps/erpnext/erpnext/hr/doctype/vehicle_log/vehicle_log.py,Current Odometer reading entered should be greater than initial Vehicle Odometer {0},当前的里程表读数应该比最初的车辆里程表更大的{0}
+,Purchase Order Items To Be Received or Billed,要接收或开票的采购订单项目
 DocType: Restaurant Reservation,No Show,没有出现
 apps/erpnext/erpnext/regional/india/utils.py,You must be a registered supplier to generate e-Way Bill,您必须是注册供应商才能生成电子方式账单
 DocType: Shipping Rule Country,Shipping Rule Country,航运规则国家
@@ -2966,6 +2977,7 @@
 apps/erpnext/erpnext/templates/generators/item/item_add_to_cart.html,View in Cart,查看你的购物车
 DocType: Employee Checkin,Shift Actual Start,切换实际开始
 DocType: Tally Migration,Is Day Book Data Imported,是否导入了日记簿数据
+,Purchase Order Items To Be Received or Billed1,要接收或开票的采购订单项目1
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py,Marketing Expenses,市场营销费用
 apps/erpnext/erpnext/stock/doctype/pick_list/pick_list.py,{0} units of {1} is not available.,{0}的{0}单位不可用。
 ,Item Shortage Report,缺料报表
@@ -3192,7 +3204,6 @@
 apps/erpnext/erpnext/public/js/call_popup/call_popup.js,View all issues from {0},查看{0}中的所有问题
 DocType: Quality Inspection,MAT-QA-.YYYY.-,MAT-QA-.YYYY.-
 DocType: Quality Meeting Table,Quality Meeting Table,质量会议桌
-apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,请通过设置&gt;设置&gt;命名系列为{0}设置命名系列
 apps/erpnext/erpnext/templates/pages/help.html,Visit the forums,访问论坛
 DocType: Student,Student Mobile Number,学生手机号码
 DocType: Item,Has Variants,有变体
@@ -3337,6 +3348,7 @@
 ,Campaign Efficiency,促销活动效率
 ,Campaign Efficiency,运动效率
 DocType: Discussion,Discussion,讨论
+apps/erpnext/erpnext/setup/default_energy_point_rules.py,On Sales Order Submission,提交销售订单
 DocType: Bank Transaction,Transaction ID,交易ID
 DocType: Payroll Entry,Deduct Tax For Unsubmitted Tax Exemption Proof,代扣未提交免税证明的税额
 DocType: Volunteer,Anytime,任何时候
@@ -3344,7 +3356,6 @@
 DocType: Employee Tax Exemption Proof Submission,Employee Tax Exemption Proof Submission,员工免税证明提交
 DocType: Patient,Surgical History,手术史
 DocType: Bank Statement Settings Item,Mapped Header,已映射的标题
-apps/erpnext/erpnext/hr/doctype/employee/employee.py,Please setup Employee Naming System in Human Resource &gt; HR Settings,请在人力资源&gt;人力资源设置中设置员工命名系统
 DocType: Employee,Resignation Letter Date,辞职信日期
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Pricing Rules are further filtered based on quantity.,定价规则进一步过滤基于数量。
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py,Please set the Date Of Joining for employee {0},请为员工{0}设置加入日期
@@ -3359,6 +3370,7 @@
 DocType: Bank Statement Settings,Mapped Items,已映射的项目
 DocType: Amazon MWS Settings,IT,IT
 DocType: Chapter,Chapter,章节
+,Fixed Asset Register,固定资产登记册
 apps/erpnext/erpnext/utilities/user_progress.py,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,Select BOM and Qty for Production,选择BOM和数量生产
@@ -3494,7 +3506,6 @@
 apps/erpnext/erpnext/templates/emails/reorder_item.html,Following Material Requests have been raised automatically based on Item's re-order level,以下物料需求数量已自动根据重订货水平相应增加了
 apps/erpnext/erpnext/controllers/accounts_controller.py,Account {0} is invalid. Account Currency must be {1},科目{0}状态为非激活。科目货币必须是{1}
 apps/erpnext/erpnext/hr/doctype/salary_structure_assignment/salary_structure_assignment.py,From Date {0} cannot be after employee's relieving Date {1},起始日期{0}不能在员工离职日期之后{1}
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py,Debit Note {0} has been created automatically,已自动创建借方通知单{0}
 apps/erpnext/erpnext/accounts/doctype/payment_order/payment_order.js,Create Payment Entries,创建付款条目
 DocType: Supplier,Is Internal Supplier,是内部供应商
 DocType: Employee,Create User Permission,创建用户权限
@@ -4056,7 +4067,6 @@
 DocType: Project User,Project Status,项目状态
 DocType: UOM,Check this to disallow fractions. (for Nos),要对编号禁止分数，请勾选此项。
 DocType: Student Admission Program,Naming Series (for Student Applicant),名录（面向学生申请人）
-apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.py,UOM Conversion factor ({0} -&gt; {1}) not found for item: {2},未找到项目的UOM转换因子（{0}  - &gt; {1}）：{2}
 apps/erpnext/erpnext/hr/doctype/retention_bonus/retention_bonus.py,Bonus Payment Date cannot be a past date,奖金支付日期不能是过去的日期
 DocType: Travel Request,Copy of Invitation/Announcement,邀请/公告的副本
 DocType: Practitioner Service Unit Schedule,Practitioner Service Unit Schedule,从业者服务单位时间表
@@ -4217,6 +4227,7 @@
 apps/erpnext/erpnext/utilities/user_progress.py,Setup Company,设置公司
 ,Lab Test Report,实验室测试报表
 DocType: Employee Benefit Application,Employee Benefit Application,员工福利申请
+apps/erpnext/erpnext/accounts/doctype/invoice_discounting/invoice_discounting.py,Row({0}): {1} is already discounted in {2},行（{0}）：{1}已在{2}中打折
 apps/erpnext/erpnext/hr/doctype/additional_salary/additional_salary.py,Additional Salary Component Exists.,额外的薪资组件存在。
 DocType: Purchase Invoice,Unregistered,未注册
 DocType: Student Applicant,Application Date,申请日期
@@ -4251,6 +4262,8 @@
 apps/erpnext/erpnext/accounts/utils.py,Allocated amount cannot be negative,分配数量不能为负数
 DocType: Sales Order,Billing Status,账单状态
 apps/erpnext/erpnext/public/js/conf.js,Report an Issue,报表问题
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/utils.py,"If you {0} {1} quantities of the item <b>{2}</b>, the scheme <b>{3}</b>
+			will be applied on the item.",如果您{0} {1}个项目<b>{2}的数量</b> ，则方案<b>{3}</b>将应用于该项目。
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py,Utility Expenses,基础设施费用
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py,90-Above,90以上
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py,Row #{0}: Journal Entry {1} does not have account {2} or already matched against another voucher,行＃{0}：日记条目{1}没有科目{2}或已经对另一凭证匹配
@@ -4294,7 +4307,6 @@
 DocType: Journal Entry,Accounting Entries,会计分录
 DocType: Job Card Time Log,Job Card Time Log,工作卡时间日志
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,"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;字段中取出。
-apps/erpnext/erpnext/education/doctype/instructor/instructor.py,Please setup Instructor Naming System in Education &gt; Education Settings,请在教育&gt;教育设置中设置教师命名系统
 DocType: Journal Entry,Paid Loan,付费贷款
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py,Duplicate Entry. Please check Authorization Rule {0},重复的条目，请检查授权规则{0}
 DocType: Journal Entry Account,Reference Due Date,参考到期日
@@ -4311,7 +4323,6 @@
 apps/erpnext/erpnext/templates/pages/projects.html,No time sheets,没有考勤表
 DocType: GoCardless Mandate,GoCardless Customer,GoCardless客户
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py,Leave Type {0} cannot be carry-forwarded,休假类型{0}不能随身转发
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Item Code &gt; Item Group &gt; Brand,商品代码&gt;商品分组&gt;品牌
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py,Maintenance Schedule is not generated for all the items. Please click on 'Generate Schedule',维护计划没有为所有物料生成，请点击“生产计划”
 ,To Produce,以生产
 DocType: Leave Encashment,Payroll,工资表
@@ -4427,7 +4438,6 @@
 DocType: Stock Ledger Entry,Actual Qty After Transaction,交易过帐后实际数量
 ,Pending SO Items For Purchase Request,针对采购申请的待处理销售订单行
 apps/erpnext/erpnext/education/doctype/student_admission/student_admission.py,Student Admissions,学生入学
-apps/erpnext/erpnext/accounts/party.py,{0} {1} is disabled,{0} {1}已禁用
 DocType: Supplier,Billing Currency,结算货币
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py,Extra Large,特大号
 DocType: Loan,Loan Application,申请贷款
@@ -4504,7 +4514,6 @@
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py,Only Leave Applications with status 'Approved' and 'Rejected' can be submitted,仅可以提交状态为“已批准”和“已拒绝”的休假申请
 apps/erpnext/erpnext/accounts/doctype/accounting_dimension/accounting_dimension.py,Creating Dimensions...,创建尺寸......
 apps/erpnext/erpnext/education/doctype/student_group_creation_tool/student_group_creation_tool.py,Student Group Name is mandatory in row {0},学生组名称是强制性的行{0}
-DocType: Customer Credit Limit,Bypass credit limit_check,绕过信用限额_检查
 DocType: Homepage,Products to be shown on website homepage,在网站首页中显示的产品
 DocType: HR Settings,Password Policy,密码政策
 apps/erpnext/erpnext/setup/doctype/customer_group/customer_group.js,This is a root customer group and cannot be edited.,这是一个根客户组，并且不能编辑。
@@ -4798,6 +4807,7 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py,Row {0}: Advance against Customer must be credit,行{0}：预收客户款项须记在贷方
 DocType: Quality Meeting,Quality Meeting,质量会议
 apps/erpnext/erpnext/accounts/doctype/account/account.js,Non-Group to Group,非群组转为群组
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,请通过设置&gt;设置&gt;命名系列为{0}设置命名系列
 DocType: Employee,ERPNext User,ERPNext用户
 apps/erpnext/erpnext/education/doctype/student_group_creation_tool/student_group_creation_tool.py,Batch is mandatory in row {0},在{0}行中必须使用批次号
 apps/erpnext/erpnext/education/doctype/student_group_creation_tool/student_group_creation_tool.py,Batch is mandatory in row {0},在{0}行中必须使用批处理
@@ -5095,6 +5105,7 @@
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py,No {0} found for Inter Company Transactions.,Inter公司没有找到{0}。
 DocType: Travel Itinerary,Rented Car,租车
 apps/erpnext/erpnext/public/js/hub/components/profile_dialog.js,About your Company,关于贵公司
+apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.js,Show Stock Ageing Data,显示库存账龄数据
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py,Credit To account must be a Balance Sheet account,信用科目必须是资产负债表科目
 DocType: Donor,Donor,捐赠者
 DocType: Global Defaults,Disable In Words,禁用词
@@ -5109,8 +5120,10 @@
 DocType: Practitioner Schedule,Schedule Name,计划名称
 apps/erpnext/erpnext/regional/doctype/gstr_3b_report/gstr_3b_report.py,Please enter GSTIN and state for the Company Address {0},请输入GSTIN并说明公司地址{0}
 DocType: Currency Exchange,For Buying,待采购
+apps/erpnext/erpnext/setup/default_energy_point_rules.py,On Purchase Order Submission,提交采购订单时
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js,Add All Suppliers,添加所有供应商
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py,Row #{0}: Allocated Amount cannot be greater than outstanding amount.,行＃{0}：已分配金额不能大于未付金额。
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Customer &gt; Customer Group &gt; Territory,客户&gt;客户组&gt;地区
 DocType: Tally Migration,Parties,派对
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js,Browse BOM,浏览BOM
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py,Secured Loans,抵押贷款
@@ -5142,6 +5155,7 @@
 apps/erpnext/erpnext/stock/doctype/item_alternative/item_alternative.py,Not allow to set alternative item for the item {0},不允许为项目{0}设置替代项目
 apps/erpnext/erpnext/hr/doctype/leave_block_list/leave_block_list.py,Date is repeated,日期重复
 apps/erpnext/erpnext/accounts/print_format/payment_receipt_voucher/payment_receipt_voucher.html,Authorized Signatory,授权签字人
+apps/erpnext/erpnext/education/doctype/instructor/instructor.py,Please setup Instructor Naming System in Education &gt; Education Settings,请在“教育”&gt;“教育设置”中设置教师命名系统
 apps/erpnext/erpnext/regional/doctype/gstr_3b_report/gstr_3b_report.html,Net ITC Available(A) - (B),净ITC可用（A） - （B）
 apps/erpnext/erpnext/education/doctype/fee_schedule/fee_schedule.js,Create Fees,创造费用
 DocType: Project,Total Purchase Cost (via Purchase Invoice),总采购成本（通过采购费用清单）
@@ -5162,6 +5176,7 @@
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.js,Message Sent,消息已发送
 apps/erpnext/erpnext/accounts/doctype/account/account.py,Account with child nodes cannot be set as ledger,科目与子节点不能被设置为分类帐
 DocType: C-Form,II,二
+apps/erpnext/erpnext/assets/report/fixed_asset_register/fixed_asset_register.py,Vendor Name,供应商名称
 DocType: Quiz Result,Wrong,错误
 DocType: Sales Invoice,Rate at which Price list currency is converted to customer's base currency,价格清单货币转换成客户的本币后的单价
 DocType: Purchase Invoice Item,Net Amount (Company Currency),净金额（公司货币）
@@ -5407,6 +5422,7 @@
 DocType: Stock Settings,Auto Material Request,自动材料需求
 DocType: Woocommerce Settings,API consumer secret,应用程序界面消费者秘密
 DocType: Delivery Note Item,Available Batch Qty at From Warehouse,源仓库可用的批次数量
+,Received Qty Amount,收到的数量
 DocType: Salary Slip,Gross Pay - Total Deduction - Loan Repayment,工资总额 - 扣除总额 - 贷款还款
 DocType: Bank Account,Last Integration Date,上次整合日期
 DocType: Expense Claim,Expense Taxes and Charges,费用税和费用
@@ -5871,6 +5887,8 @@
 DocType: Drug Prescription,Hour,小时
 DocType: Restaurant Order Entry,Last Sales Invoice,上次销售费用清单
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py,Please select Qty against item {0},请选择为物料{0}指定数量
+apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py,Latest Age,后期
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js,Transfer Material to Supplier,转印材料供应商
 apps/erpnext/erpnext/hr/report/loan_repayment/loan_repayment.py,EMI,EMI
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py,New Serial No cannot have Warehouse. Warehouse must be set by Stock Entry or Purchase Receipt,新序列号不能有仓库，仓库只能通过手工库存移动和采购收货单设置。
 DocType: Lead,Lead Type,线索类型
@@ -5894,7 +5912,6 @@
 apps/erpnext/erpnext/hr/doctype/employee_benefit_application/employee_benefit_application.py,"An amount of {0} already claimed for the component {1},\
 						 set the amount equal or greater than {2}",已为组件{1}申请的金额{0}，设置等于或大于{2}的金额
 DocType: Shipping Rule,Shipping Rule Conditions,配送规则条件
-DocType: Purchase Invoice,Export Type,导出类型
 DocType: Salary Slip Loan,Salary Slip Loan,工资单贷款
 DocType: BOM Update Tool,The new BOM after replacement,更换后的新物料清单
 ,Point of Sale,销售点
@@ -5968,6 +5985,7 @@
 apps/erpnext/erpnext/accounts/doctype/exchange_rate_revaluation/exchange_rate_revaluation.py,Please set Unrealized Exchange Gain/Loss Account in Company {0},请在公司{0}中设置未实现汇兑损益科目
 apps/erpnext/erpnext/utilities/user_progress.py,"Add users to your organization, other than yourself.",将用户添加到您的组织，而不是您自己。
 DocType: Customer Group,Customer Group Name,客户群组名称
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py,Row {0}: Quantity not available for {4} in warehouse {1} at posting time of the entry ({2} {3}),第{0}行：在输入条目（{2} {3}）时，仓库{1}中{4}不可使用的数量
 apps/erpnext/erpnext/public/js/pos/pos.html,No Customers yet!,还没有客户！
 DocType: Quality Procedure Process,Link existing Quality Procedure.,链接现有的质量程序。
 apps/erpnext/erpnext/config/hr.py,Loans,贷款
@@ -6015,7 +6033,6 @@
 DocType: Purchase Order Item,Blanket Order Rate,总括订单单价
 ,Customer Ledger Summary,客户分类帐摘要
 apps/erpnext/erpnext/hooks.py,Certification,证明
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js,Are you sure you want to make debit note?,您确定要制作借记通知单吗？
 DocType: Bank Guarantee,Clauses and Conditions,条款和条件
 DocType: Serial No,Creation Document Type,创建文件类型
 DocType: Amazon MWS Settings,ES,ES
@@ -6053,8 +6070,6 @@
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py,Financial Services,金融服务
 DocType: Student Sibling,Student ID,学生卡
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.js,For Quantity must be greater than zero,对于数量必须大于零
-apps/erpnext/erpnext/hr/doctype/employee_transfer/employee_transfer.py,"Please delete the Employee <a href=""#Form/Employee/{0}"">{0}</a>\
-					to cancel this document","请删除员工<a href=""#Form/Employee/{0}"">{0}</a> \以取消此文档"
 apps/erpnext/erpnext/config/projects.py,Types of activities for Time Logs,用于工时记录的活动类型
 DocType: Opening Invoice Creation Tool,Sales,销售
 DocType: Stock Entry Detail,Basic Amount,基本金额
@@ -6133,6 +6148,7 @@
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py,Print and Stationery,打印和文具
 DocType: Stock Settings,Show Barcode Field,显示条形码字段
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js,Send Supplier Emails,发送电子邮件供应商
+DocType: Asset Movement,ACC-ASM-.YYYY.-,ACC-ASM-.YYYY.-
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py,"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,自动创建
 apps/erpnext/erpnext/hr/doctype/employee_onboarding/employee_onboarding.py,Submit this to create the Employee record,提交这个来创建员工记录
@@ -6212,7 +6228,6 @@
 DocType: Sales Team,Contact No.,联络人电话
 apps/erpnext/erpnext/templates/includes/cart/cart_address.html,Billing Address is same as Shipping Address,帐单地址与送货地址相同
 DocType: Bank Reconciliation,Payment Entries,付款项
-apps/erpnext/erpnext/erpnext_integrations/doctype/shopify_settings/shopify_settings.py,Access token or Shopify URL missing,访问令牌或Shopify网址丢失
 DocType: Location,Latitude,纬度
 DocType: Work Order,Scrap Warehouse,废料仓库
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py,"Warehouse required at Row No {0}, please set default warehouse for the item {1} for the company {2}",在第{0}行需要仓库，请为公司{2}的物料{1}设置默认仓库
@@ -6257,7 +6272,6 @@
 DocType: Job Offer Term,Value / Description,值/说明
 apps/erpnext/erpnext/controllers/accounts_controller.py,"Row #{0}: Asset {1} cannot be submitted, it is already {2}",行＃{0}：资产{1}无法提交，这已经是{2}
 DocType: Tax Rule,Billing Country,结算国家
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js,Are you sure you want to make credit note?,你确定要记下信用卡吗？
 DocType: Purchase Order Item,Expected Delivery Date,预计交货日期
 DocType: Restaurant Order Entry,Restaurant Order Entry,餐厅订单录入
 apps/erpnext/erpnext/accounts/general_ledger.py,Debit and Credit not equal for {0} #{1}. Difference is {2}.,借贷{0}＃不等于{1}。不同的是{2}。
@@ -6382,6 +6396,7 @@
 DocType: Purchase Invoice,Taxes and Charges Added,已添加的税费
 apps/erpnext/erpnext/assets/doctype/asset/asset.py,Depreciation Row {0}: Next Depreciation Date cannot be before Available-for-use Date,折旧行{0}：下一个折旧日期不能在可供使用的日期之前
 ,Sales Funnel,销售漏斗
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Item Code &gt; Item Group &gt; Brand,物料代码&gt;物料组&gt;品牌
 apps/erpnext/erpnext/setup/doctype/company/company.py,Abbreviation is mandatory,缩写字段必填
 DocType: Project,Task Progress,任务进度
 apps/erpnext/erpnext/templates/includes/navbar/navbar_items.html,Cart,购物车
@@ -6627,6 +6642,7 @@
 DocType: Employee Grade,Employee Grade,员工职级
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py,Piecework,计件工作
 DocType: GSTR 3B Report,June,六月
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Supplier &gt; Supplier Type,供应商&gt;供应商类型
 DocType: Share Balance,From No,来自No
 DocType: Shift Type,Early Exit Grace Period,提前退出宽限期
 DocType: Task,Actual Time (in Hours),实际时间（小时）
@@ -6913,6 +6929,7 @@
 DocType: Warehouse,Warehouse Name,仓库名称
 DocType: Naming Series,Select Transaction,选择交易
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py,Please enter Approving Role or Approving User,请输入角色核准或审批用户
+apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.py,UOM Conversion factor ({0} -&gt; {1}) not found for item: {2},找不到项目{2}的UOM转换因子（{0}-&gt; {1}）
 apps/erpnext/erpnext/support/doctype/service_level_agreement/service_level_agreement.py,Service Level Agreement with Entity Type {0} and Entity {1} already exists.,与实体类型{0}和实体{1}的服务水平协议已存在。
 DocType: Journal Entry,Write Off Entry,销帐分录
 DocType: BOM,Rate Of Materials Based On,基于以下的物料单价
@@ -7104,6 +7121,7 @@
 DocType: Quality Inspection Reading,Quality Inspection Reading,质量检验报表
 apps/erpnext/erpnext/stock/doctype/stock_settings/stock_settings.py,`Freeze Stocks Older Than` should be smaller than %d days.,`冻结老于此天数的库存`应该比％d天小。
 DocType: Tax Rule,Purchase Tax Template,进项税模板
+apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py,Earliest Age,最早年龄
 apps/erpnext/erpnext/utilities/user_progress.py,Set a sales goal you'd like to achieve for your company.,为您的公司设定您想要实现的销售目标。
 DocType: Quality Goal,Revision,调整
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js,Healthcare Services,医疗服务
@@ -7147,6 +7165,7 @@
 apps/erpnext/erpnext/healthcare/doctype/patient_encounter/patient_encounter.js,Schedule Discharge,附表卸货
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py,Cheques and Deposits incorrectly cleared,支票及存款非正常清账
 DocType: Homepage Section Card,Homepage Section Card,主页卡片
+,Amount To Be Billed,开票金额
 apps/erpnext/erpnext/accounts/doctype/account/account.py,Account {0}: You can not assign itself as parent account,科目{0}不能是自己的上级科目
 DocType: Purchase Invoice Item,Price List Rate,价格清单单价
 apps/erpnext/erpnext/utilities/activation.py,Create customer quotes,创建客户报价
@@ -7199,6 +7218,7 @@
 DocType: Supplier Scorecard Criteria,Supplier Scorecard Criteria,供应商记分卡标准
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py,Please select Start Date and End Date for Item {0},请选择开始日期和结束日期的项目{0}
 DocType: Maintenance Schedule,MAT-MSH-.YYYY.-,MAT-MSH-.YYYY.-
+,Amount to Receive,收取金额
 apps/erpnext/erpnext/education/doctype/student_group_creation_tool/student_group_creation_tool.py,Course is mandatory in row {0},第{0}行中的课程信息必填
 apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py,From date can not be greater than than To date,从日期开始不能大于To date
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py,To date cannot be before from date,无效的主名称
@@ -7450,7 +7470,6 @@
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js,BOM and Manufacturing Quantity are required,物料清单和生产量是必需的
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js,Ageing Range 2,账龄范围2
 DocType: SG Creation Tool Course,Max Strength,最大力量
-apps/erpnext/erpnext/accounts/doctype/account/account.py,"Account {0} already exists in child company {1}. The following fields have different values, they should be same:<ul><li>{2}</li></ul>",子公司{1}中已存在帐户{0}。以下字段具有不同的值，它们应该相同： <ul><li> {2} </li></ul>
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py,Installing presets,安装预置
 DocType: Fee Schedule,EDU-FSH-.YYYY.-,EDU-FSH-.YYYY.-
 apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js,No Delivery Note selected for Customer {},没有为客户{}选择销售出货单
@@ -7662,6 +7681,7 @@
 DocType: Delivery Note,Print Without Amount,打印量不
 apps/erpnext/erpnext/accounts/report/asset_depreciation_ledger/asset_depreciation_ledger.py,Depreciation Date,折旧日期
 ,Work Orders in Progress,工单正在进行中
+DocType: Customer Credit Limit,Bypass Credit Limit Check,绕过信用额度检查
 DocType: Issue,Support Team,支持团队
 apps/erpnext/erpnext/stock/report/batch_item_expiry_status/batch_item_expiry_status.py,Expiry (In Days),过期(按天计算)
 DocType: Appraisal,Total Score (Out of 5),总分（满分5分）
@@ -7848,6 +7868,7 @@
 DocType: Sales Invoice,Customer GSTIN,客户GSTIN
 DocType: Crop Cycle,List of diseases detected on the field. When selected it'll automatically add a list of tasks to deal with the disease ,在现场检测到的疾病清单。当选择它会自动添加一个任务清单处理疾病
 apps/erpnext/erpnext/manufacturing/page/bom_comparison_tool/bom_comparison_tool.js,BOM 1,BOM 1
+apps/erpnext/erpnext/assets/report/fixed_asset_register/fixed_asset_register.py,Asset Id,资产编号
 apps/erpnext/erpnext/healthcare/doctype/healthcare_service_unit/healthcare_service_unit.js,This is a root healthcare service unit and cannot be edited.,这是根医疗保健服务单位，不能编辑。
 DocType: Asset Repair,Repair Status,维修状态
 apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.js,"Requested Qty: Quantity requested for purchase, but not ordered.",要求的数量：数量要求的报价，但没有下令。
diff --git a/erpnext/translations/zh_tw.csv b/erpnext/translations/zh_tw.csv
index ab323e4..2551d55 100644
--- a/erpnext/translations/zh_tw.csv
+++ b/erpnext/translations/zh_tw.csv
@@ -256,7 +256,6 @@
 DocType: Loan,Repay Over Number of Periods,償還期的超過數
 apps/erpnext/erpnext/manufacturing/report/bom_stock_report/bom_stock_report.py,Quantity to Produce can not be less than Zero,生產數量不能少於零
 DocType: Stock Entry,Additional Costs,額外費用
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Customer &gt; Customer Group &gt; Territory,客戶&gt;客戶組&gt;地區
 apps/erpnext/erpnext/accounts/doctype/account/account.py,Account with existing transaction can not be converted to group.,帳戶與現有的交易不能被轉換到群組。
 DocType: Lead,Product Enquiry,產品查詢
 DocType: Education Settings,Validate Batch for Students in Student Group,驗證學生組學生的批次
@@ -531,6 +530,7 @@
 DocType: Healthcare Settings,Create documents for sample collection,創建樣本收集文件
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py,Payment against {0} {1} cannot be greater than Outstanding Amount {2},對支付{0} {1}不能大於未償還{2}
 apps/erpnext/erpnext/patches/v11_0/add_healthcare_service_unit_tree_root.py,All Healthcare Service Units,所有醫療服務單位
+apps/erpnext/erpnext/setup/default_energy_point_rules.py,On Converting Opportunity,轉換機會
 DocType: Lead,Mobile No.,手機號碼
 DocType: Maintenance Schedule,Generate Schedule,生成時間表
 DocType: Purchase Invoice Item,Expense Head,總支出
@@ -586,7 +586,6 @@
 DocType: Stock Settings,Notify by Email on creation of automatic Material Request,在建立自動材料需求時以電子郵件通知
 DocType: Accounting Dimension,Dimension Name,尺寸名稱
 apps/erpnext/erpnext/hotels/doctype/hotel_room_reservation/hotel_room_reservation.py,Please set Hotel Room Rate on {},請在{}上設置酒店房價
-apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py,Please setup numbering series for Attendance via Setup &gt; Numbering Series,請通過設置&gt;編號系列設置出勤編號系列
 DocType: Journal Entry,Multi Currency,多幣種
 DocType: Bank Statement Transaction Invoice Item,Invoice Type,發票類型
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py,Valid from date must be less than valid upto date,從日期開始有效必須低於最新有效期
@@ -694,6 +693,7 @@
 apps/erpnext/erpnext/accounts/page/pos/pos.js,Create a new Customer,創建一個新的客戶
 apps/erpnext/erpnext/non_profit/report/expiring_memberships/expiring_memberships.py,Expiring On,即將到期
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,"If multiple Pricing Rules continue to prevail, users are asked to set Priority manually to resolve conflict.",如果有多個定價規則繼續有效，用戶將被要求手動設定優先順序來解決衝突。
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js,Purchase Return,採購退貨
 apps/erpnext/erpnext/utilities/activation.py,Create Purchase Orders,創建採購訂單
 ,Purchase Register,購買註冊
 DocType: Landed Cost Item,Applicable Charges,相關費用
@@ -706,7 +706,6 @@
 DocType: Location,Area UOM,區域UOM
 apps/erpnext/erpnext/manufacturing/doctype/workstation/workstation.py,Workstation is closed on the following dates as per Holiday List: {0},工作站在以下日期關閉按假日列表：{0}
 apps/erpnext/erpnext/selling/page/sales_funnel/sales_funnel.py,Opportunities,機會
-apps/erpnext/erpnext/www/all-products/index.html,Clear filters,清除過濾器
 DocType: Lab Test Template,Single,單
 DocType: Compensatory Leave Request,Work From Date,從日期開始工作
 DocType: Salary Slip,Total Loan Repayment,總貸款還款
@@ -749,6 +748,7 @@
 apps/erpnext/erpnext/education/doctype/program_enrollment_tool/program_enrollment_tool.py,Mandatory field - Academic Year,必修課 - 學年
 apps/erpnext/erpnext/education/doctype/program_enrollment_tool/program_enrollment_tool.py,Mandatory field - Academic Year,必修課 - 學年
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py,{0} {1} is not associated with {2} {3},{0} {1} 未與 {2} {3} 關聯
+DocType: Opportunity,Converted By,轉換依據
 apps/erpnext/erpnext/public/js/hub/components/ReviewArea.vue,You need to login as a Marketplace User before you can add any reviews.,在添加任何評論之前，您需要以市場用戶身份登錄。
 apps/erpnext/erpnext/manufacturing/doctype/job_card/job_card.py,Row {0} : Operation is required against the raw material item {1},行{0}：對原材料項{1}需要操作
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py,Please set default payable account for the company {0},請為公司{0}設置預設應付賬款
@@ -774,6 +774,8 @@
 DocType: Sales Invoice,Total Qty,總數量
 apps/erpnext/erpnext/education/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py,Guardian2 Email ID,Guardian2電子郵件ID
 apps/erpnext/erpnext/education/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py,Guardian2 Email ID,Guardian2電子郵件ID
+apps/erpnext/erpnext/hr/doctype/employee_transfer/employee_transfer.py,"Please delete the Employee <a href=""#Form/Employee/{0}"">{0}</a>\
+					to cancel this document","請刪除員工<a href=""#Form/Employee/{0}"">{0}</a> \以取消此文檔"
 DocType: Item,Show in Website (Variant),展網站（變體）
 DocType: Employee,Health Concerns,健康問題
 DocType: Payroll Entry,Select Payroll Period,選擇工資期
@@ -826,7 +828,6 @@
 apps/erpnext/erpnext/education/doctype/student_group/student_group.py,Please select Course,請選擇課程
 DocType: Codification Table,Codification Table,編纂表
 DocType: Timesheet Detail,Hrs,小時
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js,Please select Company,請選擇公司
 DocType: Employee Skill,Employee Skill,員工技能
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.js,Difference Account,差異帳戶
 DocType: Purchase Invoice,Supplier GSTIN,供應商GSTIN
@@ -891,6 +892,7 @@
 DocType: BOM,Operating Cost,營業成本
 DocType: Crop,Produced Items,生產物品
 DocType: Bank Statement Transaction Entry,Match Transaction to Invoices,將交易與發票匹配
+apps/erpnext/erpnext/erpnext_integrations/exotel_integration.py,Error in Exotel incoming call,Exotel來電錯誤
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js,Unblock Invoice,取消屏蔽發票
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py,Increment cannot be 0,增量不能為0
 DocType: Company,Delete Company Transactions,刪除公司事務
@@ -1081,6 +1083,7 @@
 DocType: Activity Cost,Activity Type,活動類型
 DocType: Request for Quotation,For individual supplier,對於個別供應商
 DocType: BOM Operation,Base Hour Rate(Company Currency),基數小時率（公司貨幣）
+,Qty To Be Billed,計費數量
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py,Delivered Amount,交付金額
 apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.js,Reserved Qty for Production: Raw materials quantity to make manufacturing items.,生產保留數量：生產製造項目的原材料數量。
 DocType: Loyalty Point Entry Redemption,Redemption Date,贖回日期
@@ -1194,7 +1197,7 @@
 apps/erpnext/erpnext/education/doctype/student_group/student_group.py,Please select Program,請選擇程序
 apps/erpnext/erpnext/education/doctype/student_group/student_group.py,Please select Program,請選擇程序
 DocType: Project,Estimated Cost,估計成本
-DocType: Request for Quotation,Link to material requests,鏈接到材料請求
+DocType: Supplier Quotation,Link to material requests,鏈接到材料請求
 apps/erpnext/erpnext/public/js/hub/pages/Publish.vue,Publish,發布
 DocType: Journal Entry,Credit Card Entry,信用卡進入
 apps/erpnext/erpnext/config/selling.py,Invoices for Costumers.,客戶發票。
@@ -1205,6 +1208,7 @@
 apps/erpnext/erpnext/utilities/transaction_base.py,Invalid Posting Time,發佈時間無效
 DocType: Salary Component,Condition and Formula,條件和公式
 DocType: Lead,Campaign Name,活動名稱
+apps/erpnext/erpnext/setup/default_energy_point_rules.py,On Task Completion,完成任務
 apps/erpnext/erpnext/hr/doctype/compensatory_leave_request/compensatory_leave_request.py,There is no leave period in between {0} and {1},{0}和{1}之間沒有休假期限
 DocType: Fee Validity,Healthcare Practitioner,醫療從業者
 DocType: Travel Request Costing,Expense Type,費用類型
@@ -1542,7 +1546,6 @@
 DocType: Quality Feedback Template,Quality Feedback Template,質量反饋模板
 apps/erpnext/erpnext/config/education.py,LMS Activity,LMS活動
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py,Internet Publishing,互聯網出版
-DocType: Prescription Duration,Number,數
 apps/erpnext/erpnext/accounts/doctype/opening_invoice_creation_tool/opening_invoice_creation_tool.js,Creating {0} Invoice,創建{0}發票
 DocType: Medical Code,Medical Code Standard,醫療代碼標準
 DocType: Item Group,Item Group Defaults,項目組默認值
@@ -1610,6 +1613,7 @@
 DocType: Cheque Print Template,Has Print Format,擁有打印格式
 DocType: Support Settings,Get Started Sections,入門部分
 DocType: Invoice Discounting,Sanctioned,制裁
+,Base Amount,基本金額
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.js,Total Contribution Amount: {0},總貢獻金額：{0}
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py,Row #{0}: Please specify Serial No for Item {1},列#{0}：請為項目{1}指定序號
 DocType: Payroll Entry,Salary Slips Submitted,提交工資單
@@ -1872,6 +1876,7 @@
 DocType: Purchase Invoice,Start date of current invoice's period,當前發票期間內的開始日期
 DocType: Shift Type,Process Attendance After,過程出勤
 DocType: Salary Slip,Leave Without Pay,無薪假
+apps/erpnext/erpnext/setup/default_energy_point_rules.py,On {0} Creation,在{0}創建時
 apps/erpnext/erpnext/regional/doctype/gstr_3b_report/gstr_3b_report.html,State/UT Tax,州/ UT稅
 ,Trial Balance for Party,試算表的派對
 ,Gross and Net Profit Report,毛利潤和淨利潤報告
@@ -1982,6 +1987,7 @@
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js,Make Stock Entry,進入股票
 DocType: Hotel Room Reservation,Hotel Reservation User,酒店預訂用戶
 apps/erpnext/erpnext/projects/doctype/project/project.js,Set Status,設置狀態
+apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py,Please setup numbering series for Attendance via Setup &gt; Numbering Series,請通過“設置”&gt;“編號序列”為出勤設置編號序列
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py,Please select prefix first,請先選擇前綴稱號
 apps/erpnext/erpnext/public/js/hub/pages/Home.vue,Near you,在你旁邊
 DocType: Subscription Settings,Subscription Settings,訂閱設置
@@ -1993,6 +1999,7 @@
 DocType: Announcement,All Students,所有學生
 apps/erpnext/erpnext/assets/doctype/asset/asset.py,Item {0} must be a non-stock item,項{0}必須是一個非庫存項目
 apps/erpnext/erpnext/stock/doctype/batch/batch.js,View Ledger,查看總帳
+DocType: Cost Center,Lft,LFT
 DocType: Grading Scale,Intervals,間隔
 DocType: Bank Statement Transaction Entry,Reconciled Transactions,協調的事務
 DocType: Crop Cycle,Linked Location,鏈接位置
@@ -2093,6 +2100,7 @@
 apps/erpnext/erpnext/config/buying.py,Key Reports,主要報告
 apps/erpnext/erpnext/hr/doctype/employee_benefit_application/employee_benefit_application.py,As per your assigned Salary Structure you cannot apply for benefits,根據您指定的薪資結構，您無法申請福利
 apps/erpnext/erpnext/stock/doctype/item/item.py,Website Image should be a public file or website URL,網站形象應該是一個公共文件或網站網址
+apps/erpnext/erpnext/stock/doctype/item/item.py,Duplicate entry in Manufacturers table,製造商表中的條目重複
 apps/erpnext/erpnext/setup/doctype/item_group/item_group.js,This is a root item group and cannot be edited.,這是個根項目群組，且無法被編輯。
 apps/erpnext/erpnext/accounts/doctype/account/account.js,Merge,合併
 DocType: Journal Entry Account,Purchase Order,採購訂單
@@ -2227,7 +2235,6 @@
 apps/erpnext/erpnext/public/js/utils/serial_no_batch_selector.js,Please select batches for batched item ,請為批量選擇批次
 DocType: Asset,Depreciation Schedules,折舊計劃
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.js,Create Sales Invoice,創建銷售發票
-apps/erpnext/erpnext/erpnext_integrations/doctype/shopify_settings/shopify_settings.py,"Support for public app is deprecated. Please setup private app, for more details refer user manual",對公共應用程序的支持已被棄用。請設置私人應用程序，更多詳細信息請參閱用戶手冊
 DocType: Task,Dependent Tasks,相關任務
 apps/erpnext/erpnext/regional/report/gstr_1/gstr_1.py,Following accounts might be selected in GST Settings:,以下帳戶可能在GST設置中選擇：
 apps/erpnext/erpnext/manufacturing/report/bom_stock_report/bom_stock_report.js,Quantity to Produce,生產數量
@@ -2456,6 +2463,7 @@
 apps/erpnext/erpnext/erpnext_integrations/utils.py,Unverified Webhook Data,未經驗證的Webhook數據
 apps/erpnext/erpnext/regional/report/gstr_1/gstr_1.py,Please set valid GSTIN No. in Company Address,請在公司地址中設置有效的GSTIN號碼
 apps/erpnext/erpnext/education/utils.py,Student {0} - {1} appears Multiple times in row {2} & {3},學生{0}  -  {1}出現連續中多次{2}和{3}
+apps/erpnext/erpnext/selling/doctype/customer/customer.py,Following fields are mandatory to create address:,必須填寫以下字段才能創建地址：
 DocType: Item Alternative,Two-way,雙向
 DocType: Item,Manufacturers,製造商
 apps/erpnext/erpnext/accounts/deferred_revenue.py,Error while processing deferred accounting for {0},處理{0}的延遲記帳時出錯
@@ -2523,7 +2531,6 @@
 DocType: Staffing Plan Detail,Estimated Cost Per Position,估計的每位成本
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py,User {0} doesn't have any default POS Profile. Check Default at Row {1} for this User.,用戶{0}沒有任何默認的POS配置文件。檢查此用戶的行{1}處的默認值。
 DocType: Quality Meeting Minutes,Quality Meeting Minutes,質量會議紀要
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Supplier &gt; Supplier Type,供應商&gt;供應商類型
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py,Employee Referral,員工推薦
 DocType: Student Group,Set 0 for no limit,為不限制設為0
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py,The day(s) on which you are applying for leave are holidays. You need not apply for leave.,您目前提出休假申請的日期為休息日。您不需要申請休假。
@@ -2622,7 +2629,6 @@
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py,Against Supplier Invoice {0} dated {1},對供應商發票{0}日期{1}
 DocType: Customer,Default Price List,預設價格表
 apps/erpnext/erpnext/assets/doctype/asset/asset.py,Asset Movement record {0} created,資產運動記錄{0}創建
-apps/erpnext/erpnext/utilities/page/leaderboard/leaderboard.js,No items found.,未找到任何項目。
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py,You cannot delete Fiscal Year {0}. Fiscal Year {0} is set as default in Global Settings,您不能刪除會計年度{0}。會計年度{0}設置為默認的全局設置
 DocType: Share Transfer,Equity/Liability Account,股票/負債賬戶
 apps/erpnext/erpnext/setup/doctype/customer_group/customer_group.py,A customer with the same name already exists,一個同名的客戶已經存在
@@ -2637,6 +2643,7 @@
 apps/erpnext/erpnext/selling/doctype/customer/customer.py,Credit limit has been crossed for customer {0} ({1}/{2}),客戶{0}（{1} / {2}）的信用額度已超過
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py,Customer required for 'Customerwise Discount',需要' Customerwise折扣“客戶
 apps/erpnext/erpnext/config/accounting.py,Update bank payment dates with journals.,更新與日記帳之銀行付款日期。
+,Billed Qty,開票數量
 apps/erpnext/erpnext/stock/doctype/item/item_dashboard.py,Pricing,價錢
 DocType: Employee,Attendance Device ID (Biometric/RF tag ID),考勤設備ID（生物識別/ RF標籤ID）
 DocType: Quotation,Term Details,長期詳情
@@ -2659,6 +2666,7 @@
 DocType: Share Transfer,Asset Account,資產賬戶
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js,New release date should be in the future,新的發布日期應該是將來的
 DocType: Purchase Invoice,End date of current invoice's period,當前發票的期限的最後一天
+apps/erpnext/erpnext/hr/doctype/employee/employee.py,Please setup Employee Naming System in Human Resource &gt; HR Settings,請在人力資源&gt;人力資源設置中設置員工命名系統
 DocType: Lab Test,Technician Name,技術員姓名
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py,"Cannot ensure delivery by Serial No as \
 					Item {0} is added with and without Ensure Delivery by \
@@ -2666,6 +2674,7 @@
 DocType: Accounts Settings,Unlink Payment on Cancellation of Invoice,取消鏈接在發票上的取消付款
 DocType: Bank Reconciliation,From Date,從日期
 apps/erpnext/erpnext/hr/doctype/vehicle_log/vehicle_log.py,Current Odometer reading entered should be greater than initial Vehicle Odometer {0},進入當前的里程表讀數應該比最初的車輛里程表更大的{0}
+,Purchase Order Items To Be Received or Billed,要接收或開票的採購訂單項目
 DocType: Restaurant Reservation,No Show,沒有出現
 apps/erpnext/erpnext/regional/india/utils.py,You must be a registered supplier to generate e-Way Bill,您必須是註冊供應商才能生成電子方式賬單
 DocType: Shipping Rule Country,Shipping Rule Country,航運規則國家
@@ -2704,6 +2713,7 @@
 apps/erpnext/erpnext/templates/generators/item/item_add_to_cart.html,View in Cart,查看你的購物車
 DocType: Employee Checkin,Shift Actual Start,切換實際開始
 DocType: Tally Migration,Is Day Book Data Imported,是否導入了日記簿數據
+,Purchase Order Items To Be Received or Billed1,要接收或開票的採購訂單項目1
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py,Marketing Expenses,市場推廣開支
 apps/erpnext/erpnext/stock/doctype/pick_list/pick_list.py,{0} units of {1} is not available.,{0}的{0}單位不可用。
 ,Item Shortage Report,商品短缺報告
@@ -2914,7 +2924,6 @@
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js,Material Consumption is not set in Manufacturing Settings.,材料消耗未在生產設置中設置。
 apps/erpnext/erpnext/public/js/call_popup/call_popup.js,View all issues from {0},查看{0}中的所有問題
 DocType: Quality Meeting Table,Quality Meeting Table,質量會議桌
-apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,請通過設置&gt;設置&gt;命名系列為{0}設置命名系列
 apps/erpnext/erpnext/templates/pages/help.html,Visit the forums,訪問論壇
 DocType: Student,Student Mobile Number,學生手機號碼
 DocType: Item,Has Variants,有變種
@@ -3043,6 +3052,7 @@
 ,Campaign Efficiency,運動效率
 ,Campaign Efficiency,運動效率
 DocType: Discussion,Discussion,討論
+apps/erpnext/erpnext/setup/default_energy_point_rules.py,On Sales Order Submission,提交銷售訂單
 DocType: Bank Transaction,Transaction ID,事務ID
 DocType: Payroll Entry,Deduct Tax For Unsubmitted Tax Exemption Proof,扣除未提交免稅證明的稅額
 DocType: Volunteer,Anytime,任何時候
@@ -3050,7 +3060,6 @@
 DocType: Employee Tax Exemption Proof Submission,Employee Tax Exemption Proof Submission,員工免稅證明提交
 DocType: Patient,Surgical History,手術史
 DocType: Bank Statement Settings Item,Mapped Header,映射的標題
-apps/erpnext/erpnext/hr/doctype/employee/employee.py,Please setup Employee Naming System in Human Resource &gt; HR Settings,請在人力資源&gt;人力資源設置中設置員工命名系統
 DocType: Employee,Resignation Letter Date,辭退信日期
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Pricing Rules are further filtered based on quantity.,定價規則進一步過濾基於數量。
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py,Please set the Date Of Joining for employee {0},請為員工{0}設置加入日期
@@ -3064,6 +3073,7 @@
 DocType: Bank Statement Settings,Mapped Items,映射項目
 DocType: Amazon MWS Settings,IT,它
 DocType: Chapter,Chapter,章節
+,Fixed Asset Register,固定資產登記冊
 apps/erpnext/erpnext/utilities/user_progress.py,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,Select BOM and Qty for Production,選擇BOM和數量生產
@@ -3192,7 +3202,6 @@
 apps/erpnext/erpnext/templates/emails/reorder_item.html,Following Material Requests have been raised automatically based on Item's re-order level,下列資料的要求已自動根據項目的重新排序水平的提高
 apps/erpnext/erpnext/controllers/accounts_controller.py,Account {0} is invalid. Account Currency must be {1},帳戶{0}是無效的。帳戶貨幣必須是{1}
 apps/erpnext/erpnext/hr/doctype/salary_structure_assignment/salary_structure_assignment.py,From Date {0} cannot be after employee's relieving Date {1},起始日期{0}不能在員工解除日期之後{1}
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py,Debit Note {0} has been created automatically,已自動創建借方通知單{0}
 apps/erpnext/erpnext/accounts/doctype/payment_order/payment_order.js,Create Payment Entries,創建付款條目
 DocType: Supplier,Is Internal Supplier,是內部供應商
 DocType: Employee,Create User Permission,創建用戶權限
@@ -3704,7 +3713,6 @@
 DocType: Project User,Project Status,項目狀態
 DocType: UOM,Check this to disallow fractions. (for Nos),勾選此選項則禁止分數。 （對於NOS）
 DocType: Student Admission Program,Naming Series (for Student Applicant),命名系列（面向學生申請人）
-apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.py,UOM Conversion factor ({0} -&gt; {1}) not found for item: {2},未找到項目的UOM轉換因子（{0}  - &gt; {1}）：{2}
 apps/erpnext/erpnext/hr/doctype/retention_bonus/retention_bonus.py,Bonus Payment Date cannot be a past date,獎金支付日期不能是過去的日期
 DocType: Travel Request,Copy of Invitation/Announcement,邀請/公告的副本
 DocType: Practitioner Service Unit Schedule,Practitioner Service Unit Schedule,從業者服務單位時間表
@@ -3891,6 +3899,8 @@
 apps/erpnext/erpnext/accounts/utils.py,Allocated amount cannot be negative,分配數量不能為負數
 DocType: Sales Order,Billing Status,計費狀態
 apps/erpnext/erpnext/public/js/conf.js,Report an Issue,報告問題
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/utils.py,"If you {0} {1} quantities of the item <b>{2}</b>, the scheme <b>{3}</b>
+			will be applied on the item.",如果您{0} {1}個項目<b>{2}的數量</b> ，則方案<b>{3}</b>將應用於該項目。
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py,Utility Expenses,公用事業費用
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py,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,標準重量
@@ -3930,7 +3940,6 @@
 DocType: Journal Entry,Accounting Entries,會計分錄
 DocType: Job Card Time Log,Job Card Time Log,工作卡時間日誌
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,"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;字段中取出。
-apps/erpnext/erpnext/education/doctype/instructor/instructor.py,Please setup Instructor Naming System in Education &gt; Education Settings,請在教育&gt;教育設置中設置教師命名系統
 DocType: Journal Entry,Paid Loan,付費貸款
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py,Duplicate Entry. Please check Authorization Rule {0},重複的條目。請檢查授權規則{0}
 DocType: Journal Entry Account,Reference Due Date,參考到期日
@@ -3946,7 +3955,6 @@
 apps/erpnext/erpnext/templates/pages/projects.html,No time sheets,沒有考勤表
 DocType: GoCardless Mandate,GoCardless Customer,GoCardless客戶
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py,Leave Type {0} cannot be carry-forwarded,休假類型{0}不能隨身轉發
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Item Code &gt; Item Group &gt; Brand,商品代碼&gt;商品分組&gt;品牌
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py,Maintenance Schedule is not generated for all the items. Please click on 'Generate Schedule',維護計畫不會為全部品項生成。請點擊“生成表”
 ,To Produce,以生產
 DocType: Leave Encashment,Payroll,工資表
@@ -4053,7 +4061,6 @@
 DocType: Stock Ledger Entry,Actual Qty After Transaction,交易後實際數量
 ,Pending SO Items For Purchase Request,待處理的SO項目對於採購申請
 apps/erpnext/erpnext/education/doctype/student_admission/student_admission.py,Student Admissions,學生入學
-apps/erpnext/erpnext/accounts/party.py,{0} {1} is disabled,{0} {1}被禁用
 DocType: Supplier,Billing Currency,結算貨幣
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py,Extra Large,特大號
 DocType: Loan,Loan Application,申請貸款
@@ -4125,7 +4132,6 @@
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py,Only Leave Applications with status 'Approved' and 'Rejected' can be submitted,只留下地位的申請“已批准”和“拒絕”，就可以提交
 apps/erpnext/erpnext/accounts/doctype/accounting_dimension/accounting_dimension.py,Creating Dimensions...,創建尺寸......
 apps/erpnext/erpnext/education/doctype/student_group_creation_tool/student_group_creation_tool.py,Student Group Name is mandatory in row {0},學生組名稱是強制性的行{0}
-DocType: Customer Credit Limit,Bypass credit limit_check,繞過信用限額_檢查
 DocType: Homepage,Products to be shown on website homepage,在網站首頁中顯示的產品
 DocType: HR Settings,Password Policy,密碼政策
 apps/erpnext/erpnext/setup/doctype/customer_group/customer_group.js,This is a root customer group and cannot be edited.,ERPNext是一個開源的基於Web的ERP系統，通過網路技術，向私人有限公司提供整合的工具，在一個小的組織管理大多數流程。有關Web註釋，或購買託管，想得到更多資訊，請連結
@@ -4411,6 +4417,7 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py,Row {0}: Advance against Customer must be credit,行{0}：提前對客戶必須是信用
 DocType: Quality Meeting,Quality Meeting,質量會議
 apps/erpnext/erpnext/accounts/doctype/account/account.js,Non-Group to Group,非集團集團
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,請通過設置&gt;設置&gt;命名系列為{0}設置命名系列
 DocType: Employee,ERPNext User,ERPNext用戶
 apps/erpnext/erpnext/education/doctype/student_group_creation_tool/student_group_creation_tool.py,Batch is mandatory in row {0},在{0}行中必須使用批處理
 apps/erpnext/erpnext/education/doctype/student_group_creation_tool/student_group_creation_tool.py,Batch is mandatory in row {0},在{0}行中必須使用批處理
@@ -4686,6 +4693,7 @@
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py,No {0} found for Inter Company Transactions.,Inter公司沒有找到{0}。
 DocType: Travel Itinerary,Rented Car,租車
 apps/erpnext/erpnext/public/js/hub/components/profile_dialog.js,About your Company,關於貴公司
+apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.js,Show Stock Ageing Data,顯示庫存賬齡數據
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py,Credit To account must be a Balance Sheet account,信用帳戶必須是資產負債表科目
 DocType: Donor,Donor,捐贈者
 DocType: Global Defaults,Disable In Words,禁用詞
@@ -4699,8 +4707,10 @@
 DocType: Practitioner Schedule,Schedule Name,計劃名稱
 apps/erpnext/erpnext/regional/doctype/gstr_3b_report/gstr_3b_report.py,Please enter GSTIN and state for the Company Address {0},請輸入GSTIN並說明公司地址{0}
 DocType: Currency Exchange,For Buying,為了購買
+apps/erpnext/erpnext/setup/default_energy_point_rules.py,On Purchase Order Submission,提交採購訂單時
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js,Add All Suppliers,添加所有供應商
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py,Row #{0}: Allocated Amount cannot be greater than outstanding amount.,行＃{0}：分配金額不能大於未結算金額。
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Customer &gt; Customer Group &gt; Territory,客戶&gt;客戶組&gt;地區
 DocType: Tally Migration,Parties,派對
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js,Browse BOM,瀏覽BOM
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py,Secured Loans,抵押貸款
@@ -4731,6 +4741,7 @@
 apps/erpnext/erpnext/stock/doctype/item_alternative/item_alternative.py,Not allow to set alternative item for the item {0},不允許為項目{0}設置替代項目
 apps/erpnext/erpnext/hr/doctype/leave_block_list/leave_block_list.py,Date is repeated,日期重複
 apps/erpnext/erpnext/accounts/print_format/payment_receipt_voucher/payment_receipt_voucher.html,Authorized Signatory,授權簽字人
+apps/erpnext/erpnext/education/doctype/instructor/instructor.py,Please setup Instructor Naming System in Education &gt; Education Settings,請在“教育”&gt;“教育設置”中設置教師命名系統
 apps/erpnext/erpnext/regional/doctype/gstr_3b_report/gstr_3b_report.html,Net ITC Available(A) - (B),淨ITC可用（A） - （B）
 apps/erpnext/erpnext/education/doctype/fee_schedule/fee_schedule.js,Create Fees,創造費用
 DocType: Project,Total Purchase Cost (via Purchase Invoice),總購買成本（通過採購發票）
@@ -4750,6 +4761,7 @@
 apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py,"Bank Account, From Date and To Date are Mandatory",銀行賬戶，從日期到日期是強制性的
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.js,Message Sent,發送訊息
 apps/erpnext/erpnext/accounts/doctype/account/account.py,Account with child nodes cannot be set as ledger,帳戶與子節點不能被設置為分類帳
+apps/erpnext/erpnext/assets/report/fixed_asset_register/fixed_asset_register.py,Vendor Name,供應商名稱
 DocType: Quiz Result,Wrong,錯誤
 DocType: Sales Invoice,Rate at which Price list currency is converted to customer's base currency,價目表貨幣被換算成客戶基礎貨幣的匯率
 DocType: Purchase Invoice Item,Net Amount (Company Currency),淨金額（公司貨幣）
@@ -4976,6 +4988,7 @@
 DocType: Stock Settings,Auto Material Request,自動物料需求
 DocType: Woocommerce Settings,API consumer secret,API消費者秘密
 DocType: Delivery Note Item,Available Batch Qty at From Warehouse,在從倉庫可用的批次數量
+,Received Qty Amount,收到的數量
 DocType: Salary Slip,Gross Pay - Total Deduction - Loan Repayment,工資總額 - 扣除總額 - 貸款還款
 DocType: Expense Claim,Expense Taxes and Charges,費用稅和費用
 apps/erpnext/erpnext/manufacturing/doctype/bom_update_tool/bom_update_tool.py,Current BOM and New BOM can not be same,當前BOM和新BOM不能相同
@@ -5407,6 +5420,8 @@
 DocType: Drug Prescription,Hour,小時
 DocType: Restaurant Order Entry,Last Sales Invoice,上次銷售發票
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py,Please select Qty against item {0},請選擇項目{0}的數量
+apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py,Latest Age,後期
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js,Transfer Material to Supplier,轉印材料供應商
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py,New Serial No cannot have Warehouse. Warehouse must be set by Stock Entry or Purchase Receipt,新的序列號不能有倉庫。倉庫必須由存貨分錄或採購入庫單進行設定
 DocType: Lead,Lead Type,主導類型
 apps/erpnext/erpnext/utilities/activation.py,Create Quotation,建立報價
@@ -5427,7 +5442,6 @@
 apps/erpnext/erpnext/hr/doctype/employee_benefit_application/employee_benefit_application.py,"An amount of {0} already claimed for the component {1},\
 						 set the amount equal or greater than {2}",已為組件{1}申請的金額{0}，設置等於或大於{2}的金額
 DocType: Shipping Rule,Shipping Rule Conditions,送貨規則條件
-DocType: Purchase Invoice,Export Type,導出類型
 DocType: Salary Slip Loan,Salary Slip Loan,工資單貸款
 DocType: BOM Update Tool,The new BOM after replacement,更換後的新物料清單
 ,Point of Sale,銷售點
@@ -5494,6 +5508,7 @@
 apps/erpnext/erpnext/accounts/doctype/exchange_rate_revaluation/exchange_rate_revaluation.py,Please set Unrealized Exchange Gain/Loss Account in Company {0},請在公司{0}中設置未實現的匯兌收益/損失帳戶
 apps/erpnext/erpnext/utilities/user_progress.py,"Add users to your organization, other than yourself.",將用戶添加到您的組織，而不是您自己。
 DocType: Customer Group,Customer Group Name,客戶群組名稱
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py,Row {0}: Quantity not available for {4} in warehouse {1} at posting time of the entry ({2} {3}),第{0}行：在輸入條目（{2} {3}）時，倉庫{1}中{4}不可使用的數量
 apps/erpnext/erpnext/public/js/pos/pos.html,No Customers yet!,還沒有客戶！
 DocType: Quality Procedure Process,Link existing Quality Procedure.,鏈接現有的質量程序。
 apps/erpnext/erpnext/config/hr.py,Loans,貸款
@@ -5540,7 +5555,6 @@
 DocType: Purchase Order Item,Blanket Order Rate,一攬子訂單費率
 ,Customer Ledger Summary,客戶分類帳摘要
 apps/erpnext/erpnext/hooks.py,Certification,證明
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js,Are you sure you want to make debit note?,您確定要製作借記通知單嗎？
 DocType: Bank Guarantee,Clauses and Conditions,條款和條件
 DocType: Serial No,Creation Document Type,創建文件類型
 apps/erpnext/erpnext/accounts/doctype/invoice_discounting/invoice_discounting.js,Get Invoices,獲取發票
@@ -5577,8 +5591,6 @@
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py,Financial Services,金融服務
 DocType: Student Sibling,Student ID,學生卡
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.js,For Quantity must be greater than zero,對於數量必須大於零
-apps/erpnext/erpnext/hr/doctype/employee_transfer/employee_transfer.py,"Please delete the Employee <a href=""#Form/Employee/{0}"">{0}</a>\
-					to cancel this document","請刪除員工<a href=""#Form/Employee/{0}"">{0}</a> \以取消此文檔"
 apps/erpnext/erpnext/config/projects.py,Types of activities for Time Logs,活動類型的時間記錄
 DocType: Opening Invoice Creation Tool,Sales,銷售
 DocType: Stock Entry Detail,Basic Amount,基本金額
@@ -5717,7 +5729,6 @@
 DocType: Sales Team,Contact No.,聯絡電話
 apps/erpnext/erpnext/templates/includes/cart/cart_address.html,Billing Address is same as Shipping Address,帳單地址與送貨地址相同
 DocType: Bank Reconciliation,Payment Entries,付款項
-apps/erpnext/erpnext/erpnext_integrations/doctype/shopify_settings/shopify_settings.py,Access token or Shopify URL missing,訪問令牌或Shopify網址丟失
 DocType: Location,Latitude,緯度
 DocType: Work Order,Scrap Warehouse,廢料倉庫
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py,"Warehouse required at Row No {0}, please set default warehouse for the item {1} for the company {2}",在第{0}行，需要倉庫，請為公司{2}的物料{1}設置默認倉庫
@@ -5759,7 +5770,6 @@
 DocType: Job Offer Term,Value / Description,值/說明
 apps/erpnext/erpnext/controllers/accounts_controller.py,"Row #{0}: Asset {1} cannot be submitted, it is already {2}",行＃{0}：資產{1}無法提交，這已經是{2}
 DocType: Tax Rule,Billing Country,結算國家
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js,Are you sure you want to make credit note?,你確定要記下信用卡嗎？
 DocType: Purchase Order Item,Expected Delivery Date,預計交貨日期
 DocType: Restaurant Order Entry,Restaurant Order Entry,餐廳訂單錄入
 apps/erpnext/erpnext/accounts/general_ledger.py,Debit and Credit not equal for {0} #{1}. Difference is {2}.,借貸{0}＃不等於{1}。區別是{2}。
@@ -5873,6 +5883,7 @@
 DocType: Purchase Invoice,Taxes and Charges Added,稅費上架
 apps/erpnext/erpnext/assets/doctype/asset/asset.py,Depreciation Row {0}: Next Depreciation Date cannot be before Available-for-use Date,折舊行{0}：下一個折舊日期不能在可供使用的日期之前
 ,Sales Funnel,銷售漏斗
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Item Code &gt; Item Group &gt; Brand,物料代碼&gt;物料組&gt;品牌
 apps/erpnext/erpnext/setup/doctype/company/company.py,Abbreviation is mandatory,縮寫是強制性的
 DocType: Project,Task Progress,任務進度
 apps/erpnext/erpnext/templates/includes/navbar/navbar_items.html,Cart,車
@@ -6096,6 +6107,7 @@
 DocType: Education Settings,"For Course based Student Group, the Course will be validated for every Student from the enrolled Courses in Program Enrollment.",對於基於課程的學生小組，課程將從入學課程中的每個學生確認。
 DocType: Employee Grade,Employee Grade,員工等級
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py,Piecework,計件工作
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Supplier &gt; Supplier Type,供應商&gt;供應商類型
 DocType: Share Balance,From No,來自No
 DocType: Shift Type,Early Exit Grace Period,提前退出寬限期
 DocType: Task,Actual Time (in Hours),實際時間（小時）
@@ -6359,6 +6371,7 @@
 DocType: Warehouse,Warehouse Name,倉庫名稱
 DocType: Naming Series,Select Transaction,選擇交易
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py,Please enter Approving Role or Approving User,請輸入核准角色或審批用戶
+apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.py,UOM Conversion factor ({0} -&gt; {1}) not found for item: {2},找不到項目{2}的UOM轉換因子（{0}-&gt; {1}）
 apps/erpnext/erpnext/support/doctype/service_level_agreement/service_level_agreement.py,Service Level Agreement with Entity Type {0} and Entity {1} already exists.,與實體類型{0}和實體{1}的服務水平協議已存在。
 DocType: Journal Entry,Write Off Entry,核銷進入
 DocType: BOM,Rate Of Materials Based On,材料成本基於
@@ -6531,6 +6544,7 @@
 DocType: Quality Inspection Reading,Quality Inspection Reading,質量檢驗閱讀
 apps/erpnext/erpnext/stock/doctype/stock_settings/stock_settings.py,`Freeze Stocks Older Than` should be smaller than %d days.,`凍結股票早於`應該是少於％d天。
 DocType: Tax Rule,Purchase Tax Template,購置稅模板
+apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py,Earliest Age,最早年齡
 apps/erpnext/erpnext/utilities/user_progress.py,Set a sales goal you'd like to achieve for your company.,為您的公司設定您想要實現的銷售目標。
 DocType: Quality Goal,Revision,調整
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js,Healthcare Services,醫療服務
@@ -6574,6 +6588,7 @@
 apps/erpnext/erpnext/healthcare/doctype/patient_encounter/patient_encounter.js,Schedule Discharge,附表卸貨
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py,Cheques and Deposits incorrectly cleared,支票及存款不正確清除
 DocType: Homepage Section Card,Homepage Section Card,主頁卡片
+,Amount To Be Billed,開票金額
 apps/erpnext/erpnext/accounts/doctype/account/account.py,Account {0}: You can not assign itself as parent account,帳戶{0}：你不能指定自己為父帳戶
 DocType: Purchase Invoice Item,Price List Rate,價格列表費率
 apps/erpnext/erpnext/utilities/activation.py,Create customer quotes,創建客戶報價
@@ -6622,6 +6637,7 @@
 apps/erpnext/erpnext/config/accounting.py,Tax Withholding rates to be applied on transactions.,稅收預扣稅率適用於交易。
 DocType: Supplier Scorecard Criteria,Supplier Scorecard Criteria,供應商記分卡標準
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py,Please select Start Date and End Date for Item {0},請選擇項目{0}的開始日期和結束日期
+,Amount to Receive,收取金額
 apps/erpnext/erpnext/education/doctype/student_group_creation_tool/student_group_creation_tool.py,Course is mandatory in row {0},當然是行強制性{0}
 apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py,From date can not be greater than than To date,從日期開始不能大於To date
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py,To date cannot be before from date,無效的主名稱
@@ -6854,7 +6870,6 @@
 DocType: Upload Attendance,Upload Attendance,上傳考勤
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js,BOM and Manufacturing Quantity are required,BOM和生產量是必需的
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js,Ageing Range 2,老齡範圍2
-apps/erpnext/erpnext/accounts/doctype/account/account.py,"Account {0} already exists in child company {1}. The following fields have different values, they should be same:<ul><li>{2}</li></ul>",子公司{1}中已存在帳戶{0}。以下字段具有不同的值，它們應該相同： <ul><li> {2} </li></ul>
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py,Installing presets,安裝預置
 apps/erpnext/erpnext/stock/doctype/delivery_trip/delivery_trip.js,No Delivery Note selected for Customer {},沒有為客戶{}選擇送貨單
 apps/erpnext/erpnext/manufacturing/page/bom_comparison_tool/bom_comparison_tool.js,Rows Added in {0},{0}中添加的行數
@@ -7046,6 +7061,7 @@
 DocType: Delivery Note,Print Without Amount,列印表單時不印金額
 apps/erpnext/erpnext/accounts/report/asset_depreciation_ledger/asset_depreciation_ledger.py,Depreciation Date,折舊日期
 ,Work Orders in Progress,工作訂單正在進行中
+DocType: Customer Credit Limit,Bypass Credit Limit Check,繞過信用額度檢查
 DocType: Issue,Support Team,支持團隊
 apps/erpnext/erpnext/stock/report/batch_item_expiry_status/batch_item_expiry_status.py,Expiry (In Days),到期（天數）
 DocType: Appraisal,Total Score (Out of 5),總分（滿分5分）
@@ -7216,6 +7232,7 @@
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js,"Optional. Sets company's default currency, if not specified.",可選。設置公司的默認貨幣，如果沒有指定。
 DocType: Sales Invoice,Customer GSTIN,客戶GSTIN
 DocType: Crop Cycle,List of diseases detected on the field. When selected it'll automatically add a list of tasks to deal with the disease ,在現場檢測到的疾病清單。當選擇它會自動添加一個任務清單處理疾病
+apps/erpnext/erpnext/assets/report/fixed_asset_register/fixed_asset_register.py,Asset Id,資產編號
 apps/erpnext/erpnext/healthcare/doctype/healthcare_service_unit/healthcare_service_unit.js,This is a root healthcare service unit and cannot be edited.,這是根醫療保健服務單位，不能編輯。
 DocType: Asset Repair,Repair Status,維修狀態
 apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.js,"Requested Qty: Quantity requested for purchase, but not ordered.",要求的數量：數量要求的報價，但沒有下令。
diff --git a/erpnext/utilities/page/leaderboard/__init__.py b/erpnext/utilities/page/leaderboard/__init__.py
deleted file mode 100644
index e69de29..0000000
--- a/erpnext/utilities/page/leaderboard/__init__.py
+++ /dev/null
diff --git a/erpnext/utilities/page/leaderboard/leaderboard.css b/erpnext/utilities/page/leaderboard/leaderboard.css
deleted file mode 100644
index 1f4fc51..0000000
--- a/erpnext/utilities/page/leaderboard/leaderboard.css
+++ /dev/null
@@ -1,54 +0,0 @@
-.list-filters {
-	overflow-y: hidden;
-	padding: 5px
-}
-
-.list-filter-item {
-	min-width: 150px;
-	float: left;
-	margin:5px;
-}
-
-.list-item_content{
-	flex: 1;
-	padding-right: 15px;
-	align-items: center;
-}
-
-.select-time, .select-doctype, .select-filter, .select-sort {
-	background: #f0f4f7;
-}
-
-.select-time:focus, .select-doctype:focus, .select-filter:focus, .select-sort:focus {
-	background: #f0f4f7;
-}
-
-.header-btn-base{
-	border:none;
-	outline:0;
-	vertical-align:middle;
-	overflow:hidden;
-	text-decoration:none;
-	color:inherit;
-	background-color:inherit;
-	cursor:pointer;
-	white-space:nowrap;
-}
-
-.header-btn-grey,.header-btn-grey:hover{
-	color:#000!important;
-	background-color:#bbb!important
-}
-
-.header-btn-round{
-	border-radius:4px
-}
-
-.item-title-bold{
-	font-weight: bold;
-}
-
-/*
-.header-btn-base:hover {
-	box-shadow:0 8px 16px 0 rgba(0,0,0,0.2),0 6px 20px 0 rgba(0,0,0,0.19)
-}*/
diff --git a/erpnext/utilities/page/leaderboard/leaderboard.js b/erpnext/utilities/page/leaderboard/leaderboard.js
deleted file mode 100644
index 43d0e6e..0000000
--- a/erpnext/utilities/page/leaderboard/leaderboard.js
+++ /dev/null
@@ -1,307 +0,0 @@
-frappe.pages["leaderboard"].on_page_load = function (wrapper) {
-	frappe.leaderboard = new frappe.Leaderboard(wrapper);
-}
-
-frappe.Leaderboard = Class.extend({
-
-	init: function (parent) {
-		frappe.ui.make_app_page({
-			parent: parent,
-			title: "Leaderboard",
-			single_column: false
-		});
-
-		this.parent = parent;
-		this.page = this.parent.page;
-		this.page.sidebar.html(`<ul class="module-sidebar-nav overlay-sidebar nav nav-pills nav-stacked"></ul>`);
-		this.$sidebar_list = this.page.sidebar.find('ul');
-
-		// const list of doctypes
-		this.doctypes = ["Customer", "Item", "Supplier", "Sales Partner","Sales Person"];
-		this.timespans = ["Week", "Month", "Quarter", "Year"];
-		this.filters = {
-			"Customer": ["total_sales_amount", "total_qty_sold", "outstanding_amount", ],
-			"Item": ["total_sales_amount", "total_qty_sold", "total_purchase_amount",
-				"total_qty_purchased", "available_stock_qty", "available_stock_value"],
-			"Supplier": ["total_purchase_amount", "total_qty_purchased", "outstanding_amount"],
-			"Sales Partner": ["total_sales_amount", "total_commission"],
-			"Sales Person": ["total_sales_amount"],
-		};
-
-		// for saving current selected filters
-		// TODO: revert to 0 index for doctype and timespan, and remove preset down
-		const _initial_doctype = this.doctypes[0];
-		const _initial_timespan = this.timespans[0];
-		const _initial_filter = this.filters[_initial_doctype];
-
-		this.options = {
-			selected_doctype: _initial_doctype,
-			selected_filter: _initial_filter,
-			selected_filter_item: _initial_filter[0],
-			selected_timespan: _initial_timespan,
-		};
-
-		this.message = null;
-		this.make();
-	},
-
-	make: function () {
-		var me = this;
-
-		var $container = $(`<div class="leaderboard page-main-content">
-			<div class="leaderboard-graph"></div>
-			<div class="leaderboard-list"></div>
-		</div>`).appendTo(this.page.main);
-
-		this.$graph_area = $container.find('.leaderboard-graph');
-
-		this.doctypes.map(doctype => {
-			this.get_sidebar_item(doctype).appendTo(this.$sidebar_list);
-		});
-
-		this.company_select = this.page.add_field({
-			fieldname: 'company',
-			label: __('Company'),
-			fieldtype:'Link',
-			options:'Company',
-			default:frappe.defaults.get_default('company'),
-			reqd: 1,
-			change: function() {
-				me.options.selected_company = this.value;
-				me.make_request($container);
-			}
-		});
-		this.timespan_select = this.page.add_select(__("Timespan"),
-			this.timespans.map(d => {
-				return {"label": __(d), value: d }
-			})
-		);
-
-		this.type_select = this.page.add_select(__("Type"),
-			me.options.selected_filter.map(d => {
-				return {"label": __(frappe.model.unscrub(d)), value: d }
-			})
-		);
-
-		this.$sidebar_list.on('click', 'li', function(e) {
-			let $li = $(this);
-			let doctype = $li.find('span').attr("doctype-value");
-
-			me.options.selected_company = frappe.defaults.get_default('company');
-			me.options.selected_doctype = doctype;
-			me.options.selected_filter = me.filters[doctype];
-			me.options.selected_filter_item = me.filters[doctype][0];
-
-			me.type_select.empty().add_options(
-				me.options.selected_filter.map(d => {
-					return {"label": __(frappe.model.unscrub(d)), value: d }
-				})
-			);
-
-			me.$sidebar_list.find('li').removeClass('active');
-			$li.addClass('active');
-
-			me.make_request($container);
-		});
-
-		this.timespan_select.on("change", function() {
-			me.options.selected_timespan = this.value;
-			me.make_request($container);
-		});
-
-		this.type_select.on("change", function() {
-			me.options.selected_filter_item = this.value
-			me.make_request($container);
-		});
-
-		// now get leaderboard
-		this.$sidebar_list.find('li:first').trigger('click');
-	},
-
-	make_request: function ($container) {
-		var me = this;
-
-		frappe.model.with_doctype(me.options.selected_doctype, function () {
-			me.get_leaderboard(me.get_leaderboard_data, $container);
-		});
-	},
-
-	get_leaderboard: function (notify, $container) {
-		var me = this;
-		if(!me.options.selected_company) {
-			frappe.throw(__("Please select Company"));
-		}
-		frappe.call({
-			method: "erpnext.utilities.page.leaderboard.leaderboard.get_leaderboard",
-			args: {
-				doctype: me.options.selected_doctype,
-				timespan: me.options.selected_timespan,
-				company: me.options.selected_company,
-				field: me.options.selected_filter_item,
-			},
-			callback: function (r) {
-				let results = r.message || [];
-
-				let graph_items = results.slice(0, 10);
-
-				me.$graph_area.show().empty();
-				let args = {
-					data: {
-						datasets: [
-							{
-								values: graph_items.map(d=>d.value)
-							}
-						],
-						labels: graph_items.map(d=>d.name)
-					},
-					colors: ['light-green'],
-					format_tooltip_x: d=>d[me.options.selected_filter_item],
-					type: 'bar',
-					height: 140
-				};
-				new frappe.Chart('.leaderboard-graph', args);
-
-				notify(me, r, $container);
-			}
-		});
-	},
-
-	get_leaderboard_data: function (me, res, $container) {
-		if (res && res.message) {
-			me.message = null;
-			$container.find(".leaderboard-list").html(me.render_list_view(res.message));
-		} else {
-			me.$graph_area.hide();
-			me.message = __("No items found.");
-			$container.find(".leaderboard-list").html(me.render_list_view());
-		}
-	},
-
-	render_list_view: function (items = []) {
-		var me = this;
-
-		var html =
-			`${me.render_message()}
-			 <div class="result" style="${me.message ? "display:none;" : ""}">
-			 	${me.render_result(items)}
-			 </div>`;
-
-		return $(html);
-	},
-
-	render_result: function (items) {
-		var me = this;
-
-		var html =
-			`${me.render_list_header()}
-			${me.render_list_result(items)}`;
-
-		return html;
-	},
-
-	render_list_header: function () {
-		var me = this;
-		const _selected_filter = me.options.selected_filter
-			.map(i => frappe.model.unscrub(i));
-		const fields = ['name', me.options.selected_filter_item];
-
-		const html =
-			`<div class="list-headers">
-				<div class="list-item list-item--head" data-list-renderer="${"List"}">
-					${
-					fields.map(filter => {
-							const col = frappe.model.unscrub(filter);
-							return (
-								`<div class="leaderboard-item list-item_content ellipsis text-muted list-item__content--flex-2
-									header-btn-base
-									${(col && _selected_filter.indexOf(col) !== -1) ? "text-right" : ""}">
-									<span class="list-col-title ellipsis">
-										${col}
-									</span>
-								</div>`);
-						}).join("")
-					}
-				</div>
-			</div>`;
-		return html;
-	},
-
-	render_list_result: function (items) {
-		var me = this;
-
-		let _html = items.map((item, index) => {
-			const $value = $(me.get_item_html(item));
-
-			let item_class = "";
-			if(index == 0) {
-				item_class = "first";
-			} else if (index == 1) {
-				item_class = "second";
-			} else if(index == 2) {
-				item_class = "third";
-			}
-			const $item_container = $(`<div class="list-item-container  ${item_class}">`).append($value);
-			return $item_container[0].outerHTML;
-		}).join("");
-
-		let html =
-			`<div class="result-list">
-				<div class="list-items">
-					${_html}
-				</div>
-			</div>`;
-
-		return html;
-	},
-
-	render_message: function () {
-		var me = this;
-
-		let html =
-			`<div class="no-result text-center" style="${me.message ? "" : "display:none;"}">
-				<div class="msg-box no-border">
-					<p>No Item found</p>
-				</div>
-			</div>`;
-
-		return html;
-	},
-
-	get_item_html: function (item) {
-		var me = this;
-		const company = me.options.selected_company;
-		const currency = frappe.get_doc(":Company", company).default_currency;
-		const fields = ['name','value'];
-
-		const html =
-			`<div class="list-item">
-				${
-			fields.map(col => {
-					let val = item[col];
-					if(col=="name") {
-						var formatted_value = `<a class="grey list-id ellipsis"
-							href="#Form/${me.options.selected_doctype}/${item["name"]}"> ${val} </a>`
-					} else {
-						var formatted_value = `<span class="text-muted ellipsis">
-							${(me.options.selected_filter_item.indexOf('qty') == -1) ? format_currency(val, currency) : val}</span>`
-					}
-
-					return (
-						`<div class="list-item_content ellipsis list-item__content--flex-2
-							${(col == "value") ? "text-right" : ""}">
-							${formatted_value}
-						</div>`);
-					}).join("")
-				}
-			</div>`;
-
-		return html;
-	},
-
-	get_sidebar_item: function(item) {
-		return $(`<li class="strong module-sidebar-item">
-			<a class="module-link">
-			<span doctype-value="${item}">${ __(item) }</span></a>
-		</li>`);
-	}
-});
diff --git a/erpnext/utilities/page/leaderboard/leaderboard.json b/erpnext/utilities/page/leaderboard/leaderboard.json
deleted file mode 100644
index 8ccef7d..0000000
--- a/erpnext/utilities/page/leaderboard/leaderboard.json
+++ /dev/null
@@ -1,19 +0,0 @@
-{
- "content": null, 
- "creation": "2017-06-06 02:54:24.785360", 
- "docstatus": 0, 
- "doctype": "Page", 
- "idx": 0, 
- "modified": "2017-09-12 14:05:26.422064", 
- "modified_by": "Administrator", 
- "module": "Utilities", 
- "name": "leaderboard", 
- "owner": "Administrator", 
- "page_name": "leaderboard", 
- "roles": [], 
- "script": null, 
- "standard": "Yes", 
- "style": null, 
- "system_page": 0, 
- "title": "Leaderboard"
-}
\ No newline at end of file
diff --git a/erpnext/utilities/page/leaderboard/leaderboard.py b/erpnext/utilities/page/leaderboard/leaderboard.py
deleted file mode 100644
index 87cf2a4..0000000
--- a/erpnext/utilities/page/leaderboard/leaderboard.py
+++ /dev/null
@@ -1,153 +0,0 @@
-# Copyright (c) 2017, Frappe Technologies Pvt. Ltd. and Contributors
-# MIT License. See license.txt
-
-from __future__ import unicode_literals, print_function
-import frappe
-from frappe.utils import add_to_date
-
-@frappe.whitelist()
-def get_leaderboard(doctype, timespan, company, field):
-	"""return top 10 items for that doctype based on conditions"""
-	from_date = get_from_date(timespan)
-	records = []
-	if doctype == "Customer":
-		records = get_all_customers(from_date, company, field)
-	elif  doctype == "Item":
-		records = get_all_items(from_date, company, field)
-	elif  doctype == "Supplier":
-		records = get_all_suppliers(from_date, company, field)
-	elif  doctype == "Sales Partner":
-		records = get_all_sales_partner(from_date, company, field)
-	elif doctype == "Sales Person":
-		records = get_all_sales_person(from_date, company)
-
-	return records
-
-def get_all_customers(from_date, company, field):
-	if field == "outstanding_amount":
-		return frappe.db.sql("""
-			select customer as name, sum(outstanding_amount) as value
-			FROM `tabSales Invoice`
-			where docstatus = 1 and posting_date >= %s and company = %s
-			group by customer
-			order by value DESC
-			limit 20
-		""", (from_date, company), as_dict=1)
-	else:
-		if field == "total_sales_amount":
-			select_field = "sum(so_item.base_net_amount)"
-		elif field == "total_qty_sold":
-			select_field = "sum(so_item.stock_qty)"
-
-		return frappe.db.sql("""
-			select so.customer as name, {0} as value
-			FROM `tabSales Order` as so JOIN `tabSales Order Item` as so_item
-				ON so.name = so_item.parent
-			where so.docstatus = 1 and so.transaction_date >= %s and so.company = %s
-			group by so.customer
-			order by value DESC
-			limit 20
-		""".format(select_field), (from_date, company), as_dict=1)
-
-def get_all_items(from_date, company, field):
-	if field in ("available_stock_qty", "available_stock_value"):
-		return frappe.db.sql("""
-			select item_code as name, {0} as value
-			from tabBin
-			group by item_code
-			order by value desc
-			limit 20
-		""".format("sum(actual_qty)" if field=="available_stock_qty" else "sum(stock_value)"), as_dict=1)
-	else:
-		if field == "total_sales_amount":
-			select_field = "sum(order_item.base_net_amount)"
-			select_doctype = "Sales Order"
-		elif field == "total_purchase_amount":
-			select_field = "sum(order_item.base_net_amount)"
-			select_doctype = "Purchase Order"
-		elif field == "total_qty_sold":
-			select_field = "sum(order_item.stock_qty)"
-			select_doctype = "Sales Order"
-		elif field == "total_qty_purchased":
-			select_field = "sum(order_item.stock_qty)"
-			select_doctype = "Purchase Order"
-
-		return frappe.db.sql("""
-			select order_item.item_code as name, {0} as value
-			from `tab{1}` sales_order join `tab{1} Item` as order_item
-				on sales_order.name = order_item.parent
-			where sales_order.docstatus = 1
-				and sales_order.company = %s and sales_order.transaction_date >= %s
-			group by order_item.item_code
-			order by value desc
-			limit 20
-		""".format(select_field, select_doctype), (company, from_date), as_dict=1)
-
-def get_all_suppliers(from_date, company, field):
-	if field == "outstanding_amount":
-		return frappe.db.sql("""
-			select supplier as name, sum(outstanding_amount) as value
-			FROM `tabPurchase Invoice`
-			where docstatus = 1 and posting_date >= %s and company = %s
-			group by supplier
-			order by value DESC
-			limit 20""", (from_date, company), as_dict=1)
-	else:
-		if field == "total_purchase_amount":
-			select_field = "sum(purchase_order_item.base_net_amount)"
-		elif field == "total_qty_purchased":
-			select_field = "sum(purchase_order_item.stock_qty)"
-
-		return frappe.db.sql("""
-			select purchase_order.supplier as name, {0} as value
-			FROM `tabPurchase Order` as purchase_order LEFT JOIN `tabPurchase Order Item`
-				as purchase_order_item ON purchase_order.name = purchase_order_item.parent
-			where purchase_order.docstatus = 1 and  purchase_order.modified >= %s
-				and  purchase_order.company = %s
-			group by purchase_order.supplier
-			order by value DESC
-			limit 20""".format(select_field), (from_date, company), as_dict=1)
-
-def get_all_sales_partner(from_date, company, field):
-	if field == "total_sales_amount":
-		select_field = "sum(base_net_total)"
-	elif field == "total_commission":
-		select_field = "sum(total_commission)"
-
-	return frappe.db.sql("""
-		select sales_partner as name, {0} as value
-		from `tabSales Order`
-	 	where ifnull(sales_partner, '') != '' and docstatus = 1
-			and transaction_date >= %s and company = %s
-	 	group by sales_partner
-	 	order by value DESC
-	 	limit 20
-	""".format(select_field), (from_date, company), as_dict=1)
-
-def get_all_sales_person(from_date, company):
-	return frappe.db.sql("""
-		select sales_team.sales_person as name, sum(sales_order.base_net_total) as value
-		from `tabSales Order` as sales_order join `tabSales Team` as sales_team
-			on sales_order.name = sales_team.parent and sales_team.parenttype = 'Sales Order'
-	 	where sales_order.docstatus = 1
-			and sales_order.transaction_date >= %s
-			and sales_order.company = %s
-	 	group by sales_team.sales_person
-	 	order by value DESC
-	 	limit 20
-	""", (from_date, company), as_dict=1)
-
-def get_from_date(seleted_timespan):
-	"""return string for ex:this week as date:string"""
-	days = months = years = 0
-	if "month" == seleted_timespan.lower():
-		months = -1
-	elif "quarter" == seleted_timespan.lower():
-		months = -3
-	elif "year" == seleted_timespan.lower():
-		years = -1
-	else:
-		days = -7
-
-	return add_to_date(None, years=years, months=months, days=days,
-		as_string=True, as_datetime=True)
\ No newline at end of file