diff --git a/erpnext/accounts/doctype/payment_entry/payment_entry.py b/erpnext/accounts/doctype/payment_entry/payment_entry.py
index 3683898..fc46132 100644
--- a/erpnext/accounts/doctype/payment_entry/payment_entry.py
+++ b/erpnext/accounts/doctype/payment_entry/payment_entry.py
@@ -624,7 +624,7 @@
 	data = negative_outstanding_invoices + outstanding_invoices + orders_to_be_billed
 
 	if not data:
-		frappe.msgprint(_("No outstanding invoices found for the {0} <b>{1}</b>.")
+		frappe.msgprint(_("No outstanding invoices found for the {0} <b>{1}</b> which qualify the filters you have specified.")
 			.format(args.get("party_type").lower(), args.get("party")))
 
 	return data
@@ -648,13 +648,18 @@
 
 	orders = []
 	if voucher_type:
-		ref_field = "base_grand_total" if party_account_currency == company_currency else "grand_total"
+		if party_account_currency == company_currency:
+			grand_total_field = "base_grand_total"
+			rounded_total_field = "base_rounded_total"
+		else:
+			grand_total_field = "grand_total"
+			rounded_total_field = "rounded_total"
 
 		orders = frappe.db.sql("""
 			select
 				name as voucher_no,
-				{ref_field} as invoice_amount,
-				({ref_field} - advance_paid) as outstanding_amount,
+				if({rounded_total_field}, {rounded_total_field}, {grand_total_field}) as invoice_amount,
+				(if({rounded_total_field}, {rounded_total_field}, {grand_total_field}) - advance_paid) as outstanding_amount,
 				transaction_date as posting_date
 			from
 				`tab{voucher_type}`
@@ -663,13 +668,14 @@
 				and docstatus = 1
 				and company = %s
 				and ifnull(status, "") != "Closed"
-				and {ref_field} > advance_paid
+				and if({rounded_total_field}, {rounded_total_field}, {grand_total_field}) > advance_paid
 				and abs(100 - per_billed) > 0.01
 				{condition}
 			order by
 				transaction_date, name
 		""".format(**{
-			"ref_field": ref_field,
+			"rounded_total_field": rounded_total_field,
+			"grand_total_field": grand_total_field,
 			"voucher_type": voucher_type,
 			"party_type": scrub(party_type),
 			"condition": condition
diff --git a/erpnext/communication/doctype/call_log/call_log.json b/erpnext/communication/doctype/call_log/call_log.json
index 110030d..cfc08eb 100644
--- a/erpnext/communication/doctype/call_log/call_log.json
+++ b/erpnext/communication/doctype/call_log/call_log.json
@@ -8,12 +8,18 @@
   "from",
   "to",
   "column_break_3",
+  "received_by",
   "medium",
+  "caller_information",
+  "contact",
+  "contact_name",
+  "column_break_10",
+  "lead",
+  "lead_name",
   "section_break_5",
   "status",
   "duration",
-  "recording_url",
-  "summary"
+  "recording_url"
  ],
  "fields": [
   {
@@ -61,12 +67,6 @@
    "read_only": 1
   },
   {
-   "fieldname": "summary",
-   "fieldtype": "Data",
-   "label": "Summary",
-   "read_only": 1
-  },
-  {
    "fieldname": "recording_url",
    "fieldtype": "Data",
    "label": "Recording URL",
@@ -77,10 +77,58 @@
    "fieldtype": "Data",
    "label": "Medium",
    "read_only": 1
+  },
+  {
+   "fieldname": "received_by",
+   "fieldtype": "Link",
+   "label": "Received By",
+   "options": "Employee",
+   "read_only": 1
+  },
+  {
+   "fieldname": "caller_information",
+   "fieldtype": "Section Break",
+   "label": "Caller Information"
+  },
+  {
+   "fieldname": "contact",
+   "fieldtype": "Link",
+   "label": "Contact",
+   "options": "Contact",
+   "read_only": 1
+  },
+  {
+   "fieldname": "lead",
+   "fieldtype": "Link",
+   "label": "Lead ",
+   "options": "Lead",
+   "read_only": 1
+  },
+  {
+   "fetch_from": "contact.name",
+   "fieldname": "contact_name",
+   "fieldtype": "Data",
+   "hidden": 1,
+   "in_list_view": 1,
+   "label": "Contact Name",
+   "read_only": 1
+  },
+  {
+   "fieldname": "column_break_10",
+   "fieldtype": "Column Break"
+  },
+  {
+   "fetch_from": "lead.lead_name",
+   "fieldname": "lead_name",
+   "fieldtype": "Data",
+   "hidden": 1,
+   "in_list_view": 1,
+   "label": "Lead Name",
+   "read_only": 1
   }
  ],
  "in_create": 1,
- "modified": "2019-07-01 09:09:48.516722",
+ "modified": "2019-08-06 05:46:53.144683",
  "modified_by": "Administrator",
  "module": "Communication",
  "name": "Call Log",
@@ -97,10 +145,15 @@
    "role": "System Manager",
    "share": 1,
    "write": 1
+  },
+  {
+   "read": 1,
+   "role": "Employee"
   }
  ],
  "sort_field": "modified",
  "sort_order": "ASC",
  "title_field": "from",
- "track_changes": 1
+ "track_changes": 1,
+ "track_views": 1
 }
\ No newline at end of file
diff --git a/erpnext/communication/doctype/call_log/call_log.py b/erpnext/communication/doctype/call_log/call_log.py
index 66f1064..c9fdfbe 100644
--- a/erpnext/communication/doctype/call_log/call_log.py
+++ b/erpnext/communication/doctype/call_log/call_log.py
@@ -4,16 +4,83 @@
 
 from __future__ import unicode_literals
 import frappe
+from frappe import _
 from frappe.model.document import Document
-from erpnext.crm.doctype.utils import get_employee_emails_for_popup
+from erpnext.crm.doctype.utils import get_scheduled_employees_for_popup
+from frappe.contacts.doctype.contact.contact import get_contact_with_phone_number
+from erpnext.crm.doctype.lead.lead import get_lead_with_phone_number
 
 class CallLog(Document):
+	def before_insert(self):
+		# strip 0 from the start of the number for proper number comparisions
+		# eg. 07888383332 should match with 7888383332
+		number = self.get('from').lstrip('0')
+		self.contact = get_contact_with_phone_number(number)
+		self.lead = get_lead_with_phone_number(number)
+
 	def after_insert(self):
-		employee_emails = get_employee_emails_for_popup(self.medium)
-		for email in employee_emails:
-			frappe.publish_realtime('show_call_popup', self, user=email)
+		self.trigger_call_popup()
 
 	def on_update(self):
 		doc_before_save = self.get_doc_before_save()
-		if doc_before_save and doc_before_save.status in ['Ringing'] and self.status in ['Missed', 'Completed']:
+		if not doc_before_save: return
+		if doc_before_save.status in ['Ringing'] and self.status in ['Missed', 'Completed']:
 			frappe.publish_realtime('call_{id}_disconnected'.format(id=self.id), self)
+		elif doc_before_save.to != self.to:
+			self.trigger_call_popup()
+
+	def trigger_call_popup(self):
+		scheduled_employees = get_scheduled_employees_for_popup(self.to)
+		employee_emails = get_employees_with_number(self.to)
+
+		# check if employees with matched number are scheduled to receive popup
+		emails = set(scheduled_employees).intersection(employee_emails)
+
+		# # if no employee found with matching phone number then show popup to scheduled employees
+		# emails = emails or scheduled_employees if employee_emails
+
+		for email in emails:
+			frappe.publish_realtime('show_call_popup', self, user=email)
+
+@frappe.whitelist()
+def add_call_summary(call_log, summary):
+	doc = frappe.get_doc('Call Log', call_log)
+	doc.add_comment('Comment', frappe.bold(_('Call Summary')) + '<br><br>' + summary)
+
+def get_employees_with_number(number):
+	if not number: return []
+
+	employee_emails = frappe.cache().hget('employees_with_number', number)
+	if employee_emails: return employee_emails
+
+	employees = frappe.get_all('Employee', filters={
+		'cell_number': ['like', '%{}'.format(number.lstrip('0'))],
+		'user_id': ['!=', '']
+	}, fields=['user_id'])
+
+	employee_emails = [employee.user_id for employee in employees]
+	frappe.cache().hset('employees_with_number', number, employee_emails)
+
+	return employee
+
+def set_caller_information(doc, state):
+	'''Called from hoooks on creation of Lead or Contact'''
+	if doc.doctype not in ['Lead', 'Contact']: return
+
+	numbers = [doc.get('phone'), doc.get('mobile_no')]
+	for_doc = doc.doctype.lower()
+
+	for number in numbers:
+		if not number: continue
+		print(number)
+		filters = frappe._dict({
+			'from': ['like', '%{}'.format(number.lstrip('0'))],
+			for_doc: ''
+		})
+
+		logs = frappe.get_all('Call Log', filters=filters)
+
+		for log in logs:
+			call_log = frappe.get_doc('Call Log', log.name)
+			call_log.set(for_doc, doc.name)
+			call_log.save(ignore_permissions=True)
diff --git a/erpnext/config/hr.py b/erpnext/config/hr.py
index 1f597f0..eae937c 100644
--- a/erpnext/config/hr.py
+++ b/erpnext/config/hr.py
@@ -215,6 +215,16 @@
 					"name": "Employee Benefit Claim",
 					"dependencies": ["Employee"]
 				},
+				{
+					"type": "doctype",
+					"name": "Employee Tax Exemption Category",
+					"dependencies": ["Employee"]
+				},
+				{
+					"type": "doctype",
+					"name": "Employee Tax Exemption Sub Category",
+					"dependencies": ["Employee"]
+				},
 			]
 		},
 		{
diff --git a/erpnext/crm/doctype/lead/lead.py b/erpnext/crm/doctype/lead/lead.py
index 4343db0..c9216ee 100644
--- a/erpnext/crm/doctype/lead/lead.py
+++ b/erpnext/crm/doctype/lead/lead.py
@@ -145,6 +145,16 @@
 
 @frappe.whitelist()
 def make_opportunity(source_name, target_doc=None):
+	def set_missing_values(source, target):
+		address = frappe.get_all('Dynamic Link', {
+			'link_doctype': source.doctype,
+			'link_name': source.name,
+			'parenttype': 'Address',
+		}, ['parent'], limit=1)
+
+		if address:
+			target.customer_address = address[0].parent
+
 	target_doc = get_mapped_doc("Lead", source_name,
 		{"Lead": {
 			"doctype": "Opportunity",
@@ -157,7 +167,7 @@
 				"email_id": "contact_email",
 				"mobile_no": "contact_mobile"
 			}
-		}}, target_doc)
+		}}, target_doc, set_missing_values)
 
 	return target_doc
 
@@ -230,3 +240,15 @@
 
 	link_communication_to_document(doc, "Lead", lead_name, ignore_communication_links)
 	return lead_name
+
+def get_lead_with_phone_number(number):
+	if not number: return
+
+	leads = frappe.get_all('Lead', or_filters={
+		'phone': ['like', '%{}'.format(number)],
+		'mobile_no': ['like', '%{}'.format(number)]
+	}, limit=1)
+
+	lead = leads[0].name if leads else None
+
+	return lead
\ No newline at end of file
diff --git a/erpnext/crm/doctype/opportunity/opportunity.js b/erpnext/crm/doctype/opportunity/opportunity.js
index 90a12b7..ec17629 100644
--- a/erpnext/crm/doctype/opportunity/opportunity.js
+++ b/erpnext/crm/doctype/opportunity/opportunity.js
@@ -31,9 +31,9 @@
 
 	party_name: function(frm) {
 		frm.toggle_display("contact_info", frm.doc.party_name);
+		frm.trigger('set_contact_link');
 
 		if (frm.doc.opportunity_from == "Customer") {
-			frm.trigger('set_contact_link');
 			erpnext.utils.get_party_details(frm);
 		} else if (frm.doc.opportunity_from == "Lead") {
 			erpnext.utils.map_current_doc({
@@ -48,13 +48,6 @@
 		frm.get_field("items").grid.set_multiple_add("item_code", "qty");
 	},
 
-	party_name: function(frm) {
-		if (frm.doc.opportunity_from == "Customer") {
-			frm.trigger('set_contact_link');
-			erpnext.utils.get_party_details(frm);
-		}
-	},
-
 	with_items: function(frm) {
 		frm.trigger('toggle_mandatory');
 	},
diff --git a/erpnext/crm/doctype/utils.py b/erpnext/crm/doctype/utils.py
index 9cfab15..5553276 100644
--- a/erpnext/crm/doctype/utils.py
+++ b/erpnext/crm/doctype/utils.py
@@ -3,82 +3,57 @@
 import json
 
 @frappe.whitelist()
-def get_document_with_phone_number(number):
-	# finds contacts and leads
-	if not number: return
-	number = number.lstrip('0')
-	number_filter = {
-		'phone': ['like', '%{}'.format(number)],
-		'mobile_no': ['like', '%{}'.format(number)]
-	}
-	contacts = frappe.get_all('Contact', or_filters=number_filter, limit=1)
+def get_last_interaction(contact=None, lead=None):
 
-	if contacts:
-		return frappe.get_doc('Contact', contacts[0].name)
+	if not contact and not lead: return
 
-	leads = frappe.get_all('Lead', or_filters=number_filter, limit=1)
-
-	if leads:
-		return frappe.get_doc('Lead', leads[0].name)
-
-@frappe.whitelist()
-def get_last_interaction(number, reference_doc):
-	reference_doc = json.loads(reference_doc) if reference_doc else get_document_with_phone_number(number)
-
-	if not reference_doc: return
-
-	reference_doc = frappe._dict(reference_doc)
-
-	last_communication = {}
-	last_issue = {}
-	if reference_doc.doctype == 'Contact':
-		customer_name = ''
+	last_communication = None
+	last_issue = None
+	if contact:
 		query_condition = ''
-		for link in reference_doc.links:
-			link = frappe._dict(link)
+		values = []
+		contact = frappe.get_doc('Contact', contact)
+		for link in contact.links:
 			if link.link_doctype == 'Customer':
-				customer_name = link.link_name
-			query_condition += "(`reference_doctype`='{}' AND `reference_name`='{}') OR".format(link.link_doctype, link.link_name)
+				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]
 
 		if query_condition:
+			# remove extra appended 'OR'
 			query_condition = query_condition[:-2]
 			last_communication = frappe.db.sql("""
 				SELECT `name`, `content`
 				FROM `tabCommunication`
-				WHERE {}
+				WHERE `sent_or_received`='Received'
+				AND ({})
 				ORDER BY `modified`
 				LIMIT 1
-			""".format(query_condition)) # nosec
+			""".format(query_condition), values, as_dict=1)  # nosec
 
-		if customer_name:
-			last_issue = frappe.get_all('Issue', {
-				'customer': customer_name
-			}, ['name', 'subject', 'customer'], limit=1)
-
-	elif reference_doc.doctype == 'Lead':
+	if lead:
 		last_communication = frappe.get_all('Communication', filters={
-			'reference_doctype': reference_doc.doctype,
-			'reference_name': reference_doc.name,
+			'reference_doctype': 'Lead',
+			'reference_name': lead,
 			'sent_or_received': 'Received'
-		}, fields=['name', 'content'], limit=1)
+		}, fields=['name', 'content'], order_by='`creation` DESC', limit=1)
+
+	last_communication = last_communication[0] if last_communication else None
 
 	return {
-		'last_communication': last_communication[0] if last_communication else None,
-		'last_issue': last_issue[0] if last_issue else None
+		'last_communication': last_communication,
+		'last_issue': last_issue
 	}
 
-@frappe.whitelist()
-def add_call_summary(docname, summary):
-	call_log = frappe.get_doc('Call Log', docname)
-	summary = _('Call Summary by {0}: {1}').format(
-		frappe.utils.get_fullname(frappe.session.user), summary)
-	if not call_log.summary:
-		call_log.summary = summary
-	else:
-		call_log.summary += '<br>' + summary
-	call_log.save(ignore_permissions=True)
+def get_last_issue_from_customer(customer_name):
+	issues = frappe.get_all('Issue', {
+		'customer': customer_name
+	}, ['name', 'subject', 'customer'], order_by='`creation` DESC', limit=1)
 
-def get_employee_emails_for_popup(communication_medium):
+	return issues[0] if issues else None
+
+
+def get_scheduled_employees_for_popup(communication_medium):
 	now_time = frappe.utils.nowtime()
 	weekday = frappe.utils.get_weekday()
 
diff --git a/erpnext/erpnext_integrations/exotel_integration.py b/erpnext/erpnext_integrations/exotel_integration.py
index c04cedc..09c399e 100644
--- a/erpnext/erpnext_integrations/exotel_integration.py
+++ b/erpnext/erpnext_integrations/exotel_integration.py
@@ -18,6 +18,8 @@
 	call_log = get_call_log(call_payload)
 	if not call_log:
 		create_call_log(call_payload)
+	else:
+		update_call_log(call_payload, call_log=call_log)
 
 @frappe.whitelist(allow_guest=True)
 def handle_end_call(**kwargs):
@@ -27,10 +29,11 @@
 def handle_missed_call(**kwargs):
 	update_call_log(kwargs, 'Missed')
 
-def update_call_log(call_payload, status):
-	call_log = get_call_log(call_payload)
+def update_call_log(call_payload, status='Ringing', call_log=None):
+	call_log = call_log or get_call_log(call_payload)
 	if call_log:
 		call_log.status = status
+		call_log.to = call_payload.get('DialWhomNumber')
 		call_log.duration = call_payload.get('DialCallDuration') or 0
 		call_log.recording_url = call_payload.get('RecordingUrl')
 		call_log.save(ignore_permissions=True)
@@ -48,7 +51,7 @@
 def create_call_log(call_payload):
 	call_log = frappe.new_doc('Call Log')
 	call_log.id = call_payload.get('CallSid')
-	call_log.to = call_payload.get('CallTo')
+	call_log.to = call_payload.get('DialWhomNumber')
 	call_log.medium = call_payload.get('To')
 	call_log.status = 'Ringing'
 	setattr(call_log, 'from', call_payload.get('CallFrom'))
diff --git a/erpnext/hooks.py b/erpnext/hooks.py
index f639fff..7e33a14 100644
--- a/erpnext/hooks.py
+++ b/erpnext/hooks.py
@@ -231,8 +231,12 @@
 	('Sales Invoice', 'Purchase Invoice', 'Delivery Note'): {
 		'validate': 'erpnext.regional.india.utils.set_place_of_supply'
 	},
-	"Contact":{
-		"on_trash": "erpnext.support.doctype.issue.issue.update_issue"
+	"Contact": {
+		"on_trash": "erpnext.support.doctype.issue.issue.update_issue",
+		"after_insert": "erpnext.communication.doctype.call_log.call_log.set_caller_information"
+	},
+	"Lead": {
+		"after_insert": "erpnext.communication.doctype.call_log.call_log.set_caller_information"
 	},
 	"Email Unsubscribe": {
 		"after_insert": "erpnext.crm.doctype.email_campaign.email_campaign.unsubscribe_recipient"
diff --git a/erpnext/hr/doctype/employee/employee.py b/erpnext/hr/doctype/employee/employee.py
index cf418b0..3fc330e 100755
--- a/erpnext/hr/doctype/employee/employee.py
+++ b/erpnext/hr/doctype/employee/employee.py
@@ -76,6 +76,7 @@
 		if self.user_id:
 			self.update_user()
 			self.update_user_permissions()
+		self.reset_employee_emails_cache()
 
 	def update_user_permissions(self):
 		if not self.create_user_permission: return
@@ -214,6 +215,15 @@
 			doc.validate_employee_creation()
 			doc.db_set("employee", self.name)
 
+	def reset_employee_emails_cache(self):
+		prev_doc = self.get_doc_before_save() or {}
+		cell_number = self.get('cell_number')
+		prev_number = prev_doc.get('cell_number')
+		if (cell_number != prev_number or
+			self.get('user_id') != prev_doc.get('user_id')):
+			frappe.cache().hdel('employees_with_number', cell_number)
+			frappe.cache().hdel('employees_with_number', prev_number)
+
 def get_timeline_data(doctype, name):
 	'''Return timeline for attendance'''
 	return dict(frappe.db.sql('''select unix_timestamp(attendance_date), count(*)
diff --git a/erpnext/hr/doctype/leave_application/leave_application.json b/erpnext/hr/doctype/leave_application/leave_application.json
index f8344b5..cdb1add 100644
--- a/erpnext/hr/doctype/leave_application/leave_application.json
+++ b/erpnext/hr/doctype/leave_application/leave_application.json
@@ -1,343 +1,332 @@
 {
- "allow_import": 1,
- "autoname": "naming_series:",
- "creation": "2013-02-20 11:18:11",
- "description": "Apply / Approve Leaves",
- "doctype": "DocType",
- "document_type": "Document",
- "engine": "InnoDB",
- "field_order": [
-  "naming_series",
-  "employee",
-  "employee_name",
-  "column_break_4",
-  "leave_type",
-  "department",
-  "leave_balance",
-  "section_break_5",
-  "from_date",
-  "to_date",
-  "half_day",
-  "half_day_date",
-  "total_leave_days",
-  "column_break1",
-  "description",
-  "section_break_7",
-  "leave_approver",
-  "leave_approver_name",
-  "column_break_18",
-  "status",
-  "leave_details",
-  "sb10",
-  "posting_date",
-  "company",
-  "follow_via_email",
-  "column_break_17",
-  "salary_slip",
-  "letter_head",
-  "color",
-  "amended_from"
- ],
- "fields": [
-  {
-   "fieldname": "naming_series",
-   "fieldtype": "Select",
-   "label": "Series",
-   "no_copy": 1,
-   "options": "HR-LAP-.YYYY.-",
-   "print_hide": 1,
-   "reqd": 1,
-   "set_only_once": 1
-  },
-  {
-   "fieldname": "employee",
-   "fieldtype": "Link",
-   "in_global_search": 1,
-   "in_standard_filter": 1,
-   "label": "Employee",
-   "options": "Employee",
-   "reqd": 1,
-   "search_index": 1
-  },
-  {
-   "fieldname": "employee_name",
-   "fieldtype": "Data",
-   "in_global_search": 1,
-   "label": "Employee Name",
-   "read_only": 1
-  },
-  {
-   "fieldname": "column_break_4",
-   "fieldtype": "Column Break"
-  },
-  {
-   "fieldname": "leave_type",
-   "fieldtype": "Link",
-   "ignore_user_permissions": 1,
-   "in_standard_filter": 1,
-   "label": "Leave Type",
-   "options": "Leave Type",
-   "reqd": 1,
-   "search_index": 1
-  },
-  {
-   "fetch_from": "employee.department",
-   "fieldname": "department",
-   "fieldtype": "Link",
-   "label": "Department",
-   "options": "Department",
-   "read_only": 1
-  },
-  {
-   "fieldname": "leave_balance",
-   "fieldtype": "Float",
-   "label": "Leave Balance Before Application",
-   "no_copy": 1,
-   "read_only": 1
-  },
-  {
-   "fieldname": "section_break_5",
-   "fieldtype": "Section Break"
-  },
-  {
-   "fieldname": "from_date",
-   "fieldtype": "Date",
-   "in_list_view": 1,
-   "in_standard_filter": 1,
-   "label": "From Date",
-   "reqd": 1,
-   "search_index": 1
-  },
-  {
-   "fieldname": "to_date",
-   "fieldtype": "Date",
-   "in_standard_filter": 1,
-   "label": "To Date",
-   "reqd": 1,
-   "search_index": 1
-  },
-  {
-   "default": "0",
-   "fieldname": "half_day",
-   "fieldtype": "Check",
-   "label": "Half Day"
-  },
-  {
-   "depends_on": "eval:doc.half_day && (doc.from_date != doc.to_date)",
-   "fieldname": "half_day_date",
-   "fieldtype": "Date",
-   "label": "Half Day Date"
-  },
-  {
-   "fieldname": "total_leave_days",
-   "fieldtype": "Float",
-   "in_list_view": 1,
-   "label": "Total Leave Days",
-   "no_copy": 1,
-   "precision": "1",
-   "read_only": 1
-  },
-  {
-   "fieldname": "column_break1",
-   "fieldtype": "Column Break",
-   "print_width": "50%",
-   "width": "50%"
-  },
-  {
-   "fieldname": "description",
-   "fieldtype": "Small Text",
-   "label": "Reason",
-   "reqd": 1
-  },
-  {
-   "fieldname": "section_break_7",
-   "fieldtype": "Section Break",
-   "label": "Approval"
-  },
-  {
-   "fieldname": "leave_approver",
-   "fieldtype": "Link",
-   "label": "Leave Approver",
-   "options": "User"
-  },
-  {
-   "fieldname": "leave_approver_name",
-   "fieldtype": "Data",
-   "label": "Leave Approver Name",
-   "read_only": 1
-  },
-  {
-   "fieldname": "column_break_18",
-   "fieldtype": "Column Break"
-  },
-  {
-   "default": "Open",
-   "fieldname": "status",
-   "fieldtype": "Select",
-   "in_standard_filter": 1,
-   "label": "Status",
-   "no_copy": 1,
-   "options": "Open\nApproved\nRejected\nCancelled"
-  },
-  {
-   "fieldname": "sb10",
-   "fieldtype": "Section Break"
-  },
-  {
-   "default": "Today",
-   "fieldname": "posting_date",
-   "fieldtype": "Date",
-   "label": "Posting Date",
-   "no_copy": 1,
-   "reqd": 1
-  },
-  {
-   "fieldname": "company",
-   "fieldtype": "Link",
-   "label": "Company",
-   "options": "Company",
-   "remember_last_selected_value": 1,
-   "reqd": 1
-  },
-  {
-   "allow_on_submit": 1,
-   "default": "1",
-   "fieldname": "follow_via_email",
-   "fieldtype": "Check",
-   "label": "Follow via Email",
-   "print_hide": 1
-  },
-  {
-   "fieldname": "column_break_17",
-   "fieldtype": "Column Break"
-  },
-  {
-   "fieldname": "salary_slip",
-   "fieldtype": "Link",
-   "label": "Salary Slip",
-   "options": "Salary Slip",
-   "print_hide": 1
-  },
-  {
-   "allow_on_submit": 1,
-   "fieldname": "letter_head",
-   "fieldtype": "Link",
-   "ignore_user_permissions": 1,
-   "label": "Letter Head",
-   "options": "Letter Head",
-   "print_hide": 1
-  },
-  {
-   "allow_on_submit": 1,
-   "fieldname": "color",
-   "fieldtype": "Color",
-   "label": "Color",
-   "print_hide": 1
-  },
-  {
-   "fieldname": "amended_from",
-   "fieldtype": "Link",
-   "ignore_user_permissions": 1,
-   "label": "Amended From",
-   "no_copy": 1,
-   "options": "Leave Application",
-   "print_hide": 1,
-   "read_only": 1
-  },
-  {
-   "fieldname": "leave_details",
-   "fieldtype": "Small Text",
-   "hidden": 1,
-   "label": "Leave Details"
-  }
- ],
- "icon": "fa fa-calendar",
- "idx": 1,
- "is_submittable": 1,
- "max_attachments": 3,
- "modified": "2019-06-14 15:37:45.988552",
- "modified_by": "Administrator",
- "module": "HR",
- "name": "Leave Application",
- "owner": "Administrator",
- "permissions": [
-  {
-   "create": 1,
-   "email": 1,
-   "print": 1,
-   "read": 1,
-   "report": 1,
-   "role": "Employee",
-   "share": 1,
-   "write": 1
-  },
-  {
-   "amend": 1,
-   "cancel": 1,
-   "create": 1,
-   "delete": 1,
-   "email": 1,
-   "export": 1,
-   "print": 1,
-   "read": 1,
-   "report": 1,
-   "role": "HR Manager",
-   "set_user_permissions": 1,
-   "share": 1,
-   "submit": 1,
-   "write": 1
-  },
-  {
-   "permlevel": 1,
-   "read": 1,
-   "role": "All"
-  },
-  {
-   "amend": 1,
-   "cancel": 1,
-   "create": 1,
-   "delete": 1,
-   "email": 1,
-   "print": 1,
-   "read": 1,
-   "report": 1,
-   "role": "HR User",
-   "set_user_permissions": 1,
-   "share": 1,
-   "submit": 1,
-   "write": 1
-  },
-  {
-   "amend": 1,
-   "cancel": 1,
-   "delete": 1,
-   "email": 1,
-   "print": 1,
-   "read": 1,
-   "report": 1,
-   "role": "Leave Approver",
-   "share": 1,
-   "submit": 1,
-   "write": 1
-  },
-  {
-   "permlevel": 1,
-   "read": 1,
-   "report": 1,
-   "role": "HR User",
-   "write": 1
-  },
-  {
-   "permlevel": 1,
-   "read": 1,
-   "report": 1,
-   "role": "Leave Approver",
-   "write": 1
-  }
- ],
- "search_fields": "employee,employee_name,leave_type,from_date,to_date,total_leave_days",
- "sort_field": "modified",
- "sort_order": "DESC",
- "timeline_field": "employee",
- "title_field": "employee_name"
-}
\ No newline at end of file
+   "allow_import": 1,
+   "autoname": "naming_series:",
+   "creation": "2013-02-20 11:18:11",
+   "description": "Apply / Approve Leaves",
+   "doctype": "DocType",
+   "document_type": "Document",
+   "engine": "InnoDB",
+   "field_order": [
+    "naming_series",
+    "employee",
+    "employee_name",
+    "column_break_4",
+    "leave_type",
+    "department",
+    "leave_balance",
+    "section_break_5",
+    "from_date",
+    "to_date",
+    "half_day",
+    "half_day_date",
+    "total_leave_days",
+    "column_break1",
+    "description",
+    "section_break_7",
+    "leave_approver",
+    "leave_approver_name",
+    "column_break_18",
+    "status",
+    "salary_slip",
+    "sb10",
+    "posting_date",
+    "follow_via_email",
+    "color",
+    "column_break_17",
+    "company",
+    "letter_head",
+    "amended_from"
+   ],
+   "fields": [
+    {
+     "fieldname": "naming_series",
+     "fieldtype": "Select",
+     "label": "Series",
+     "no_copy": 1,
+     "options": "HR-LAP-.YYYY.-",
+     "print_hide": 1,
+     "reqd": 1,
+     "set_only_once": 1
+    },
+    {
+     "fieldname": "employee",
+     "fieldtype": "Link",
+     "in_global_search": 1,
+     "in_standard_filter": 1,
+     "label": "Employee",
+     "options": "Employee",
+     "reqd": 1,
+     "search_index": 1
+    },
+    {
+     "fieldname": "employee_name",
+     "fieldtype": "Data",
+     "in_global_search": 1,
+     "label": "Employee Name",
+     "read_only": 1
+    },
+    {
+     "fieldname": "column_break_4",
+     "fieldtype": "Column Break"
+    },
+    {
+     "fieldname": "leave_type",
+     "fieldtype": "Link",
+     "ignore_user_permissions": 1,
+     "in_standard_filter": 1,
+     "label": "Leave Type",
+     "options": "Leave Type",
+     "reqd": 1,
+     "search_index": 1
+    },
+    {
+     "fetch_from": "employee.department",
+     "fieldname": "department",
+     "fieldtype": "Link",
+     "label": "Department",
+     "options": "Department",
+     "read_only": 1
+    },
+    {
+     "fieldname": "leave_balance",
+     "fieldtype": "Float",
+     "label": "Leave Balance Before Application",
+     "no_copy": 1,
+     "read_only": 1
+    },
+    {
+     "fieldname": "section_break_5",
+     "fieldtype": "Section Break"
+    },
+    {
+     "fieldname": "from_date",
+     "fieldtype": "Date",
+     "in_list_view": 1,
+     "label": "From Date",
+     "reqd": 1,
+     "search_index": 1
+    },
+    {
+     "fieldname": "to_date",
+     "fieldtype": "Date",
+     "label": "To Date",
+     "reqd": 1,
+     "search_index": 1
+    },
+    {
+     "default": "0",
+     "fieldname": "half_day",
+     "fieldtype": "Check",
+     "label": "Half Day"
+    },
+    {
+     "depends_on": "eval:doc.half_day && (doc.from_date != doc.to_date)",
+     "fieldname": "half_day_date",
+     "fieldtype": "Date",
+     "label": "Half Day Date"
+    },
+    {
+     "fieldname": "total_leave_days",
+     "fieldtype": "Float",
+     "in_list_view": 1,
+     "label": "Total Leave Days",
+     "no_copy": 1,
+     "precision": "1",
+     "read_only": 1
+    },
+    {
+     "fieldname": "column_break1",
+     "fieldtype": "Column Break",
+     "print_width": "50%",
+     "width": "50%"
+    },
+    {
+     "fieldname": "description",
+     "fieldtype": "Small Text",
+     "label": "Reason"
+    },
+    {
+     "fieldname": "section_break_7",
+     "fieldtype": "Section Break"
+    },
+    {
+     "fieldname": "leave_approver",
+     "fieldtype": "Link",
+     "label": "Leave Approver",
+     "options": "User"
+    },
+    {
+     "fieldname": "leave_approver_name",
+     "fieldtype": "Data",
+     "label": "Leave Approver Name",
+     "read_only": 1
+    },
+    {
+     "fieldname": "column_break_18",
+     "fieldtype": "Column Break"
+    },
+    {
+     "default": "Open",
+     "fieldname": "status",
+     "fieldtype": "Select",
+     "in_standard_filter": 1,
+     "label": "Status",
+     "no_copy": 1,
+     "options": "Open\nApproved\nRejected\nCancelled"
+    },
+    {
+     "fieldname": "sb10",
+     "fieldtype": "Section Break"
+    },
+    {
+     "default": "Today",
+     "fieldname": "posting_date",
+     "fieldtype": "Date",
+     "label": "Posting Date",
+     "no_copy": 1,
+     "reqd": 1
+    },
+    {
+     "fieldname": "company",
+     "fieldtype": "Link",
+     "label": "Company",
+     "options": "Company",
+     "remember_last_selected_value": 1,
+     "reqd": 1
+    },
+    {
+     "allow_on_submit": 1,
+     "default": "1",
+     "fieldname": "follow_via_email",
+     "fieldtype": "Check",
+     "label": "Follow via Email",
+     "print_hide": 1
+    },
+    {
+     "fieldname": "column_break_17",
+     "fieldtype": "Column Break"
+    },
+    {
+     "fieldname": "salary_slip",
+     "fieldtype": "Link",
+     "label": "Salary Slip",
+     "options": "Salary Slip",
+     "print_hide": 1
+    },
+    {
+     "allow_on_submit": 1,
+     "fieldname": "letter_head",
+     "fieldtype": "Link",
+     "ignore_user_permissions": 1,
+     "label": "Letter Head",
+     "options": "Letter Head",
+     "print_hide": 1
+    },
+    {
+     "allow_on_submit": 1,
+     "fieldname": "color",
+     "fieldtype": "Color",
+     "label": "Color",
+     "print_hide": 1
+    },
+    {
+     "fieldname": "amended_from",
+     "fieldtype": "Link",
+     "ignore_user_permissions": 1,
+     "label": "Amended From",
+     "no_copy": 1,
+     "options": "Leave Application",
+     "print_hide": 1,
+     "read_only": 1
+    }
+   ],
+   "icon": "fa fa-calendar",
+   "idx": 1,
+   "is_submittable": 1,
+   "max_attachments": 3,
+   "modified": "2019-08-13 13:32:04.860848",
+   "modified_by": "Administrator",
+   "module": "HR",
+   "name": "Leave Application",
+   "owner": "Administrator",
+   "permissions": [
+    {
+     "create": 1,
+     "email": 1,
+     "print": 1,
+     "read": 1,
+     "report": 1,
+     "role": "Employee",
+     "share": 1,
+     "write": 1
+    },
+    {
+     "amend": 1,
+     "cancel": 1,
+     "create": 1,
+     "delete": 1,
+     "email": 1,
+     "export": 1,
+     "print": 1,
+     "read": 1,
+     "report": 1,
+     "role": "HR Manager",
+     "set_user_permissions": 1,
+     "share": 1,
+     "submit": 1,
+     "write": 1
+    },
+    {
+     "permlevel": 1,
+     "read": 1,
+     "role": "All"
+    },
+    {
+     "amend": 1,
+     "cancel": 1,
+     "create": 1,
+     "delete": 1,
+     "email": 1,
+     "print": 1,
+     "read": 1,
+     "report": 1,
+     "role": "HR User",
+     "set_user_permissions": 1,
+     "share": 1,
+     "submit": 1,
+     "write": 1
+    },
+    {
+     "amend": 1,
+     "cancel": 1,
+     "delete": 1,
+     "email": 1,
+     "print": 1,
+     "read": 1,
+     "report": 1,
+     "role": "Leave Approver",
+     "share": 1,
+     "submit": 1,
+     "write": 1
+    },
+    {
+     "permlevel": 1,
+     "read": 1,
+     "report": 1,
+     "role": "HR User",
+     "write": 1
+    },
+    {
+     "permlevel": 1,
+     "read": 1,
+     "report": 1,
+     "role": "Leave Approver",
+     "write": 1
+    }
+   ],
+   "search_fields": "employee,employee_name,leave_type,from_date,to_date,total_leave_days",
+   "sort_field": "modified",
+   "sort_order": "DESC",
+   "timeline_field": "employee",
+   "title_field": "employee_name"
+  }
\ No newline at end of file
diff --git a/erpnext/patches/v12_0/update_pricing_rule_fields.py b/erpnext/patches/v12_0/update_pricing_rule_fields.py
index 8f8349e..985613a 100644
--- a/erpnext/patches/v12_0/update_pricing_rule_fields.py
+++ b/erpnext/patches/v12_0/update_pricing_rule_fields.py
@@ -5,67 +5,67 @@
 import frappe
 
 parentfield = {
-    'item_code': 'items',
-    'item_group': 'item_groups',
-    'brand': 'brands'
+	'item_code': 'items',
+	'item_group': 'item_groups',
+	'brand': 'brands'
 }
 
 def execute():
 
-    if not frappe.get_all('Pricing Rule', limit=1):
-        return
+	if not frappe.get_all('Pricing Rule', limit=1):
+		return
 
-    frappe.reload_doc('accounts', 'doctype', 'pricing_rule_detail')
-    doctypes = {'Supplier Quotation': 'buying', 'Purchase Order': 'buying', 'Purchase Invoice': 'accounts',
-        'Purchase Receipt': 'stock', 'Quotation': 'selling', 'Sales Order': 'selling',
-        'Sales Invoice': 'accounts', 'Delivery Note': 'stock'}
+	frappe.reload_doc('accounts', 'doctype', 'pricing_rule_detail')
+	doctypes = {'Supplier Quotation': 'buying', 'Purchase Order': 'buying', 'Purchase Invoice': 'accounts',
+		'Purchase Receipt': 'stock', 'Quotation': 'selling', 'Sales Order': 'selling',
+		'Sales Invoice': 'accounts', 'Delivery Note': 'stock'}
 
-    for doctype, module in doctypes.items():
-        frappe.reload_doc(module, 'doctype', frappe.scrub(doctype))
+	for doctype, module in doctypes.items():
+		frappe.reload_doc(module, 'doctype', frappe.scrub(doctype))
 
-        child_doc = frappe.scrub(doctype) + '_item'
-        frappe.reload_doc(module, 'doctype', child_doc)
+		child_doc = frappe.scrub(doctype) + '_item'
+		frappe.reload_doc(module, 'doctype', child_doc, force=True)
 
-        child_doctype = doctype + ' Item'
+		child_doctype = doctype + ' Item'
 
-        frappe.db.sql(""" UPDATE `tab{child_doctype}` SET pricing_rules = pricing_rule
-            WHERE docstatus < 2 and pricing_rule is not null and pricing_rule != ''
-        """.format(child_doctype= child_doctype))
+		frappe.db.sql(""" UPDATE `tab{child_doctype}` SET pricing_rules = pricing_rule
+			WHERE docstatus < 2 and pricing_rule is not null and pricing_rule != ''
+		""".format(child_doctype= child_doctype))
 
-        data = frappe.db.sql(""" SELECT pricing_rule, name, parent,
-                parenttype, creation, modified, docstatus, modified_by, owner, name
-            FROM `tab{child_doc}` where docstatus < 2 and pricing_rule is not null
-            and pricing_rule != ''""".format(child_doc=child_doctype), as_dict=1)
+		data = frappe.db.sql(""" SELECT pricing_rule, name, parent,
+				parenttype, creation, modified, docstatus, modified_by, owner, name
+			FROM `tab{child_doc}` where docstatus < 2 and pricing_rule is not null
+			and pricing_rule != ''""".format(child_doc=child_doctype), as_dict=1)
 
-        values = []
-        for d in data:
-            values.append((d.pricing_rule, d.name, d.parent, 'pricing_rules', d.parenttype,
-                d.creation, d.modified, d.docstatus, d.modified_by, d.owner, frappe.generate_hash("", 10)))
+		values = []
+		for d in data:
+			values.append((d.pricing_rule, d.name, d.parent, 'pricing_rules', d.parenttype,
+				d.creation, d.modified, d.docstatus, d.modified_by, d.owner, frappe.generate_hash("", 10)))
 
-        if values:
-            frappe.db.sql(""" INSERT INTO
-                `tabPricing Rule Detail` (`pricing_rule`, `child_docname`, `parent`, `parentfield`, `parenttype`,
-                `creation`, `modified`, `docstatus`, `modified_by`, `owner`, `name`)
-            VALUES {values} """.format(values=', '.join(['%s'] * len(values))), tuple(values))
+		if values:
+			frappe.db.sql(""" INSERT INTO
+				`tabPricing Rule Detail` (`pricing_rule`, `child_docname`, `parent`, `parentfield`, `parenttype`,
+				`creation`, `modified`, `docstatus`, `modified_by`, `owner`, `name`)
+			VALUES {values} """.format(values=', '.join(['%s'] * len(values))), tuple(values))
 
-    frappe.reload_doc('accounts', 'doctype', 'pricing_rule')
+	frappe.reload_doc('accounts', 'doctype', 'pricing_rule')
 
-    for doctype, apply_on in {'Pricing Rule Item Code': 'Item Code',
-        'Pricing Rule Item Group': 'Item Group', 'Pricing Rule Brand': 'Brand'}.items():
-        frappe.reload_doc('accounts', 'doctype', frappe.scrub(doctype))
+	for doctype, apply_on in {'Pricing Rule Item Code': 'Item Code',
+		'Pricing Rule Item Group': 'Item Group', 'Pricing Rule Brand': 'Brand'}.items():
+		frappe.reload_doc('accounts', 'doctype', frappe.scrub(doctype))
 
-        field = frappe.scrub(apply_on)
-        data = frappe.get_all('Pricing Rule', fields=[field, "name", "creation", "modified",
-            "owner", "modified_by"], filters= {'apply_on': apply_on})
+		field = frappe.scrub(apply_on)
+		data = frappe.get_all('Pricing Rule', fields=[field, "name", "creation", "modified",
+			"owner", "modified_by"], filters= {'apply_on': apply_on})
 
-        values = []
-        for d in data:
-            values.append((d.get(field), d.name, parentfield.get(field), 'Pricing Rule',
-                d.creation, d.modified, d.owner, d.modified_by, frappe.generate_hash("", 10)))
+		values = []
+		for d in data:
+			values.append((d.get(field), d.name, parentfield.get(field), 'Pricing Rule',
+				d.creation, d.modified, d.owner, d.modified_by, frappe.generate_hash("", 10)))
 
-        if values:
-            frappe.db.sql(""" INSERT INTO
-                `tab{doctype}` ({field}, parent, parentfield, parenttype, creation, modified,
-                    owner, modified_by, name)
-            VALUES {values} """.format(doctype=doctype,
-                field=field, values=', '.join(['%s'] * len(values))), tuple(values))
\ No newline at end of file
+		if values:
+			frappe.db.sql(""" INSERT INTO
+				`tab{doctype}` ({field}, parent, parentfield, parenttype, creation, modified,
+					owner, modified_by, name)
+			VALUES {values} """.format(doctype=doctype,
+				field=field, values=', '.join(['%s'] * len(values))), tuple(values))
diff --git a/erpnext/public/js/call_popup/call_popup.js b/erpnext/public/js/call_popup/call_popup.js
index 89657a1..5278b32 100644
--- a/erpnext/public/js/call_popup/call_popup.js
+++ b/erpnext/public/js/call_popup/call_popup.js
@@ -11,12 +11,51 @@
 			'static': true,
 			'minimizable': true,
 			'fields': [{
-				'fieldname': 'caller_info',
-				'fieldtype': 'HTML'
+				'fieldname': 'name',
+				'label': 'Name',
+				'default': this.get_caller_name() || __('Unknown Caller'),
+				'fieldtype': 'Data',
+				'read_only': 1
+			}, {
+				'fieldtype': 'Button',
+				'label': __('Open Contact'),
+				'click': () => frappe.set_route('Form', 'Contact', this.call_log.contact),
+				'depends_on': () => this.call_log.contact
+			}, {
+				'fieldtype': 'Button',
+				'label': __('Open Lead'),
+				'click': () => frappe.set_route('Form', 'Lead', this.call_log.lead),
+				'depends_on': () => this.call_log.lead
+			}, {
+				'fieldtype': 'Button',
+				'label': __('Make New Contact'),
+				'click': () => frappe.new_doc('Contact', { 'mobile_no': this.caller_number }),
+				'depends_on': () => !this.get_caller_name()
+			}, {
+				'fieldtype': 'Button',
+				'label': __('Make New Lead'),
+				'click': () => frappe.new_doc('Lead', { 'mobile_no': this.caller_number }),
+				'depends_on': () => !this.get_caller_name()
+			}, {
+				'fieldtype': 'Column Break',
+			}, {
+				'fieldname': 'number',
+				'label': 'Phone Number',
+				'fieldtype': 'Data',
+				'default': this.caller_number,
+				'read_only': 1
 			}, {
 				'fielname': 'last_interaction',
 				'fieldtype': 'Section Break',
 				'label': __('Activity'),
+				'depends_on': () => this.get_caller_name()
+			}, {
+				'fieldtype': 'Small Text',
+				'label': __('Last Issue'),
+				'fieldname': 'last_issue',
+				'read_only': true,
+				'depends_on': () => this.call_log.contact,
+				'default': `<i class="text-muted">${__('No issue has been raised by the caller.')}<i>`
 			}, {
 				'fieldtype': 'Small Text',
 				'label': __('Last Communication'),
@@ -24,13 +63,7 @@
 				'read_only': true,
 				'default': `<i class="text-muted">${__('No communication found.')}<i>`
 			}, {
-				'fieldtype': 'Small Text',
-				'label': __('Last Issue'),
-				'fieldname': 'last_issue',
-				'read_only': true,
-				'default': `<i class="text-muted">${__('No issue raised by the customer.')}<i>`
-			}, {
-				'fieldtype': 'Column Break',
+				'fieldtype': 'Section Break',
 			}, {
 				'fieldtype': 'Small Text',
 				'label': __('Call Summary'),
@@ -41,13 +74,21 @@
 				'click': () => {
 					const call_summary = this.dialog.get_value('call_summary');
 					if (!call_summary) return;
-					frappe.xcall('erpnext.crm.doctype.utils.add_call_summary', {
-						'docname': this.call_log.id,
+					frappe.xcall('erpnext.communication.doctype.call_log.call_log.add_call_summary', {
+						'call_log': this.call_log.name,
 						'summary': call_summary,
 					}).then(() => {
 						this.close_modal();
 						frappe.show_alert({
-							message: `${__('Call Summary Saved')}<br><a class="text-small text-muted" href="#Form/Call Log/${this.call_log.name}">${__('View call log')}</a>`,
+							message: `
+								${__('Call Summary Saved')}
+								<br>
+								<a
+									class="text-small text-muted"
+									href="#Form/Call Log/${this.call_log.name}">
+									${__('View call log')}
+								</a>
+							`,
 							indicator: 'green'
 						});
 					});
@@ -55,71 +96,14 @@
 			}],
 		});
 		this.set_call_status();
-		this.make_caller_info_section();
 		this.dialog.get_close_btn().show();
+		this.make_last_interaction_section();
 		this.dialog.$body.addClass('call-popup');
 		this.dialog.set_secondary_action(this.close_modal.bind(this));
 		frappe.utils.play_sound('incoming-call');
 		this.dialog.show();
 	}
 
-	make_caller_info_section() {
-		const wrapper = this.dialog.get_field('caller_info').$wrapper;
-		wrapper.append(`<div class="text-muted"> ${__("Loading...")} </div>`);
-		frappe.xcall('erpnext.crm.doctype.utils.get_document_with_phone_number', {
-			'number': this.caller_number
-		}).then(contact_doc => {
-			wrapper.empty();
-			const contact = this.contact = contact_doc;
-			if (!contact) {
-				this.setup_unknown_caller(wrapper);
-			} else {
-				this.setup_known_caller(wrapper);
-				this.set_call_status();
-				this.make_last_interaction_section();
-			}
-		});
-	}
-
-	setup_unknown_caller(wrapper) {
-		wrapper.append(`
-			<div class="caller-info">
-				<b>${__('Unknown Number')}:</b> ${this.caller_number}
-				<button
-					class="margin-left btn btn-new btn-default btn-xs"
-					data-doctype="Contact"
-					title=${__("Make New Contact")}>
-					<i class="octicon octicon-plus text-medium"></i>
-				</button>
-			</div>
-		`).find('button').click(
-			() => frappe.set_route(`Form/Contact/New Contact?phone=${this.caller_number}`)
-		);
-	}
-
-	setup_known_caller(wrapper) {
-		const contact = this.contact;
-		const contact_name = frappe.utils.get_form_link(contact.doctype, contact.name, true, this.get_caller_name());
-		const links = contact.links ? contact.links : [];
-
-		let contact_links = '';
-
-		links.forEach(link => {
-			contact_links += `<div>${link.link_doctype}: ${frappe.utils.get_form_link(link.link_doctype, link.link_name, true)}</div>`;
-		});
-		wrapper.append(`
-			<div class="caller-info flex">
-				${frappe.avatar(null, 'avatar-xl', contact.name, contact.image || '')}
-				<div>
-					<h5>${contact_name}</h5>
-					<div>${contact.mobile_no || ''}</div>
-					<div>${contact.phone_no || ''}</div>
-					${contact_links}
-				</div>
-			</div>
-		`);
-	}
-
 	set_indicator(color, blink=false) {
 		let classes = `indicator ${color} ${blink ? 'blink': ''}`;
 		this.dialog.header.find('.indicator').attr('class', classes);
@@ -129,7 +113,7 @@
 		let title = '';
 		call_status = call_status || this.call_log.status;
 		if (['Ringing'].includes(call_status) || !call_status) {
-			title = __('Incoming call from {0}', [this.get_caller_name()]);
+			title = __('Incoming call from {0}', [this.get_caller_name() || this.caller_number]);
 			this.set_indicator('blue', true);
 		} else if (call_status === 'In Progress') {
 			title = __('Call Connected');
@@ -164,13 +148,13 @@
 			if (!this.dialog.get_value('call_summary')) {
 				this.close_modal();
 			}
-		}, 10000);
+		}, 30000);
 	}
 
 	make_last_interaction_section() {
 		frappe.xcall('erpnext.crm.doctype.utils.get_last_interaction', {
-			'number': this.caller_number,
-			'reference_doc': this.contact
+			'contact': this.call_log.contact,
+			'lead': this.call_log.lead
 		}).then(data => {
 			const comm_field = this.dialog.get_field('last_communication');
 			if (data.last_communication) {
@@ -182,15 +166,20 @@
 				const issue = data.last_issue;
 				const issue_field = this.dialog.get_field("last_issue");
 				issue_field.set_value(issue.subject);
-				issue_field.$wrapper.append(`<a class="text-medium" href="#List/Issue?customer=${issue.customer}">
-					${__('View all issues from {0}', [issue.customer])}
-				</a>`);
+				issue_field.$wrapper.append(`
+					<a class="text-medium" href="#List/Issue?customer=${issue.customer}">
+						${__('View all issues from {0}', [issue.customer])}
+					</a>
+				`);
 			}
 		});
 	}
+
 	get_caller_name() {
-		return this.contact ? this.contact.lead_name || this.contact.name || '' : this.caller_number;
+		let log = this.call_log;
+		return log.contact_name || log.lead_name;
 	}
+
 	setup_listener() {
 		frappe.realtime.on(`call_${this.call_log.id}_disconnected`, call_log => {
 			this.call_disconnected(call_log);
diff --git a/erpnext/public/js/controllers/buying.js b/erpnext/public/js/controllers/buying.js
index acc09ed..118aee9 100644
--- a/erpnext/public/js/controllers/buying.js
+++ b/erpnext/public/js/controllers/buying.js
@@ -452,7 +452,8 @@
 					company: frm.doc.company,
 					is_subcontracted: frm.doc.is_subcontracted,
 					transaction_date: frm.doc.transaction_date || frm.doc.posting_date,
-					ignore_pricing_rule: frm.doc.ignore_pricing_rule
+					ignore_pricing_rule: frm.doc.ignore_pricing_rule,
+					doctype: frm.doc.doctype
 				}
 			},
 			freeze: true,
diff --git a/erpnext/quality_management/doctype/quality_procedure/quality_procedure.json b/erpnext/quality_management/doctype/quality_procedure/quality_procedure.json
index 7b241ef..472b751 100644
--- a/erpnext/quality_management/doctype/quality_procedure/quality_procedure.json
+++ b/erpnext/quality_management/doctype/quality_procedure/quality_procedure.json
@@ -1,11 +1,11 @@
 {
- "autoname": "format:PRC-{procedure}",
+ "autoname": "format:PRC-{quality_procedure_name}",
  "creation": "2018-10-06 00:06:29.756804",
  "doctype": "DocType",
  "editable_grid": 1,
  "engine": "InnoDB",
  "field_order": [
-  "procedure",
+  "quality_procedure_name",
   "parent_quality_procedure",
   "is_group",
   "sb_00",
@@ -62,14 +62,14 @@
    "options": "Quality Procedure Process"
   },
   {
-   "fieldname": "procedure",
+   "fieldname": "quality_procedure_name",
    "fieldtype": "Data",
    "in_list_view": 1,
-   "label": "Procedure",
+   "label": "Quality Procedure",
    "reqd": 1
   }
  ],
- "modified": "2019-05-26 22:11:53.771428",
+ "modified": "2019-08-05 13:09:29.945082",
  "modified_by": "Administrator",
  "module": "Quality Management",
  "name": "Quality Procedure",
diff --git a/erpnext/quality_management/doctype/quality_procedure/quality_procedure.py b/erpnext/quality_management/doctype/quality_procedure/quality_procedure.py
index 52c3320..4d3c522 100644
--- a/erpnext/quality_management/doctype/quality_procedure/quality_procedure.py
+++ b/erpnext/quality_management/doctype/quality_procedure/quality_procedure.py
@@ -36,12 +36,10 @@
 			doc.load_from_db()
 
 			for process in doc.processes:
-				if process.procedure:
-					flag_is_group = 1
+				flag_is_group = 1 if process.procedure else 0
 
-			if flag_is_group == 0:
-				doc.is_group = 0
-				doc.save(ignore_permissions=True)
+			doc.is_group = 0 if flag_is_group == 0 else 1
+			doc.save(ignore_permissions=True)
 
 	def set_parent(self):
 		for process in self.processes:
diff --git a/erpnext/quality_management/doctype/quality_procedure/quality_procedure_tree.js b/erpnext/quality_management/doctype/quality_procedure/quality_procedure_tree.js
index 15b7784..8fd785f 100644
--- a/erpnext/quality_management/doctype/quality_procedure/quality_procedure_tree.js
+++ b/erpnext/quality_management/doctype/quality_procedure/quality_procedure_tree.js
@@ -6,8 +6,8 @@
 	add_tree_node: 'erpnext.quality_management.doctype.quality_procedure.quality_procedure.add_node',
 	filters: [
 		{
-			fieldname: "Quality Procedure",
-			fieldtype:"Link",
+			fieldname: "quality_procedure",
+			fieldtype: "Link",
 			options: "Quality Procedure",
 			label: __("Quality Procedure"),
 			get_query: function() {
@@ -19,7 +19,7 @@
 	],
 	breadcrumb: "Setup",
 	root_label: "All Quality Procedures",
-	get_tree_root: false,
+	get_tree_root: true,
 	menu_items: [
 		{
 			label: __("New Quality Procedure"),
@@ -32,8 +32,4 @@
 	onload: function(treeview) {
 		treeview.make_tree();
 	},
-	onrender: function() {
-		$("button:contains('Add Child')").remove();
-		$("button:contains('New')").remove();
-	}
 };
\ No newline at end of file
diff --git a/erpnext/quality_management/doctype/quality_procedure/test_quality_procedure.py b/erpnext/quality_management/doctype/quality_procedure/test_quality_procedure.py
index 79f8771..3289bb5 100644
--- a/erpnext/quality_management/doctype/quality_procedure/test_quality_procedure.py
+++ b/erpnext/quality_management/doctype/quality_procedure/test_quality_procedure.py
@@ -18,7 +18,7 @@
 def create_procedure():
 	procedure = frappe.get_doc({
 		"doctype": "Quality Procedure",
-		"procedure": "_Test Quality Procedure",
+		"quality_procedure_name": "_Test Quality Procedure",
 		"processes": [
 			{
 				"process_description": "_Test Quality Procedure Table",
@@ -37,7 +37,7 @@
 def create_nested_procedure():
 	nested_procedure = frappe.get_doc({
 		"doctype": "Quality Procedure",
-		"procedure": "_Test Nested Quality Procedure",
+		"quality_procedure_name": "_Test Nested Quality Procedure",
 		"processes": [
 			{
 				"procedure": "PRC-_Test Quality Procedure"
diff --git a/erpnext/regional/doctype/gstr_3b_report/gstr_3b_report.js b/erpnext/regional/doctype/gstr_3b_report/gstr_3b_report.js
index 0d6cef0..a1cea8f 100644
--- a/erpnext/regional/doctype/gstr_3b_report/gstr_3b_report.js
+++ b/erpnext/regional/doctype/gstr_3b_report/gstr_3b_report.js
@@ -2,7 +2,7 @@
 // For license information, please see license.txt
 
 frappe.ui.form.on('GSTR 3B Report', {
-	refresh : function(frm){
+	refresh : function(frm) {
 		if(!frm.is_new()) {
 			frm.set_intro(__("Please save the report again to rebuild or update"));
 			frm.add_custom_button(__('Download JSON'), function() {
@@ -39,9 +39,13 @@
 				});
 			});
 		}
+
+		let current_year = new Date().getFullYear();
+		let options = [current_year, current_year-1, current_year-2];
+		frm.set_df_property('year', 'options', options);
 	},
 
-	setup: function(frm){
+	setup: function(frm) {
 		frm.set_query('company_address', function(doc) {
 			if(!doc.company) {
 				frappe.throw(__('Please set Company'));
diff --git a/erpnext/regional/doctype/gstr_3b_report/gstr_3b_report.json b/erpnext/regional/doctype/gstr_3b_report/gstr_3b_report.json
index 7b0462f..548d40b 100644
--- a/erpnext/regional/doctype/gstr_3b_report/gstr_3b_report.json
+++ b/erpnext/regional/doctype/gstr_3b_report/gstr_3b_report.json
@@ -1,259 +1,73 @@
 {
- "allow_copy": 0, 
- "allow_events_in_timeline": 0, 
- "allow_guest_to_view": 0, 
- "allow_import": 0, 
- "allow_rename": 0, 
- "autoname": "format:GSTR3B-{month}-{year}-{company_address}", 
- "beta": 0, 
- "creation": "2019-02-04 11:35:55.964639", 
- "custom": 0, 
- "docstatus": 0, 
- "doctype": "DocType", 
- "document_type": "", 
- "editable_grid": 1, 
- "engine": "InnoDB", 
+ "autoname": "format:GSTR3B-{month}-{year}-{company_address}",
+ "creation": "2019-02-04 11:35:55.964639",
+ "doctype": "DocType",
+ "editable_grid": 1,
+ "engine": "InnoDB",
+ "field_order": [
+  "company",
+  "company_address",
+  "year",
+  "month",
+  "json_output",
+  "missing_field_invoices"
+ ],
  "fields": [
   {
-   "allow_bulk_edit": 0, 
-   "allow_in_quick_entry": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "company", 
-   "fieldtype": "Link", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "label": "Company", 
-   "length": 0, 
-   "no_copy": 0, 
-   "options": "Company", 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "translatable": 0, 
-   "unique": 0
-  }, 
+   "fieldname": "company",
+   "fieldtype": "Link",
+   "label": "Company",
+   "options": "Company"
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_in_quick_entry": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "company_address", 
-   "fieldtype": "Link", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "label": "Company Address", 
-   "length": 0, 
-   "no_copy": 0, 
-   "options": "Address", 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "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_address",
+   "fieldtype": "Link",
+   "label": "Company Address",
+   "options": "Address"
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_in_quick_entry": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "year", 
-   "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": "Year", 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "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": "year",
+   "fieldtype": "Select",
+   "label": "Year"
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_in_quick_entry": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "month", 
-   "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": "Month", 
-   "length": 0, 
-   "no_copy": 0, 
-   "options": "January\nFebruary\nMarch\nApril\nMay\nJune\nJuly\nAugust\nSeptember\nOctober\nNovember\nDecember", 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "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": "month",
+   "fieldtype": "Select",
+   "label": "Month",
+   "options": "January\nFebruary\nMarch\nApril\nMay\nJune\nJuly\nAugust\nSeptember\nOctober\nNovember\nDecember"
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_in_quick_entry": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "json_output", 
-   "fieldtype": "Code", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "label": "JSON Output", 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "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": "json_output",
+   "fieldtype": "Code",
+   "label": "JSON Output"
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_in_quick_entry": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "missing_field_invoices", 
-   "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": "Invoices with no Place Of Supply", 
-   "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": "missing_field_invoices",
+   "fieldtype": "Small Text",
+   "label": "Invoices with no Place Of Supply",
+   "read_only": 1
   }
- ], 
- "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-04 10:04:44.767655", 
- "modified_by": "Administrator", 
- "module": "Regional", 
- "name": "GSTR 3B Report", 
- "name_case": "", 
- "owner": "Administrator", 
+ ],
+ "modified": "2019-08-10 22:30:26.727038",
+ "modified_by": "Administrator",
+ "module": "Regional",
+ "name": "GSTR 3B Report",
+ "owner": "Administrator",
  "permissions": [
   {
-   "amend": 0, 
-   "cancel": 0, 
-   "create": 1, 
-   "delete": 1, 
-   "email": 1, 
-   "export": 1, 
-   "if_owner": 0, 
-   "import": 0, 
-   "permlevel": 0, 
-   "print": 1, 
-   "read": 1, 
-   "report": 1, 
-   "role": "System Manager", 
-   "set_user_permissions": 0, 
-   "share": 1, 
-   "submit": 0, 
+   "create": 1,
+   "delete": 1,
+   "email": 1,
+   "export": 1,
+   "print": 1,
+   "read": 1,
+   "report": 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": 1, 
- "track_seen": 0, 
- "track_views": 0
+ ],
+ "sort_field": "modified",
+ "sort_order": "DESC",
+ "track_changes": 1
 }
\ No newline at end of file
diff --git a/erpnext/regional/doctype/gstr_3b_report/gstr_3b_report.py b/erpnext/regional/doctype/gstr_3b_report/gstr_3b_report.py
index aad267e..79dace7 100644
--- a/erpnext/regional/doctype/gstr_3b_report/gstr_3b_report.py
+++ b/erpnext/regional/doctype/gstr_3b_report/gstr_3b_report.py
@@ -329,28 +329,29 @@
 				d.gst_category, []
 			)
 
-			if state_number != d.place_of_supply.split("-")[0]:
-				inter_state_supply_details[d.gst_category].append({
-					"pos": d.place_of_supply,
-					"txval": flt(d.total, 2),
-					"iamt": flt(inter_state_supply_tax_mapping.get(d.place_of_supply), 2)
-				})
-			else:
-				osup_det = self.report_dict["sup_details"]["osup_det"]
-				osup_det["txval"] = flt(osup_det["txval"] + d.total, 2)
-				osup_det["camt"] = flt(osup_det["camt"] + inter_state_supply_tax_mapping.get(d.place_of_supply)/2, 2)
-				osup_det["samt"] = flt(osup_det["samt"] + inter_state_supply_tax_mapping.get(d.place_of_supply)/2, 2)
+			if d.place_of_supply:
+				if state_number != d.place_of_supply.split("-")[0]:
+					inter_state_supply_details[d.gst_category].append({
+						"pos": d.place_of_supply.split("-")[0],
+						"txval": flt(d.total, 2),
+						"iamt": flt(inter_state_supply_tax_mapping.get(d.place_of_supply), 2)
+					})
+				else:
+					osup_det = self.report_dict["sup_details"]["osup_det"]
+					osup_det["txval"] = flt(osup_det["txval"] + d.total, 2)
+					osup_det["camt"] = flt(osup_det["camt"] + inter_state_supply_tax_mapping.get(d.place_of_supply)/2, 2)
+					osup_det["samt"] = flt(osup_det["samt"] + inter_state_supply_tax_mapping.get(d.place_of_supply)/2, 2)
 
 		return inter_state_supply_details
 
 	def get_inward_nil_exempt(self, state):
 
-		inward_nil_exempt = frappe.db.sql(""" select a.gst_state, sum(i.base_amount) as base_amount,
-			i.is_nil_exempt, i.is_non_gst from `tabPurchase Invoice` p , `tabPurchase Invoice Item` i, `tabAddress` a
-			where p.docstatus = 1 and p.name = i.parent and p.supplier_address = a.name
+		inward_nil_exempt = frappe.db.sql(""" select p.place_of_supply, sum(i.base_amount) as base_amount,
+			i.is_nil_exempt, i.is_non_gst from `tabPurchase Invoice` p , `tabPurchase Invoice Item` i
+			where p.docstatus = 1 and p.name = i.parent
 			and i.is_nil_exempt = 1 or i.is_non_gst = 1 and
 			month(p.posting_date) = %s and year(p.posting_date) = %s and p.company = %s and p.company_gstin = %s
-			group by a.gst_state """, (self.month_no, self.year, self.company, self.gst_details.get("gstin")), as_dict=1)
+			group by p.place_of_supply """, (self.month_no, self.year, self.company, self.gst_details.get("gstin")), as_dict=1)
 
 		inward_nil_exempt_details = {
 			"gst": {
@@ -364,14 +365,15 @@
 		}
 
 		for d in inward_nil_exempt:
-			if d.is_nil_exempt == 1 and state == d.gst_state:
-				inward_nil_exempt_details["gst"]["intra"] += d.base_amount
-			elif d.is_nil_exempt == 1 and state != d.gst_state:
-				inward_nil_exempt_details["gst"]["inter"] += d.base_amount
-			elif d.is_non_gst == 1 and state == d.gst_state:
-				inward_nil_exempt_details["non_gst"]["inter"] += d.base_amount
-			elif d.is_non_gst == 1 and state != d.gst_state:
-				inward_nil_exempt_details["non_gst"]["intra"] += d.base_amount
+			if d.place_of_supply:
+				if d.is_nil_exempt == 1 and state == d.place_of_supply.split("-")[1]:
+					inward_nil_exempt_details["gst"]["intra"] += d.base_amount
+				elif d.is_nil_exempt == 1 and state != d.place_of_supply.split("-")[1]:
+					inward_nil_exempt_details["gst"]["inter"] += d.base_amount
+				elif d.is_non_gst == 1 and state == d.place_of_supply.split("-")[1]:
+					inward_nil_exempt_details["non_gst"]["intra"] += d.base_amount
+				elif d.is_non_gst == 1 and state != d.place_of_supply.split("-")[1]:
+					inward_nil_exempt_details["non_gst"]["inter"] += d.base_amount
 
 		return inward_nil_exempt_details
 
diff --git a/erpnext/regional/doctype/gstr_3b_report/test_gstr_3b_report.py b/erpnext/regional/doctype/gstr_3b_report/test_gstr_3b_report.py
index de150f4..fef73d9 100644
--- a/erpnext/regional/doctype/gstr_3b_report/test_gstr_3b_report.py
+++ b/erpnext/regional/doctype/gstr_3b_report/test_gstr_3b_report.py
@@ -176,6 +176,9 @@
 			do_not_save=1
 		)
 
+	pi1.shipping_address = "_Test Supplier GST-1-Billing"
+	pi1.save()
+
 	pi1.submit()
 
 def make_suppliers():
@@ -218,6 +221,7 @@
 			"link_name": "_Test Registered Supplier"
 		})
 
+		address.is_shipping_address = 1
 		address.save()
 
 	if not frappe.db.exists('Address', '_Test Supplier GST-2-Billing'):
diff --git a/erpnext/setup/doctype/item_group/item_group.py b/erpnext/setup/doctype/item_group/item_group.py
index cab2116..33ab992 100644
--- a/erpnext/setup/doctype/item_group/item_group.py
+++ b/erpnext/setup/doctype/item_group/item_group.py
@@ -3,7 +3,6 @@
 
 from __future__ import unicode_literals
 import frappe
-import urllib
 import copy
 from frappe.utils import nowdate, cint, cstr
 from frappe.utils.nestedset import NestedSet
@@ -12,6 +11,7 @@
 from frappe.website.doctype.website_slideshow.website_slideshow import get_slideshow
 from erpnext.shopping_cart.product_info import set_product_info_for_website
 from erpnext.utilities.product import get_qty_in_stock
+from six.moves.urllib.parse import quote
 
 class ItemGroup(NestedSet, WebsiteGenerator):
 	nsm_parent_field = 'parent_item_group'
@@ -165,7 +165,7 @@
 	# add missing absolute link in files
 	# user may forget it during upload
 	if (context.get("website_image") or "").startswith("files/"):
-		context["website_image"] = "/" + urllib.quote(context["website_image"])
+		context["website_image"] = "/" + quote(context["website_image"])
 
 	context["show_availability_status"] = cint(frappe.db.get_single_value('Products Settings',
 		'show_availability_status'))
@@ -218,4 +218,4 @@
 			row.pop("name")
 			return row
 
-	return frappe._dict()
\ No newline at end of file
+	return frappe._dict()
diff --git a/erpnext/stock/doctype/delivery_note/delivery_note.js b/erpnext/stock/doctype/delivery_note/delivery_note.js
index 569a03a..a88bb2a 100644
--- a/erpnext/stock/doctype/delivery_note/delivery_note.js
+++ b/erpnext/stock/doctype/delivery_note/delivery_note.js
@@ -197,7 +197,7 @@
 			});
 
 			if(!from_sales_invoice) {
-				this.frm.add_custom_button(__('Invoice'), function() { me.make_sales_invoice() },
+				this.frm.add_custom_button(__('Sales Invoice'), function() { me.make_sales_invoice() },
 					__('Create'));
 			}
 		}
diff --git a/erpnext/stock/doctype/item/item.json b/erpnext/stock/doctype/item/item.json
index a142bb9..383fb61 100644
--- a/erpnext/stock/doctype/item/item.json
+++ b/erpnext/stock/doctype/item/item.json
@@ -468,7 +468,6 @@
    },
    {
     "default": "0",
-    "depends_on": "has_batch_no",
     "fieldname": "retain_sample",
     "fieldtype": "Check",
     "label": "Retain Sample"
diff --git a/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js b/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js
index 7da648a..8266055 100644
--- a/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js
+++ b/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js
@@ -190,7 +190,7 @@
 					frappe.set_route("Form", doc.doctype, doc.name);
 				}
 				else {
-					frappe.msgprint(__("Retention Stock Entry already created or Sample Quantity not provided"));
+					frappe.msgprint(__("Purchase Receipt doesn't have any Item for which Retain Sample is enabled."));
 				}
 			}
 		});
diff --git a/erpnext/templates/generators/item/item_details.html b/erpnext/templates/generators/item/item_details.html
index 8e56033..4cbecb0 100644
--- a/erpnext/templates/generators/item/item_details.html
+++ b/erpnext/templates/generators/item/item_details.html
@@ -9,9 +9,9 @@
 </p>
 <!-- description -->
 <div itemprop="description">
-{% if frappe.utils.strip_html(doc.web_long_description) %}
+{% if frappe.utils.strip_html(doc.web_long_description or '') %}
 	{{ doc.web_long_description | safe }}
-{% elif frappe.utils.strip_html(doc.description)  %}
+{% elif frappe.utils.strip_html(doc.description or '')  %}
 	{{ doc.description | safe }}
 {% else %}
 	{{ _("No description given") }}
diff --git a/erpnext/tests/test_search.py b/erpnext/tests/test_search.py
index 8a93b6a..b9665db 100644
--- a/erpnext/tests/test_search.py
+++ b/erpnext/tests/test_search.py
@@ -7,7 +7,7 @@
 	#Search for the word "cond", part of the word "conduire" (Lead) in french.
 	def test_contact_search_in_foreign_language(self):
 		frappe.local.lang = 'fr'
-		output = filter_dynamic_link_doctypes("DocType", "cond", "name", 0, 20, {'fieldtype': 'HTML', 'fieldname': 'contact_html'})
+		output = filter_dynamic_link_doctypes("DocType", "prospect", "name", 0, 20, {'fieldtype': 'HTML', 'fieldname': 'contact_html'})
 
 		result = [['found' for x in y if x=="Lead"] for y in output]
 		self.assertTrue(['found'] in result)
diff --git a/erpnext/translations/af.csv b/erpnext/translations/af.csv
index a8a6080..f840c50 100644
--- a/erpnext/translations/af.csv
+++ b/erpnext/translations/af.csv
@@ -168,7 +168,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py,Accountant,rekenmeester
 apps/erpnext/erpnext/stock/report/item_price_stock/item_price_stock.py,Selling Price List,Verkooppryslys
 DocType: Patient,Tobacco Current Use,Tabak huidige gebruik
-apps/erpnext/erpnext/stock/report/item_price_stock/item_price_stock.py,Selling Rate,Verkoopprys
+apps/erpnext/erpnext/selling/report/customer_wise_item_price/customer_wise_item_price.py,Selling Rate,Verkoopprys
 apps/erpnext/erpnext/erpnext_integrations/doctype/plaid_settings/plaid_settings.js,Please save your document before adding a new account,Stoor u dokument voordat u &#39;n nuwe rekening byvoeg
 DocType: Cost Center,Stock User,Voorraad gebruiker
 DocType: Soil Analysis,(Ca+Mg)/K,(Ca + Mg) / K
@@ -205,7 +205,6 @@
 DocType: Packed Item,Parent Detail docname,Ouer Detail docname
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py,"Reference: {0}, Item Code: {1} and Customer: {2}","Verwysing: {0}, Item Kode: {1} en Kliënt: {2}"
 apps/erpnext/erpnext/accounts/report/consolidated_financial_statement/consolidated_financial_statement.py,{0} {1} is not present in the parent company,{0} {1} is nie in die ouer maatskappy teenwoordig nie
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Supplier &gt; Supplier Type,Verskaffer&gt; Verskaffer tipe
 apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py,Trial Period End Date Cannot be before Trial Period Start Date,Proeftydperk Einddatum kan nie voor die begin datum van die proeftydperk wees nie
 apps/erpnext/erpnext/utilities/user_progress.py,Kg,kg
 DocType: Tax Withholding Category,Tax Withholding Category,Belasting Weerhouding Kategorie
@@ -319,6 +318,7 @@
 DocType: Quality Procedure Table,Responsible Individual,Verantwoordelike individu
 DocType: Naming Series,Prefix,voorvoegsel
 apps/erpnext/erpnext/hr/notification/training_scheduled/training_scheduled.html,Event Location,Gebeurtenis Plek
+apps/erpnext/erpnext/selling/report/customer_wise_item_price/customer_wise_item_price.py,Available Stock,Beskikbaar voorraad
 DocType: Asset Settings,Asset Settings,Bate instellings
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py,Consumable,verbruikbare
 DocType: Student,B-,B-
@@ -351,6 +351,7 @@
 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 \
 				Serial No.",Kan nie lewering volgens Serienommer verseker nie omdat \ Item {0} bygevoeg word met en sonder Verseker lewering deur \ Serial No.
+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/accounts/doctype/sales_invoice/sales_invoice.py,At least one mode of payment is required for POS invoice.,Ten minste een manier van betaling is nodig vir POS faktuur.
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py,Batch no is required for batched item {0},Joernale nr. Is nodig vir &#39;n bondeltjie {0}
 DocType: Bank Statement Transaction Invoice Item,Bank Statement Transaction Invoice Item,Bankstaat Transaksie Faktuur Item
@@ -874,7 +875,6 @@
 DocType: Vital Signs,Blood Pressure (systolic),Bloeddruk (sistolies)
 apps/erpnext/erpnext/controllers/buying_controller.py,{0} {1} is {2},{0} {1} is {2}
 DocType: Item Price,Valid Upto,Geldige Upto
-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: Training Event,Workshop,werkswinkel
 DocType: Supplier Scorecard Scoring Standing,Warn Purchase Orders,Waarsku aankoop bestellings
 apps/erpnext/erpnext/utilities/user_progress.py,List a few of your customers. They could be organizations or individuals.,Lys &#39;n paar van jou kliënte. Hulle kan organisasies of individue wees.
@@ -1658,7 +1658,6 @@
 DocType: Item Barcode,Item Barcode,Item Barcode
 DocType: Delivery Trip,In Transit,Onderweg
 DocType: Woocommerce Settings,Endpoints,eindpunte
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Item Code &gt; Item Group &gt; Brand,Itemkode&gt; Itemgroep&gt; Merk
 DocType: Shopping Cart Settings,Show Configure Button,Wys die instelknoppie
 DocType: Quality Inspection Reading,Reading 6,Lees 6
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js,Cannot {0} {1} {2} without any negative outstanding invoice,Kan nie {0} {1} {2} sonder enige negatiewe uitstaande faktuur
@@ -2018,6 +2017,7 @@
 DocType: Cheque Print Template,Payer Settings,Betaler instellings
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js,No pending Material Requests found to link for the given items.,Geen hangende materiaal versoeke gevind om te skakel vir die gegewe items.
 apps/erpnext/erpnext/public/js/utils/party.js,Select company first,Kies maatskappy eerste
+apps/erpnext/erpnext/accounts/general_ledger.py,Account: <b>{0}</b> is capital Work in progress and can not be updated by Journal Entry,Rekening: <b>{0}</b> is kapitaal Werk aan die gang en kan nie deur die joernaalinskrywing bygewerk word nie
 apps/erpnext/erpnext/education/doctype/quiz/quiz.py,Compare List function takes on list arguments,Vergelyk lysfunksie neem lysargumente aan
 DocType: Item Attribute Value,"This will be appended to the Item Code of the variant. For example, if your abbreviation is ""SM"", and the item code is ""T-SHIRT"", the item code of the variant will be ""T-SHIRT-SM""","Dit sal aangeheg word aan die itemkode van die variant. As u afkorting byvoorbeeld &quot;SM&quot; is en die itemkode &quot;T-SHIRT&quot; is, sal die itemkode van die variant &quot;T-SHIRT-SM&quot; wees."
 DocType: Salary Slip,Net Pay (in words) will be visible once you save the Salary Slip.,Netto betaal (in woorde) sal sigbaar wees sodra jy die Salary Slip stoor.
@@ -2202,6 +2202,7 @@
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js,Item 2,Item 2
 DocType: Pricing Rule,Validate Applied Rule,Valideer toegepaste reël
 DocType: QuickBooks Migrator,Authorization Endpoint,Magtiging Eindpunt
+DocType: Employee Onboarding,Notify users by email,Stel gebruikers per e-pos in kennis
 DocType: Travel Request,International,internasionale
 DocType: Training Event,Training Event,Opleidingsgebeurtenis
 DocType: Item,Auto re-order,Outo herbestel
@@ -2812,7 +2813,6 @@
 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
-DocType: Contract,Inactive,onaktiewe
 apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.js,This will submit Salary Slips and create accrual Journal Entry. Do you want to proceed?,Dit sal salarisstrokies indien en toevallingsjoernaalinskrywing skep. Wil jy voortgaan?
 DocType: Purchase Invoice,Total Net Weight,Totale netto gewig
 DocType: Purchase Order,Order Confirmation No,Bestelling Bevestiging nr
@@ -3088,7 +3088,6 @@
 apps/erpnext/erpnext/accounts/party.py,Billing currency must be equal to either default company's currency or party account currency,Faktureer geldeenheid moet gelyk wees aan óf die standaardmaatskappy se geldeenheid- of partyrekeninggeldeenheid
 DocType: Packing Slip,Indicates that the package is a part of this delivery (Only Draft),Dui aan dat die pakket deel van hierdie aflewering is (Slegs Konsep)
 apps/erpnext/erpnext/accounts/report/customer_ledger_summary/customer_ledger_summary.py,Closing Balance,Sluitingssaldo
-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}
 DocType: Soil Texture,Loam,leem
 apps/erpnext/erpnext/controllers/accounts_controller.py,Row {0}: Due Date cannot be before posting date,Ry {0}: Due Date kan nie voor die posdatum wees nie
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py,Quantity for Item {0} must be less than {1},Hoeveelheid vir item {0} moet minder wees as {1}
@@ -3611,7 +3610,6 @@
 DocType: Stock Settings,Raise Material Request when stock reaches re-order level,Verhoog Materiaal Versoek wanneer voorraad bereik herbestellingsvlak bereik
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py,Full-time,Voltyds
 DocType: Payroll Entry,Employees,Werknemers
-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: Question,Single Correct Answer,Enkel korrekte antwoord
 DocType: Employee,Contact Details,Kontakbesonderhede
 DocType: C-Form,Received Date,Ontvang Datum
@@ -4222,6 +4220,7 @@
 DocType: Pricing Rule,Price or Product Discount,Prys of produkkorting
 apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.py,For row {0}: Enter planned qty,Vir ry {0}: Gee beplande hoeveelheid
 DocType: Account,Income Account,Inkomsterekening
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Customer &gt; Customer Group &gt; Territory,Kliënt&gt; Kliëntegroep&gt; Gebied
 DocType: Payment Request,Amount in customer's currency,Bedrag in kliënt se geldeenheid
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js,Delivery,aflewering
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.py,Assigning Structures...,Strukture ken ...
@@ -4271,7 +4270,6 @@
 DocType: HR Settings,Check Vacancies On Job Offer Creation,Kyk na vakatures met die skep van werksaanbiedinge
 apps/erpnext/erpnext/utilities/user_progress.py,Go to Letterheads,Gaan na Letterheads
 DocType: Subscription,Cancel At End Of Period,Kanselleer aan die einde van die tydperk
-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/hr/doctype/employee_promotion/employee_promotion.js,Property already added,Eiendom is reeds bygevoeg
 DocType: Item Supplier,Item Supplier,Item Verskaffer
 apps/erpnext/erpnext/public/js/controllers/transaction.js,Please enter Item Code to get batch no,Voer asseblief die kode in om groepsnommer te kry
@@ -4556,6 +4554,7 @@
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.js,Warning: Material Requested Qty is less than Minimum Order Qty,Waarskuwing: Materiaal Gevraagde hoeveelheid is minder as minimum bestelhoeveelheid
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py,Account {0} is frozen,Rekening {0} is gevries
 DocType: Quiz Question,Quiz Question,Vraestelvraag
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Supplier &gt; Supplier Type,Verskaffer&gt; Verskaffer tipe
 DocType: Company,Legal Entity / Subsidiary with a separate Chart of Accounts belonging to the Organization.,Regspersoon / Filiaal met &#39;n afsonderlike Kaart van Rekeninge wat aan die Organisasie behoort.
 DocType: Payment Request,Mute Email,Demp e-pos
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py,"Food, Beverage & Tobacco","Kos, drank en tabak"
@@ -5066,7 +5065,6 @@
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py,Delivery warehouse required for stock item {0},Afleweringspakhuis benodig vir voorraaditem {0}
 DocType: Packing Slip,The gross weight of the package. Usually net weight + packaging material weight. (for print),Die bruto gewig van die pakket. Gewoonlik netto gewig + verpakkingsmateriaal gewig. (vir druk)
 DocType: Assessment Plan,Program,program
-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: Accounts Settings,Users with this role are allowed to set frozen accounts and create / modify accounting entries against frozen accounts,Gebruikers met hierdie rol word toegelaat om gevriesde rekeninge te stel en rekeningkundige inskrywings teen bevrore rekeninge te skep / te verander
 ,Project Billing Summary,Projekrekeningopsomming
 DocType: Vital Signs,Cuts,sny
@@ -5315,6 +5313,7 @@
 apps/erpnext/erpnext/quality_management/doctype/quality_review/quality_review_list.js,No Action,Geen aksie
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js,Valuation type charges can not marked as Inclusive,Waardasietoelae kan nie as Inklusief gemerk word nie
 DocType: POS Profile,Update Stock,Werk Voorraad
+apps/erpnext/erpnext/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/stock/doctype/packing_slip/packing_slip.js,Different UOM for items will lead to incorrect (Total) Net Weight value. Make sure that Net Weight of each item is in the same UOM.,Verskillende UOM vir items sal lei tot foutiewe (Totale) Netto Gewigwaarde. Maak seker dat die netto gewig van elke item in dieselfde UOM is.
 DocType: Certification Application,Payment Details,Betaling besonderhede
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py,BOM Rate,BOM-koers
@@ -5418,6 +5417,8 @@
 apps/erpnext/erpnext/accounts/doctype/monthly_distribution/monthly_distribution.py,Percentage Allocation should be equal to 100%,Persentasie toewysing moet gelyk wees aan 100%
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js,Please select Posting Date before selecting Party,Kies asseblief Posdatum voordat jy Party kies
 apps/erpnext/erpnext/config/accounting.py,Payment Terms based on conditions,Betalingsvoorwaardes gebaseer op voorwaardes
+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: Program Enrollment,School House,Skoolhuis
 DocType: Serial No,Out of AMC,Uit AMC
 DocType: Opportunity,Opportunity Amount,Geleentheid Bedrag
@@ -5619,6 +5620,7 @@
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py,Order/Quot %,Bestelling / Kwotasie%
 apps/erpnext/erpnext/config/healthcare.py,Record Patient Vitals,Teken Pasiënt Vitale op
 DocType: Fee Schedule,Institution,instelling
+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}
 DocType: Asset,Partially Depreciated,Gedeeltelik afgeskryf
 DocType: Issue,Opening Time,Openingstyd
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py,From and To dates required,Van en tot datums benodig
@@ -5835,6 +5837,7 @@
 DocType: Quality Procedure Process,Link existing Quality Procedure.,Koppel die bestaande kwaliteitsprosedure.
 apps/erpnext/erpnext/config/hr.py,Loans,lenings
 DocType: Healthcare Service Unit,Healthcare Service Unit,Gesondheidsorg Diens Eenheid
+,Customer-wise Item Price,Kliëntige artikelprys
 apps/erpnext/erpnext/public/js/financial_statements.js,Cash Flow Statement,Kontantvloeistaat
 apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.py,No material request created,Geen wesenlike versoek geskep nie
 apps/erpnext/erpnext/hr/doctype/loan_application/loan_application.py,Loan Amount cannot exceed Maximum Loan Amount of {0},Lening Bedrag kan nie Maksimum Lening Bedrag van {0}
@@ -6096,6 +6099,7 @@
 apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py,Opening Value,Openingswaarde
 DocType: Salary Component,Formula,formule
 apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py,Serial #,Serie #
+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: Material Request Plan Item,Required Quantity,Vereiste hoeveelheid
 DocType: Lab Test Template,Lab Test Template,Lab Test Template
 apps/erpnext/erpnext/accounts/doctype/accounting_period/accounting_period.py,Accounting Period overlaps with {0},Rekeningkundige tydperk oorvleuel met {0}
@@ -6345,7 +6349,6 @@
 DocType: Request for Quotation Item,Project Name,Projek Naam
 apps/erpnext/erpnext/regional/italy/utils.py,Please set the Customer Address,Stel die kliënteadres in
 DocType: Customer,Mention if non-standard receivable account,Noem as nie-standaard ontvangbare rekening
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Customer &gt; Customer Group &gt; Territory,Kliënt&gt; Kliëntegroep&gt; Gebied
 DocType: Bank,Plaid Access Token,Toegangsreëlmatjie
 apps/erpnext/erpnext/hr/doctype/employee_benefit_application/employee_benefit_application.py,Please add the remaining benefits {0} to any of the existing component,Voeg asseblief die oorblywende voordele {0} by enige van die bestaande komponente by
 DocType: Journal Entry Account,If Income or Expense,As inkomste of uitgawes
@@ -6606,8 +6609,6 @@
 apps/erpnext/erpnext/buying/utils.py,Please enter quantity for Item {0},Gee asseblief die hoeveelheid vir item {0}
 DocType: Quality Procedure,Processes,prosesse
 DocType: Shift Type,First Check-in and Last Check-out,Eerste inklok en laaste uitklok
-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/regional/report/hsn_wise_summary_of_outward_supplies/hsn_wise_summary_of_outward_supplies.py,Total Taxable Amount,Totale Belasbare Bedrag
 DocType: Employee External Work History,Employee External Work History,Werknemer Eksterne Werk Geskiedenis
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.py,Job card {0} created,Werkkaart {0} geskep
@@ -6643,6 +6644,7 @@
 apps/erpnext/erpnext/accounts/doctype/payment_terms_template/payment_terms_template.py,Combined invoice portion must equal 100%,Gekombineerde faktuur gedeelte moet gelyk wees aan 100%
 DocType: Item Default,Default Expense Account,Verstek uitgawes rekening
 DocType: GST Account,CGST Account,CGST rekening
+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/education/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py,Student Email ID,Student e-pos ID
 DocType: Employee,Notice (days),Kennisgewing (dae)
 DocType: POS Closing Voucher Invoices,POS Closing Voucher Invoices,POS sluitingsbewysfakture
@@ -7281,6 +7283,7 @@
 DocType: Maintenance Visit,Maintenance Date,Onderhoud Datum
 DocType: Purchase Invoice Item,Rejected Serial No,Afgekeurde reeksnommer
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py,Year start date or end date is overlapping with {0}. To avoid please set company,"Jaar begin datum of einddatum oorvleuel met {0}. Om te voorkom, stel asseblief die maatskappy 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/selling/doctype/customer/customer.py,Please mention the Lead Name in Lead {0},Vermeld asseblief die Lood Naam in Lood {0}
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py,Start date should be less than end date for Item {0},Begindatum moet minder wees as einddatum vir item {0}
 DocType: Shift Type,Auto Attendance Settings,Instellings vir outo-bywoning
diff --git a/erpnext/translations/am.csv b/erpnext/translations/am.csv
index b1ed0a9..bf65538 100644
--- a/erpnext/translations/am.csv
+++ b/erpnext/translations/am.csv
@@ -168,7 +168,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py,Accountant,ሒሳብ ሠራተኛ
 apps/erpnext/erpnext/stock/report/item_price_stock/item_price_stock.py,Selling Price List,የዋጋ ዝርዝር ዋጋ
 DocType: Patient,Tobacco Current Use,የትምባሆ ወቅታዊ አጠቃቀም
-apps/erpnext/erpnext/stock/report/item_price_stock/item_price_stock.py,Selling Rate,የሽያጭ ፍጥነት
+apps/erpnext/erpnext/selling/report/customer_wise_item_price/customer_wise_item_price.py,Selling Rate,የሽያጭ ፍጥነት
 apps/erpnext/erpnext/erpnext_integrations/doctype/plaid_settings/plaid_settings.js,Please save your document before adding a new account,አዲስ መለያ ከማከልዎ በፊት እባክዎ ሰነድዎን ያስቀምጡ።
 DocType: Cost Center,Stock User,የአክሲዮን ተጠቃሚ
 DocType: Soil Analysis,(Ca+Mg)/K,(ካም + ኤምግ) / ኬ
@@ -205,7 +205,6 @@
 DocType: Packed Item,Parent Detail docname,የወላጅ ዝርዝር DOCNAME
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py,"Reference: {0}, Item Code: {1} and Customer: {2}","ማጣቀሻ: {0}, የእቃ ኮድ: {1} እና የደንበኞች: {2}"
 apps/erpnext/erpnext/accounts/report/consolidated_financial_statement/consolidated_financial_statement.py,{0} {1} is not present in the parent company,{0} {1} በወላጅ ኩባንያ ውስጥ የለም
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Supplier &gt; Supplier Type,አቅራቢ&gt; የአቅራቢ ዓይነት።
 apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py,Trial Period End Date Cannot be before Trial Period Start Date,የሙከራ ጊዜ ክፍለጊዜ ቀን ከመሞቱ በፊት የሚጀምርበት ቀን
 apps/erpnext/erpnext/utilities/user_progress.py,Kg,ኪግ
 DocType: Tax Withholding Category,Tax Withholding Category,የግብር ተቀናሽ ምድብ
@@ -319,6 +318,7 @@
 DocType: Quality Procedure Table,Responsible Individual,ኃላፊነት የተሰጠው ግለሰብ።
 DocType: Naming Series,Prefix,ባዕድ መነሻ
 apps/erpnext/erpnext/hr/notification/training_scheduled/training_scheduled.html,Event Location,የክስተት ቦታ
+apps/erpnext/erpnext/selling/report/customer_wise_item_price/customer_wise_item_price.py,Available Stock,የሚገኝ ክምችት
 DocType: Asset Settings,Asset Settings,የቋሚ ቅንጅቶች
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py,Consumable,Consumable
 DocType: Student,B-,B-
@@ -351,6 +351,7 @@
 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 \
 				Serial No.",በ Serial No ላይ መላክን ማረጋገጥ አይቻልም በ \ item {0} በ እና በ &quot;&quot; ያለመድረሱ ማረጋገጫ በ \ Serial No.
+apps/erpnext/erpnext/education/doctype/instructor/instructor.py,Please setup Instructor Naming System in Education &gt; Education Settings,እባክዎ በትምህርቱ&gt; የትምህርት ቅንብሮች ውስጥ አስተማሪ ስም ማጎሪያ ስርዓት ያዋቅሩ።
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py,At least one mode of payment is required for POS invoice.,የክፍያ ቢያንስ አንድ ሁነታ POS መጠየቂያ ያስፈልጋል.
 DocType: Bank Statement Transaction Invoice Item,Bank Statement Transaction Invoice Item,የባንክ መግለጫ የግብይት ደረሰኝ አይነት
 DocType: Salary Detail,Tax on flexible benefit,በተመጣጣኝ ጥቅማ ጥቅም ላይ ግብር ይቀጣል
@@ -1655,7 +1656,6 @@
 DocType: Item Barcode,Item Barcode,የእሴት ባር ኮድ
 DocType: Delivery Trip,In Transit,በጉዞ ላይ
 DocType: Woocommerce Settings,Endpoints,መቁጠሪያዎች
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Item Code &gt; Item Group &gt; Brand,የንጥል ኮድ&gt; የንጥል ቡድን&gt; የምርት ስም።
 DocType: Shopping Cart Settings,Show Configure Button,አዋቅር አዘራርን አሳይ።
 DocType: Quality Inspection Reading,Reading 6,6 ማንበብ
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js,Cannot {0} {1} {2} without any negative outstanding invoice,አይደለም {0} {1} {2} ያለ ማንኛውም አሉታዊ ግሩም መጠየቂያ ማድረግ ይችላል
@@ -2015,6 +2015,7 @@
 DocType: Cheque Print Template,Payer Settings,ከፋዩ ቅንብሮች
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js,No pending Material Requests found to link for the given items.,ለተጠቀሱት ንጥሎች አገናኝ ለማድረግ በመጠባበቅ ላይ ያሉ የይዘት ጥያቄዎች አይገኙም.
 apps/erpnext/erpnext/public/js/utils/party.js,Select company first,ኩባንያውን መጀመሪያ ይምረጡ
+apps/erpnext/erpnext/accounts/general_ledger.py,Account: <b>{0}</b> is capital Work in progress and can not be updated by Journal Entry,መለያ <b>{0}</b> በሂደት ላይ ያለ የካፒታል ስራ ነው እናም በጆርናል ግቤት ሊዘመን አይችልም።
 apps/erpnext/erpnext/education/doctype/quiz/quiz.py,Compare List function takes on list arguments,የዝርዝር ተግባሩን በዝርዝር ነጋሪ እሴቶች ላይ ይወስዳል።
 DocType: Item Attribute Value,"This will be appended to the Item Code of the variant. For example, if your abbreviation is ""SM"", and the item code is ""T-SHIRT"", the item code of the variant will be ""T-SHIRT-SM""","ይህ ተለዋጭ ያለውን ንጥል ኮድ ተጨምሯል ይሆናል. የእርስዎ በምህፃረ ቃል &quot;SM&quot; ነው; ለምሳሌ ያህል, ንጥል ኮድ &quot;ቲሸርት&quot;, &quot;ቲሸርት-SM&quot; ይሆናል ተለዋጭ ያለውን ንጥል ኮድ ነው"
 DocType: Salary Slip,Net Pay (in words) will be visible once you save the Salary Slip.,የ የቀጣሪ ለማዳን አንዴ (ቃላት) የተጣራ ክፍያ የሚታይ ይሆናል.
@@ -2199,6 +2200,7 @@
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js,Item 2,ንጥል 2
 DocType: Pricing Rule,Validate Applied Rule,ትክክለኛ የተተገበረ ደንብ።
 DocType: QuickBooks Migrator,Authorization Endpoint,የማረጋገጫ የመጨረሻ ነጥብ
+DocType: Employee Onboarding,Notify users by email,ተጠቃሚዎችን በኢሜይል ያሳውቁ።
 DocType: Travel Request,International,ዓለም አቀፍ
 DocType: Training Event,Training Event,ስልጠና ክስተት
 DocType: Item,Auto re-order,ራስ-ዳግም-ትዕዛዝ
@@ -2809,7 +2811,6 @@
 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,ተመሳሳይ ስም ያለው ደንበኛ አስቀድሞ አለ
-DocType: Contract,Inactive,ገባሪ አይደለም
 apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.js,This will submit Salary Slips and create accrual Journal Entry. Do you want to proceed?,ይህ የደመወዝ ወረቀቶችን ያቀርባል እና የአስፈፃሚ ጆርጅ ኢንተርስን ይፍጠሩ. መቀጠል ይፈልጋሉ?
 DocType: Purchase Invoice,Total Net Weight,ጠቅላላ የተጣራ ክብደት
 DocType: Purchase Order,Order Confirmation No,ትዕዛዝ ማረጋገጫ ቁጥር
@@ -3085,7 +3086,6 @@
 apps/erpnext/erpnext/accounts/party.py,Billing currency must be equal to either default company's currency or party account currency,የማስከፈያ ምንዛሬ ከሁለቱም የኩባንያዎች ምንዛሬ ወይም የፓርቲው የመገበያያ ገንዘብ ጋር እኩል መሆን አለበት
 DocType: Packing Slip,Indicates that the package is a part of this delivery (Only Draft),የጥቅል ይህን የመላኪያ (ብቻ ረቂቅ) አንድ ክፍል እንደሆነ ይጠቁማል
 apps/erpnext/erpnext/accounts/report/customer_ledger_summary/customer_ledger_summary.py,Closing Balance,ሚዛን መዝጋት።
-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: Soil Texture,Loam,ፈገግታ
 apps/erpnext/erpnext/controllers/accounts_controller.py,Row {0}: Due Date cannot be before posting date,ረድፍ {0}: የሚላክበት ቀኑ ከተለቀቀበት ቀን በፊት ሊሆን አይችልም
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py,Quantity for Item {0} must be less than {1},ንጥል ለ ብዛት {0} ያነሰ መሆን አለበት {1}
@@ -3607,7 +3607,6 @@
 DocType: Stock Settings,Raise Material Request when stock reaches re-order level,የአክሲዮን ዳግም-ትዕዛዝ ደረጃ ላይ ሲደርስ የቁሳዊ ጥያቄ ላይ አንሥታችሁ
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py,Full-time,ሙሉ ሰአት
 DocType: Payroll Entry,Employees,ተቀጣሪዎች
-apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py,Please setup numbering series for Attendance via Setup &gt; Numbering Series,እባክዎን ለተማሪ ተገኝተው በማዋቀር&gt; በቁጥር ተከታታይ በኩል ያዘጋጁ።
 DocType: Question,Single Correct Answer,ነጠላ ትክክለኛ መልስ።
 DocType: Employee,Contact Details,የእውቅያ ዝርዝሮች
 DocType: C-Form,Received Date,የተቀበልከው ቀን
@@ -4216,6 +4215,7 @@
 DocType: Pricing Rule,Price or Product Discount,ዋጋ ወይም የምርት ቅናሽ።
 apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.py,For row {0}: Enter planned qty,ለረድፍ {0}: የታቀዱ qty አስገባ
 DocType: Account,Income Account,የገቢ መለያ
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Customer &gt; Customer Group &gt; Territory,ደንበኛ&gt; የደንበኞች ቡድን&gt; ክልል።
 DocType: Payment Request,Amount in customer's currency,ደንበኛ ምንዛሬ መጠን
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js,Delivery,ርክክብ
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.py,Assigning Structures...,መዋቅሮችን በመመደብ ላይ ...
@@ -4265,7 +4265,6 @@
 DocType: HR Settings,Check Vacancies On Job Offer Creation,በሥራ አቅርቦት ፈጠራ ላይ ክፍት ቦታዎችን ይፈትሹ ፡፡
 apps/erpnext/erpnext/utilities/user_progress.py,Go to Letterheads,ወደ ፊደል ወረቀቶች ሂድ
 DocType: Subscription,Cancel At End Of Period,በማለቂያ ጊዜ ሰርዝ
-apps/erpnext/erpnext/education/doctype/instructor/instructor.py,Please setup Instructor Naming System in Education &gt; Education Settings,እባክዎ በትምህርቱ&gt; የትምህርት ቅንብሮች ውስጥ አስተማሪ ስም ማጎሪያ ስርዓት ያዋቅሩ።
 apps/erpnext/erpnext/hr/doctype/employee_promotion/employee_promotion.js,Property already added,ንብረቱ ቀድሞውኑ ታክሏል
 DocType: Item Supplier,Item Supplier,ንጥል አቅራቢ
 apps/erpnext/erpnext/public/js/controllers/transaction.js,Please enter Item Code to get batch no,ባች ምንም ለማግኘት ንጥል ኮድ ያስገቡ
@@ -4550,6 +4549,7 @@
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.js,Warning: Material Requested Qty is less than Minimum Order Qty,ማስጠንቀቂያ: ብዛት ጠይቀዋል ሐሳብ ያለው አነስተኛ ትዕዛዝ ብዛት ያነሰ ነው
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py,Account {0} is frozen,መለያ {0} የታሰሩ ነው
 DocType: Quiz Question,Quiz Question,ጥያቄ ፡፡
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Supplier &gt; Supplier Type,አቅራቢ&gt; የአቅራቢ ዓይነት።
 DocType: Company,Legal Entity / Subsidiary with a separate Chart of Accounts belonging to the Organization.,ወደ ድርጅት ንብረት መለያዎች የተለየ ሰንጠረዥ ጋር ሕጋዊ አካሌ / ንዑስ.
 DocType: Payment Request,Mute Email,ድምጸ-ኢሜይል
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py,"Food, Beverage & Tobacco","የምግብ, መጠጥ እና ትንባሆ"
@@ -5060,7 +5060,6 @@
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py,Delivery warehouse required for stock item {0},የመላኪያ መጋዘን የአክሲዮን ንጥል ያስፈልጋል {0}
 DocType: Packing Slip,The gross weight of the package. Usually net weight + packaging material weight. (for print),የጥቅል ያለው አጠቃላይ ክብደት. አብዛኛውን ጊዜ የተጣራ ክብደት + ጥቅል ቁሳዊ ክብደት. (የህትመት ለ)
 DocType: Assessment Plan,Program,ፕሮግራም
-apps/erpnext/erpnext/hr/doctype/employee/employee.py,Please setup Employee Naming System in Human Resource &gt; HR Settings,በሰብአዊ ሀብት&gt; የሰው ሠራሽ ቅንጅቶች ውስጥ የሰራተኛ መለያ ስም መስጫ ስርዓትን ያዋቅሩ ፡፡
 DocType: Accounts Settings,Users with this role are allowed to set frozen accounts and create / modify accounting entries against frozen accounts,ይህን ሚና ያላቸው ተጠቃሚዎች የታሰሩ መለያዎች ላይ የሂሳብ ግቤቶች የታሰሩ መለያዎች ማዘጋጀት እና ለመፍጠር ቀይር / የተፈቀደላቸው
 ,Project Billing Summary,የፕሮጀክት የክፍያ ማጠቃለያ።
 DocType: Vital Signs,Cuts,ይቁረጡ
@@ -5411,6 +5410,8 @@
 apps/erpnext/erpnext/accounts/doctype/monthly_distribution/monthly_distribution.py,Percentage Allocation should be equal to 100%,መቶኛ ምደባዎች 100% ጋር እኩል መሆን አለበት
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js,Please select Posting Date before selecting Party,ፓርቲ በመምረጥ በፊት መለጠፍ ቀን ይምረጡ
 apps/erpnext/erpnext/config/accounting.py,Payment Terms based on conditions,በሁኔታዎች ላይ በመመስረት የክፍያ ውል
+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: Program Enrollment,School House,ትምህርት ቤት
 DocType: Serial No,Out of AMC,AMC ውጪ
 DocType: Opportunity,Opportunity Amount,እድል ብዛት
@@ -5612,6 +5613,7 @@
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py,Order/Quot %,ትዕዛዝ / quot%
 apps/erpnext/erpnext/config/healthcare.py,Record Patient Vitals,ታካሚን ታሳቢዎችን ይመዝግቡ
 DocType: Fee Schedule,Institution,ተቋም
+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: Asset,Partially Depreciated,በከፊል የቀነሰበት
 DocType: Issue,Opening Time,የመክፈቻ ሰዓት
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py,From and To dates required,እንዲሁም ያስፈልጋል ቀናት ወደ
@@ -5828,6 +5830,7 @@
 DocType: Quality Procedure Process,Link existing Quality Procedure.,አሁን ያለውን የጥራት አሠራር ያገናኙ ፡፡
 apps/erpnext/erpnext/config/hr.py,Loans,ብድሮች
 DocType: Healthcare Service Unit,Healthcare Service Unit,የጤና አገልግሎት አገልግሎት ክፍል
+,Customer-wise Item Price,በደንበኛ-ጥበበኛ ንጥል ዋጋ።
 apps/erpnext/erpnext/public/js/financial_statements.js,Cash Flow Statement,የገንዘብ ፍሰት መግለጫ
 apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.py,No material request created,ምንም የተፈጥሮ ጥያቄ አልተፈጠረም
 apps/erpnext/erpnext/hr/doctype/loan_application/loan_application.py,Loan Amount cannot exceed Maximum Loan Amount of {0},የብድር መጠን ከፍተኛ የብድር መጠን መብለጥ አይችልም {0}
@@ -6089,6 +6092,7 @@
 apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py,Opening Value,በመክፈት ላይ እሴት
 DocType: Salary Component,Formula,ፎርሙላ
 apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py,Serial #,ተከታታይ #
+apps/erpnext/erpnext/hr/doctype/employee/employee.py,Please setup Employee Naming System in Human Resource &gt; HR Settings,በሰብአዊ ሀብት&gt; የሰው ሠራሽ ቅንብሮች ውስጥ የሰራተኛ መለያ ስም መስሪያ ስርዓት ያዋቅሩ ፡፡
 DocType: Material Request Plan Item,Required Quantity,የሚፈለግ ብዛት።
 DocType: Lab Test Template,Lab Test Template,የሙከራ መለኪያ አብነት
 apps/erpnext/erpnext/accounts/doctype/accounting_period/accounting_period.py,Accounting Period overlaps with {0},የሂሳብ ጊዜ ከ {0} ጋር ይደራረባል
@@ -6338,7 +6342,6 @@
 DocType: Request for Quotation Item,Project Name,የፕሮጀክት ስም
 apps/erpnext/erpnext/regional/italy/utils.py,Please set the Customer Address,እባክዎ የደንበኞች አድራሻውን ያዘጋጁ።
 DocType: Customer,Mention if non-standard receivable account,ጥቀስ መደበኛ ያልሆነ እንደተቀበለ መለያ ከሆነ
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Customer &gt; Customer Group &gt; Territory,ደንበኛ&gt; የደንበኞች ቡድን&gt; ክልል።
 DocType: Bank,Plaid Access Token,ባዶ የመዳረሻ ማስመሰያ
 apps/erpnext/erpnext/hr/doctype/employee_benefit_application/employee_benefit_application.py,Please add the remaining benefits {0} to any of the existing component,እባክዎ የቀረውን ጥቅማጥቅሞችን {0} ለአሉት አሁን ካለው ክፍል ላይ ያክሉ
 DocType: Journal Entry Account,If Income or Expense,ገቢ ወይም የወጪ ከሆነ
@@ -6601,8 +6604,6 @@
 apps/erpnext/erpnext/buying/utils.py,Please enter quantity for Item {0},ንጥል ለ ብዛት ያስገቡ {0}
 DocType: Quality Procedure,Processes,ሂደቶች
 DocType: Shift Type,First Check-in and Last Check-out,የመጀመሪያ ተመዝግበህ ግባ እና የመጨረሻ ተመዝግበህ ውጣ ፡፡
-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/regional/report/hsn_wise_summary_of_outward_supplies/hsn_wise_summary_of_outward_supplies.py,Total Taxable Amount,ጠቅላላ የተቆረጠለት መጠን
 DocType: Employee External Work History,Employee External Work History,የተቀጣሪ ውጫዊ የስራ ታሪክ
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.py,Job card {0} created,የስራ ካርድ {0} ተፈጥሯል
@@ -6638,6 +6639,7 @@
 apps/erpnext/erpnext/accounts/doctype/payment_terms_template/payment_terms_template.py,Combined invoice portion must equal 100%,የተዋሃደ የክፍያ መጠየቂያ ክፍል 100%
 DocType: Item Default,Default Expense Account,ነባሪ የወጪ መለያ
 DocType: GST Account,CGST Account,የ CGST መለያ
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Item Code &gt; Item Group &gt; Brand,የንጥል ኮድ&gt; የንጥል ቡድን&gt; የምርት ስም።
 apps/erpnext/erpnext/education/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py,Student Email ID,የተማሪ የኢሜይል መታወቂያ
 DocType: Employee,Notice (days),ማስታወቂያ (ቀናት)
 DocType: POS Closing Voucher Invoices,POS Closing Voucher Invoices,POS የመዘጋት ሒሳብ ደረሰኞች
@@ -7275,6 +7277,7 @@
 DocType: Maintenance Visit,Maintenance Date,ጥገና ቀን
 DocType: Purchase Invoice Item,Rejected Serial No,ውድቅ ተከታታይ ምንም
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py,Year start date or end date is overlapping with {0}. To avoid please set company,ዓመት መጀመሪያ ቀን ወይም የመጨረሻ ቀን {0} ጋር ተደራቢ ነው. ኩባንያ ለማዘጋጀት እባክዎ ለማስቀረት
+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/selling/doctype/customer/customer.py,Please mention the Lead Name in Lead {0},እባክዎን በእርግጠኝነት በ Lead {0} ውስጥ ይጥቀሱ
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py,Start date should be less than end date for Item {0},ንጥል የማብቂያ ቀን ያነሰ መሆን አለበት የመጀመሪያ ቀን {0}
 DocType: Shift Type,Auto Attendance Settings,ራስ-ሰር ተገኝነት ቅንብሮች።
diff --git a/erpnext/translations/ar.csv b/erpnext/translations/ar.csv
index 8a786c3..10c2363 100644
--- a/erpnext/translations/ar.csv
+++ b/erpnext/translations/ar.csv
@@ -168,7 +168,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py,Accountant,محاسب
 apps/erpnext/erpnext/stock/report/item_price_stock/item_price_stock.py,Selling Price List,قائمة أسعار البيع
 DocType: Patient,Tobacco Current Use,التبغ الاستخدام الحالي
-apps/erpnext/erpnext/stock/report/item_price_stock/item_price_stock.py,Selling Rate,معدل البيع
+apps/erpnext/erpnext/selling/report/customer_wise_item_price/customer_wise_item_price.py,Selling Rate,معدل البيع
 apps/erpnext/erpnext/erpnext_integrations/doctype/plaid_settings/plaid_settings.js,Please save your document before adding a new account,يرجى حفظ المستند الخاص بك قبل إضافة حساب جديد
 DocType: Cost Center,Stock User,عضو المخزن
 DocType: Soil Analysis,(Ca+Mg)/K,(الكالسيوم +المغنيسيوم ) / ك
@@ -205,7 +205,6 @@
 DocType: Packed Item,Parent Detail docname,الأم تفاصيل docname
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py,"Reference: {0}, Item Code: {1} and Customer: {2}",المرجع: {0}، رمز العنصر: {1} والعميل: {2}
 apps/erpnext/erpnext/accounts/report/consolidated_financial_statement/consolidated_financial_statement.py,{0} {1} is not present in the parent company,{0} {1} غير موجود في الشركة الأم
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Supplier &gt; Supplier Type,مورد&gt; نوع المورد
 apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py,Trial Period End Date Cannot be before Trial Period Start Date,لا يمكن أن يكون تاريخ انتهاء الفترة التجريبية قبل تاريخ بدء الفترة التجريبية
 apps/erpnext/erpnext/utilities/user_progress.py,Kg,كجم
 DocType: Tax Withholding Category,Tax Withholding Category,فئة حجب الضرائب
@@ -319,6 +318,7 @@
 DocType: Quality Procedure Table,Responsible Individual,الفرد المسؤول
 DocType: Naming Series,Prefix,بادئة
 apps/erpnext/erpnext/hr/notification/training_scheduled/training_scheduled.html,Event Location,موقع الحدث
+apps/erpnext/erpnext/selling/report/customer_wise_item_price/customer_wise_item_price.py,Available Stock,المخزون المتوفر
 DocType: Asset Settings,Asset Settings,إعدادات الأصول
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py,Consumable,المواد المستهلكة
 DocType: Student,B-,B-
@@ -351,6 +351,7 @@
 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 \
 				Serial No.",لا يمكن ضمان التسليم بواسطة Serial No كـ \ Item {0} يضاف مع وبدون ضمان التسليم بواسطة \ Serial No.
+apps/erpnext/erpnext/education/doctype/instructor/instructor.py,Please setup Instructor Naming System in Education &gt; Education Settings,يرجى إعداد نظام تسمية المدرب في التعليم&gt; إعدادات التعليم
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py,At least one mode of payment is required for POS invoice.,يلزم استخدام طريقة دفع واحدة على الأقل لفاتورة نقطة البيع.
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py,Batch no is required for batched item {0},الدفعة رقم غير مطلوبة للعنصر الدفعي {0}
 DocType: Bank Statement Transaction Invoice Item,Bank Statement Transaction Invoice Item,بند الفواتير لمعاملات معاملات البنك
@@ -874,7 +875,6 @@
 DocType: Vital Signs,Blood Pressure (systolic),ضغط الدم (الانقباضي)
 apps/erpnext/erpnext/controllers/buying_controller.py,{0} {1} is {2},{0} {1} هو {2}
 DocType: Item Price,Valid Upto,صالحة لغاية
-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: Training Event,Workshop,ورشة عمل
 DocType: Supplier Scorecard Scoring Standing,Warn Purchase Orders,تحذير أوامر الشراء
 apps/erpnext/erpnext/utilities/user_progress.py,List a few of your customers. They could be organizations or individuals.,أدرج بعض من زبائنك. ويمكن أن تكون منظمات أو أفراد.
@@ -1677,7 +1677,6 @@
 DocType: Item Barcode,Item Barcode,باركود الصنف
 DocType: Delivery Trip,In Transit,في مرحلة انتقالية
 DocType: Woocommerce Settings,Endpoints,النهاية
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Item Code &gt; Item Group &gt; Brand,كود الصنف&gt; مجموعة الصنف&gt; العلامة التجارية
 DocType: Shopping Cart Settings,Show Configure Button,إظهار تكوين زر
 DocType: Quality Inspection Reading,Reading 6,قراءة 6
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js,Cannot {0} {1} {2} without any negative outstanding invoice,{0} {1} {2} لا يمكن  من دون أي فاتورة قائمة سالبة
@@ -2037,6 +2036,7 @@
 DocType: Cheque Print Template,Payer Settings,إعدادات الدافع
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js,No pending Material Requests found to link for the given items.,لم يتم العثور على طلبات المواد المعلقة للربط للعناصر المحددة.
 apps/erpnext/erpnext/public/js/utils/party.js,Select company first,اختر الشركة أولا
+apps/erpnext/erpnext/accounts/general_ledger.py,Account: <b>{0}</b> is capital Work in progress and can not be updated by Journal Entry,الحساب: <b>{0}</b> عبارة &quot;Capital work&quot; قيد التقدم ولا يمكن تحديثها بواسطة &quot;إدخال دفتر اليومية&quot;
 apps/erpnext/erpnext/education/doctype/quiz/quiz.py,Compare List function takes on list arguments,تأخذ وظيفة قائمة المقارنة قائمة الوسائط
 DocType: Item Attribute Value,"This will be appended to the Item Code of the variant. For example, if your abbreviation is ""SM"", and the item code is ""T-SHIRT"", the item code of the variant will be ""T-SHIRT-SM""","سيتم إلحاق هذا إلى بند رمز للمتغير. على سبيل المثال، إذا اختصار الخاص بك هو ""SM""، ورمز البند هو ""T-SHIRT""، رمز العنصر المتغير سيكون ""T-SHIRT-SM"""
 DocType: Salary Slip,Net Pay (in words) will be visible once you save the Salary Slip.,صافي الأجر (بالحروف) تكون مرئية بمجرد حفظ كشف راتب.
@@ -2221,6 +2221,7 @@
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js,Item 2,صنف رقم 2
 DocType: Pricing Rule,Validate Applied Rule,التحقق من صحة القاعدة المطبقة
 DocType: QuickBooks Migrator,Authorization Endpoint,نقطة نهاية التخويل
+DocType: Employee Onboarding,Notify users by email,أبلغ المستخدمين عن طريق البريد الإلكتروني
 DocType: Travel Request,International,دولي
 DocType: Training Event,Training Event,حدث تدريب
 DocType: Item,Auto re-order,إعادة ترتيب تلقائي
@@ -2832,7 +2833,6 @@
 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,يوجد عميل يحمل الاسم نفسه من قبل
-DocType: Contract,Inactive,غير نشط
 apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.js,This will submit Salary Slips and create accrual Journal Entry. Do you want to proceed?,سيؤدي هذا إلى تقديم قسائم الراتب وإنشاء الدخول إلى دفتر الأستحقاق. هل تريد المتابعة؟
 DocType: Purchase Invoice,Total Net Weight,مجموع الوزن الصافي
 DocType: Purchase Order,Order Confirmation No,رقم تأكيد الطلب
@@ -3110,7 +3110,6 @@
 apps/erpnext/erpnext/accounts/party.py,Billing currency must be equal to either default company's currency or party account currency,يجب أن تكون عملة الفوترة مساوية لعملة الشركة الافتراضية أو عملة حساب الطرف
 DocType: Packing Slip,Indicates that the package is a part of this delivery (Only Draft),يشير إلى أن الحزمة هو جزء من هذا التسليم (مشروع فقط)
 apps/erpnext/erpnext/accounts/report/customer_ledger_summary/customer_ledger_summary.py,Closing Balance,الرصيد الختامي
-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: Soil Texture,Loam,طين
 apps/erpnext/erpnext/controllers/accounts_controller.py,Row {0}: Due Date cannot be before posting date,الصف {0}: لا يمكن أن يكون تاريخ الاستحقاق قبل تاريخ النشر
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py,Quantity for Item {0} must be less than {1},كمية القطعة ل {0} يجب أن يكون أقل من {1}
@@ -3633,7 +3632,6 @@
 DocType: Stock Settings,Raise Material Request when stock reaches re-order level,رفع طلب المواد عند الأسهم تصل إلى مستوى إعادة الطلب
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py,Full-time,دوام كامل
 DocType: Payroll Entry,Employees,الموظفين
-apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py,Please setup numbering series for Attendance via Setup &gt; Numbering Series,يرجى إعداد سلسلة الترقيم للحضور عبر الإعداد&gt; سلسلة الترقيم
 DocType: Question,Single Correct Answer,إجابة واحدة صحيحة
 DocType: Employee,Contact Details,تفاصيل الاتصال
 DocType: C-Form,Received Date,تاريخ الاستلام
@@ -4264,6 +4262,7 @@
 DocType: Pricing Rule,Price or Product Discount,السعر أو خصم المنتج
 apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.py,For row {0}: Enter planned qty,بالنسبة إلى الصف {0}: أدخل الكمية المخطط لها
 DocType: Account,Income Account,حساب الدخل
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Customer &gt; Customer Group &gt; Territory,العملاء&gt; مجموعة العملاء&gt; الإقليم
 DocType: Payment Request,Amount in customer's currency,المبلغ بعملة العميل
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js,Delivery,تسليم
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.py,Assigning Structures...,هيكلية التخصيص...
@@ -4313,7 +4312,6 @@
 DocType: HR Settings,Check Vacancies On Job Offer Creation,التحقق من الوظائف الشاغرة عند إنشاء عرض العمل
 apps/erpnext/erpnext/utilities/user_progress.py,Go to Letterheads,انتقل إلى الرسائل
 DocType: Subscription,Cancel At End Of Period,الغاء في نهاية الفترة
-apps/erpnext/erpnext/education/doctype/instructor/instructor.py,Please setup Instructor Naming System in Education &gt; Education Settings,يرجى إعداد نظام تسمية المدرب في التعليم&gt; إعدادات التعليم
 apps/erpnext/erpnext/hr/doctype/employee_promotion/employee_promotion.js,Property already added,الخاصية المضافة بالفعل
 DocType: Item Supplier,Item Supplier,مورد الصنف
 apps/erpnext/erpnext/public/js/controllers/transaction.js,Please enter Item Code to get batch no,الرجاء إدخال كود البند للحصول على رقم الدفعة
@@ -4610,6 +4608,7 @@
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.js,Warning: Material Requested Qty is less than Minimum Order Qty,تحذير : كمية المواد المطلوبة  هي أقل من الحد الأدنى للطلب الكمية
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py,Account {0} is frozen,الحساب {0} مجمّد
 DocType: Quiz Question,Quiz Question,مسابقة السؤال
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Supplier &gt; Supplier Type,مورد&gt; نوع المورد
 DocType: Company,Legal Entity / Subsidiary with a separate Chart of Accounts belonging to the Organization.,الكيان القانوني و الشركات التابعة التى لها لدليل حسابات منفصل تنتمي إلى المنظمة.
 DocType: Payment Request,Mute Email,كتم البريد الإلكتروني
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py,"Food, Beverage & Tobacco",الأغذية والمشروبات والتبغ
@@ -5120,7 +5119,6 @@
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py,Delivery warehouse required for stock item {0},مخزن التسليم متطلب للصنف المخزني : {0}
 DocType: Packing Slip,The gross weight of the package. Usually net weight + packaging material weight. (for print),الوزن الكلي للحزمة. الوزن الصافي عادة + تغليف المواد الوزن. (للطباعة)
 DocType: Assessment Plan,Program,برنامج
-apps/erpnext/erpnext/hr/doctype/employee/employee.py,Please setup Employee Naming System in Human Resource &gt; HR Settings,يرجى إعداد نظام تسمية الموظفين في الموارد البشرية&gt; إعدادات الموارد البشرية
 DocType: Accounts Settings,Users with this role are allowed to set frozen accounts and create / modify accounting entries against frozen accounts,يسمح للمستخدمين مع هذا الدور لضبط الحسابات المجمدة و إنشاء / تعديل القيود المحاسبية على حسابات مجمدة
 ,Project Billing Summary,ملخص فواتير المشروع
 DocType: Vital Signs,Cuts,تخفيضات
@@ -5369,6 +5367,7 @@
 apps/erpnext/erpnext/quality_management/doctype/quality_review/quality_review_list.js,No Action,لا رد فعل
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js,Valuation type charges can not marked as Inclusive,لا يمكن وضع علامة على رسوم التقييم على انها شاملة
 DocType: POS Profile,Update Stock,تحديث المخزون
+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/stock/doctype/packing_slip/packing_slip.js,Different UOM for items will lead to incorrect (Total) Net Weight value. Make sure that Net Weight of each item is in the same UOM.,سوف UOM مختلفة لعناصر تؤدي إلى غير صحيحة ( مجموع ) صافي قيمة الوزن . تأكد من أن الوزن الصافي من كل عنصر في نفس UOM .
 DocType: Certification Application,Payment Details,تفاصيل الدفع
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py,BOM Rate,سعر قائمة المواد
@@ -5472,6 +5471,8 @@
 apps/erpnext/erpnext/accounts/doctype/monthly_distribution/monthly_distribution.py,Percentage Allocation should be equal to 100%,مجموع النسب المخصصة يجب ان تساوي 100 %
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js,Please select Posting Date before selecting Party,يرجى اختيار تاريخ الترحيل قبل اختيار الطرف المعني
 apps/erpnext/erpnext/config/accounting.py,Payment Terms based on conditions,شروط الدفع على أساس الشروط
+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: Program Enrollment,School House,مدرسة دار
 DocType: Serial No,Out of AMC,من AMC
 DocType: Opportunity,Opportunity Amount,مبلغ الفرصة
@@ -5673,6 +5674,7 @@
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py,Order/Quot %,أوردر / كوت٪
 apps/erpnext/erpnext/config/healthcare.py,Record Patient Vitals,سجل الحيويه المريض
 DocType: Fee Schedule,Institution,مؤسسة
+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: Asset,Partially Depreciated,استهلكت جزئيا
 DocType: Issue,Opening Time,يفتح من الساعة
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py,From and To dates required,التواريخ من وإلى مطلوبة
@@ -5889,6 +5891,7 @@
 DocType: Quality Procedure Process,Link existing Quality Procedure.,ربط إجراءات الجودة الحالية.
 apps/erpnext/erpnext/config/hr.py,Loans,القروض
 DocType: Healthcare Service Unit,Healthcare Service Unit,وحدة خدمة الرعاية الصحية
+,Customer-wise Item Price,سعر البند العملاء الحكيم
 apps/erpnext/erpnext/public/js/financial_statements.js,Cash Flow Statement,بيان التدفقات النقدية
 apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.py,No material request created,لم يتم إنشاء طلب مادي
 apps/erpnext/erpnext/hr/doctype/loan_application/loan_application.py,Loan Amount cannot exceed Maximum Loan Amount of {0},لا يمكن أن تتجاوز قيمة القرض الحد الأقصى المحدد للقروض {0}
@@ -6150,6 +6153,7 @@
 apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py,Opening Value,القيمة الافتتاحية
 DocType: Salary Component,Formula,صيغة
 apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py,Serial #,المسلسل #
+apps/erpnext/erpnext/hr/doctype/employee/employee.py,Please setup Employee Naming System in Human Resource &gt; HR Settings,يرجى إعداد نظام تسمية الموظفين في الموارد البشرية&gt; إعدادات الموارد البشرية
 DocType: Material Request Plan Item,Required Quantity,الكمية المطلوبة
 DocType: Lab Test Template,Lab Test Template,قالب اختبار المختبر
 apps/erpnext/erpnext/accounts/doctype/accounting_period/accounting_period.py,Accounting Period overlaps with {0},فترة المحاسبة تتداخل مع {0}
@@ -6400,7 +6404,6 @@
 DocType: Request for Quotation Item,Project Name,اسم المشروع
 apps/erpnext/erpnext/regional/italy/utils.py,Please set the Customer Address,يرجى ضبط عنوان العميل
 DocType: Customer,Mention if non-standard receivable account,أذكر إذا غير القياسية حساب المستحق
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Customer &gt; Customer Group &gt; Territory,العملاء&gt; مجموعة العملاء&gt; الإقليم
 DocType: Bank,Plaid Access Token,منقوشة رمز الوصول
 apps/erpnext/erpnext/hr/doctype/employee_benefit_application/employee_benefit_application.py,Please add the remaining benefits {0} to any of the existing component,الرجاء إضافة الفوائد المتبقية {0} إلى أي مكون موجود
 DocType: Journal Entry Account,If Income or Expense,إذا دخل أو مصروف
@@ -6663,8 +6666,6 @@
 apps/erpnext/erpnext/buying/utils.py,Please enter quantity for Item {0},الرجاء إدخال الكمية للبند {0}
 DocType: Quality Procedure,Processes,العمليات
 DocType: Shift Type,First Check-in and Last Check-out,تسجيل الوصول الأول وتسجيل المغادرة الأخير
-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/regional/report/hsn_wise_summary_of_outward_supplies/hsn_wise_summary_of_outward_supplies.py,Total Taxable Amount,إجمالي المبلغ الخاضع للضريبة
 DocType: Employee External Work History,Employee External Work History,سجل عمل الموظف خارج الشركة
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.py,Job card {0} created,تم إنشاء بطاقة العمل {0}
@@ -6700,6 +6701,7 @@
 apps/erpnext/erpnext/accounts/doctype/payment_terms_template/payment_terms_template.py,Combined invoice portion must equal 100%,يجب أن يساوي جزء الفاتورة مجتمعة 100٪
 DocType: Item Default,Default Expense Account,حساب النفقات الإفتراضي
 DocType: GST Account,CGST Account,حساب غست
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Item Code &gt; Item Group &gt; Brand,كود الصنف&gt; مجموعة الصنف&gt; العلامة التجارية
 apps/erpnext/erpnext/education/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py,Student Email ID,طالب معرف البريد الإلكتروني
 DocType: Employee,Notice (days),إشعار (أيام)
 DocType: POS Closing Voucher Invoices,POS Closing Voucher Invoices,فواتير قيد إغلاق نقطة البيع
@@ -7341,6 +7343,7 @@
 DocType: Maintenance Visit,Maintenance Date,تاريخ الصيانة
 DocType: Purchase Invoice Item,Rejected Serial No,رقم المسلسل رفض
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py,Year start date or end date is overlapping with {0}. To avoid please set company,تاريخ بداية السنة او نهايتها متداخل مع {0}. لتجنب ذلك الرجاء تحديد الشركة
+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/selling/doctype/customer/customer.py,Please mention the Lead Name in Lead {0},يرجى ذكر الاسم الرائد في العميل {0}
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py,Start date should be less than end date for Item {0},يجب أن يكون تاريخ البدء قبل تاريخ الانتهاء للبند {0}
 DocType: Shift Type,Auto Attendance Settings,إعدادات الحضور التلقائي
diff --git a/erpnext/translations/bg.csv b/erpnext/translations/bg.csv
index 583776b..df0355e 100644
--- a/erpnext/translations/bg.csv
+++ b/erpnext/translations/bg.csv
@@ -168,7 +168,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py,Accountant,Счетоводител
 apps/erpnext/erpnext/stock/report/item_price_stock/item_price_stock.py,Selling Price List,Ценова листа за продажба
 DocType: Patient,Tobacco Current Use,Тютюновата текуща употреба
-apps/erpnext/erpnext/stock/report/item_price_stock/item_price_stock.py,Selling Rate,Продажна цена
+apps/erpnext/erpnext/selling/report/customer_wise_item_price/customer_wise_item_price.py,Selling Rate,Продажна цена
 apps/erpnext/erpnext/erpnext_integrations/doctype/plaid_settings/plaid_settings.js,Please save your document before adding a new account,"Моля, запазете документа си, преди да добавите нов акаунт"
 DocType: Cost Center,Stock User,Склад за потребителя
 DocType: Soil Analysis,(Ca+Mg)/K,(Ca + Mg) / K
@@ -205,7 +205,6 @@
 DocType: Packed Item,Parent Detail docname,Родител Подробности docname
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py,"Reference: {0}, Item Code: {1} and Customer: {2}","Референция: {0}, кода на елемента: {1} и клиента: {2}"
 apps/erpnext/erpnext/accounts/report/consolidated_financial_statement/consolidated_financial_statement.py,{0} {1} is not present in the parent company,{0} {1} не присъства в компанията майка
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Supplier &gt; Supplier Type,Доставчик&gt; Тип доставчик
 apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py,Trial Period End Date Cannot be before Trial Period Start Date,Крайната дата на пробния период не може да бъде преди началната дата на пробния период
 apps/erpnext/erpnext/utilities/user_progress.py,Kg,Кг
 DocType: Tax Withholding Category,Tax Withholding Category,Категория на удържане на данъци
@@ -319,6 +318,7 @@
 DocType: Quality Procedure Table,Responsible Individual,Отговорен индивид
 DocType: Naming Series,Prefix,Префикс
 apps/erpnext/erpnext/hr/notification/training_scheduled/training_scheduled.html,Event Location,Местоположение на събитието
+apps/erpnext/erpnext/selling/report/customer_wise_item_price/customer_wise_item_price.py,Available Stock,Налични наличности
 DocType: Asset Settings,Asset Settings,Настройки на активите
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py,Consumable,Консумативи
 DocType: Student,B-,B-
@@ -351,6 +351,7 @@
 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 \
 				Serial No.","Не може да се осигури доставка по сериен номер, тъй като \ Item {0} е добавен с и без да се гарантира доставката чрез \ сериен номер"
+apps/erpnext/erpnext/education/doctype/instructor/instructor.py,Please setup Instructor Naming System in Education &gt; Education Settings,"Моля, настройте системата за именуване на инструктори в Образование&gt; Настройки за образование"
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py,At least one mode of payment is required for POS invoice.,се изисква най-малко един режим на плащане за POS фактура.
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py,Batch no is required for batched item {0},Не е необходим партиден номер за партиден артикул {0}
 DocType: Bank Statement Transaction Invoice Item,Bank Statement Transaction Invoice Item,Показател за транзакция на банкова декларация
@@ -874,7 +875,6 @@
 DocType: Vital Signs,Blood Pressure (systolic),Кръвно налягане (систолично)
 apps/erpnext/erpnext/controllers/buying_controller.py,{0} {1} is {2},{0} {1} е {2}
 DocType: Item Price,Valid Upto,Валиден до
-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: Training Event,Workshop,цех
 DocType: Supplier Scorecard Scoring Standing,Warn Purchase Orders,Предупреждавайте поръчки за покупка
 apps/erpnext/erpnext/utilities/user_progress.py,List a few of your customers. They could be organizations or individuals.,Изброите някои от вашите клиенти. Те могат да бъдат организации или индивидуални лица.
@@ -1658,7 +1658,6 @@
 DocType: Item Barcode,Item Barcode,Позиция Barcode
 DocType: Delivery Trip,In Transit,Транзитно
 DocType: Woocommerce Settings,Endpoints,Endpoints
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Item Code &gt; Item Group &gt; Brand,Код на артикула&gt; Група артикули&gt; Марка
 DocType: Shopping Cart Settings,Show Configure Button,Показване на бутона Конфигуриране
 DocType: Quality Inspection Reading,Reading 6,Четене 6
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js,Cannot {0} {1} {2} without any negative outstanding invoice,Не може да {0} {1} {2} без отрицателна неплатена фактура
@@ -2018,6 +2017,7 @@
 DocType: Cheque Print Template,Payer Settings,Настройки платеца
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js,No pending Material Requests found to link for the given items.,"Няма изчакващи материали, за които да се установи връзка, за дадени елементи."
 apps/erpnext/erpnext/public/js/utils/party.js,Select company first,Първо изберете фирма
+apps/erpnext/erpnext/accounts/general_ledger.py,Account: <b>{0}</b> is capital Work in progress and can not be updated by Journal Entry,Акаунт: <b>{0}</b> е капитал Незавършено производство и не може да бъде актуализиран от Entry Entry
 apps/erpnext/erpnext/education/doctype/quiz/quiz.py,Compare List function takes on list arguments,Функцията за сравняване на списъка приема аргументи от списъка
 DocType: Item Attribute Value,"This will be appended to the Item Code of the variant. For example, if your abbreviation is ""SM"", and the item code is ""T-SHIRT"", the item code of the variant will be ""T-SHIRT-SM""","Това ще бъде приложена към Кодекса Точка на варианта. Например, ако вашият съкращението е &quot;SM&quot;, а кодът на елемент е &quot;ТЕНИСКА&quot;, кодът позиция на варианта ще бъде &quot;ТЕНИСКА-SM&quot;"
 DocType: Salary Slip,Net Pay (in words) will be visible once you save the Salary Slip.,Net Pay (словом) ще бъде видим след като спаси квитанцията за заплата.
@@ -2202,6 +2202,7 @@
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js,Item 2,Позиция 2
 DocType: Pricing Rule,Validate Applied Rule,Валидирайте приложеното правило
 DocType: QuickBooks Migrator,Authorization Endpoint,Крайна точка за разрешаване
+DocType: Employee Onboarding,Notify users by email,Уведомете потребителите по имейл
 DocType: Travel Request,International,международен
 DocType: Training Event,Training Event,обучение на Събитията
 DocType: Item,Auto re-order,Автоматична повторна поръчка
@@ -2812,7 +2813,6 @@
 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,Клиент със същото име вече съществува
-DocType: Contract,Inactive,неактивен
 apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.js,This will submit Salary Slips and create accrual Journal Entry. Do you want to proceed?,Това ще изпрати Скача за заплати и ще създаде вписване в счетоводния дневник. Искаш ли да продължиш?
 DocType: Purchase Invoice,Total Net Weight,Общо нетно тегло
 DocType: Purchase Order,Order Confirmation No,Потвърждаване на поръчка №
@@ -3089,7 +3089,6 @@
 apps/erpnext/erpnext/accounts/party.py,Billing currency must be equal to either default company's currency or party account currency,Валутата за фактуриране трябва да бъде равна или на валутата на валутата или валутата на партията
 DocType: Packing Slip,Indicates that the package is a part of this delivery (Only Draft),"Показва, че опаковката е част от тази доставка (Само Проект)"
 apps/erpnext/erpnext/accounts/report/customer_ledger_summary/customer_ledger_summary.py,Closing Balance,Заключителен баланс
-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: Soil Texture,Loam,глинеста почва
 apps/erpnext/erpnext/controllers/accounts_controller.py,Row {0}: Due Date cannot be before posting date,Ред {0}: Дневната дата не може да бъде преди датата на публикуване
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py,Quantity for Item {0} must be less than {1},Количество за позиция {0} трябва да е по-малко от {1}
@@ -3612,7 +3611,6 @@
 DocType: Stock Settings,Raise Material Request when stock reaches re-order level,Повдигнете Материал Заявка когато фондова достигне ниво повторна поръчка
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py,Full-time,Пълен работен ден
 DocType: Payroll Entry,Employees,Служители
-apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py,Please setup numbering series for Attendance via Setup &gt; Numbering Series,"Моля, настройте сериите за номериране на посещаемостта чрез Настройка&gt; Серия от номерация"
 DocType: Question,Single Correct Answer,Единен правилен отговор
 DocType: Employee,Contact Details,Данни за контакт
 DocType: C-Form,Received Date,Дата на получаване
@@ -4223,6 +4221,7 @@
 DocType: Pricing Rule,Price or Product Discount,Отстъпка за цена или продукт
 apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.py,For row {0}: Enter planned qty,За ред {0}: Въведете планираните количества
 DocType: Account,Income Account,Сметка за доход
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Customer &gt; Customer Group &gt; Territory,Клиент&gt; Клиентска група&gt; Територия
 DocType: Payment Request,Amount in customer's currency,Сума във валута на клиента
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js,Delivery,Доставка
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.py,Assigning Structures...,Присвояване на структури ...
@@ -4272,7 +4271,6 @@
 DocType: HR Settings,Check Vacancies On Job Offer Creation,Проверете свободни работни места при създаване на оферта за работа
 apps/erpnext/erpnext/utilities/user_progress.py,Go to Letterheads,Отидете на Letterheads
 DocType: Subscription,Cancel At End Of Period,Отменете в края на периода
-apps/erpnext/erpnext/education/doctype/instructor/instructor.py,Please setup Instructor Naming System in Education &gt; Education Settings,"Моля, настройте системата за именуване на инструктори в Образование&gt; Настройки за образование"
 apps/erpnext/erpnext/hr/doctype/employee_promotion/employee_promotion.js,Property already added,Имоти вече добавени
 DocType: Item Supplier,Item Supplier,Позиция - Доставчик
 apps/erpnext/erpnext/public/js/controllers/transaction.js,Please enter Item Code to get batch no,"Моля, въведете Код, за да получите партиден №"
@@ -4557,6 +4555,7 @@
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.js,Warning: Material Requested Qty is less than Minimum Order Qty,Внимание: Материал Заявени Количество е по-малко от минималното Поръчка Количество
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py,Account {0} is frozen,Сметка {0} е замразена
 DocType: Quiz Question,Quiz Question,Въпрос на викторина
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Supplier &gt; Supplier Type,Доставчик&gt; Тип доставчик
 DocType: Company,Legal Entity / Subsidiary with a separate Chart of Accounts belonging to the Organization.,"Юридическо лице / Дъщерно дружество с отделен сметкоплан, част от организацията."
 DocType: Payment Request,Mute Email,Mute Email
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py,"Food, Beverage & Tobacco","Храни, напитки и тютюневи изделия"
@@ -5067,7 +5066,6 @@
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py,Delivery warehouse required for stock item {0},Склад за доставка се изисква за позиция {0}
 DocType: Packing Slip,The gross weight of the package. Usually net weight + packaging material weight. (for print),Брутното тегло на опаковката. Обикновено нетно тегло + опаковъчен материал тегло. (За печат)
 DocType: Assessment Plan,Program,програма
-apps/erpnext/erpnext/hr/doctype/employee/employee.py,Please setup Employee Naming System in Human Resource &gt; HR Settings,"Моля, настройте системата за именуване на служители в Човешки ресурси&gt; Настройки за човешки ресурси"
 DocType: Accounts Settings,Users with this role are allowed to set frozen accounts and create / modify accounting entries against frozen accounts,Потребителите с тази роля е разрешено да задават замразени сметки и да се създаде / модифицира счетоводни записи срещу замразените сметки
 ,Project Billing Summary,Обобщение на проекта за фактуриране
 DocType: Vital Signs,Cuts,Cuts
@@ -5316,6 +5314,7 @@
 apps/erpnext/erpnext/quality_management/doctype/quality_review/quality_review_list.js,No Action,Не се предприемат действия
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js,Valuation type charges can not marked as Inclusive,Такси тип оценка не може маркирани като Inclusive
 DocType: POS Profile,Update Stock,Актуализация Наличности
+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/stock/doctype/packing_slip/packing_slip.js,Different UOM for items will lead to incorrect (Total) Net Weight value. Make sure that Net Weight of each item is in the same UOM.,"Different мерна единица за елементи ще доведе до неправилно (Total) Нетна стойност на теглото. Уверете се, че нетното тегло на всеки артикул е в една и съща мерна единица."
 DocType: Certification Application,Payment Details,Подробности на плащане
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py,BOM Rate,BOM Курс
@@ -5419,6 +5418,8 @@
 apps/erpnext/erpnext/accounts/doctype/monthly_distribution/monthly_distribution.py,Percentage Allocation should be equal to 100%,Процентно разпределение следва да е равно на 100%
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js,Please select Posting Date before selecting Party,"Моля, изберете дата на завеждане, преди да изберете страна"
 apps/erpnext/erpnext/config/accounting.py,Payment Terms based on conditions,Условия за плащане въз основа на условия
+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: Program Enrollment,School House,училище Къща
 DocType: Serial No,Out of AMC,Няма AMC
 DocType: Opportunity,Opportunity Amount,Възможност Сума
@@ -5620,6 +5621,7 @@
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py,Order/Quot %,Поръчка / Оферта %
 apps/erpnext/erpnext/config/healthcare.py,Record Patient Vitals,Записване на виталите на пациента
 DocType: Fee Schedule,Institution,Институция
+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: Asset,Partially Depreciated,Частично амортизиран
 DocType: Issue,Opening Time,Наличност - Време
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py,From and To dates required,От и до датите са задължителни
@@ -5836,6 +5838,7 @@
 DocType: Quality Procedure Process,Link existing Quality Procedure.,Свържете съществуващата процедура за качество.
 apps/erpnext/erpnext/config/hr.py,Loans,Кредити
 DocType: Healthcare Service Unit,Healthcare Service Unit,Звено за здравни услуги
+,Customer-wise Item Price,"Цена на артикула, съобразена с клиентите"
 apps/erpnext/erpnext/public/js/financial_statements.js,Cash Flow Statement,Отчет за паричните потоци
 apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.py,No material request created,Не е създадена материална заявка
 apps/erpnext/erpnext/hr/doctype/loan_application/loan_application.py,Loan Amount cannot exceed Maximum Loan Amount of {0},Размер на кредита не може да надвишава сума на максимален заем  {0}
@@ -6097,6 +6100,7 @@
 apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py,Opening Value,Наличност - Стойност
 DocType: Salary Component,Formula,формула
 apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py,Serial #,Serial #
+apps/erpnext/erpnext/hr/doctype/employee/employee.py,Please setup Employee Naming System in Human Resource &gt; HR Settings,"Моля, настройте системата за именуване на служители в Човешки ресурси&gt; Настройки за човешки ресурси"
 DocType: Material Request Plan Item,Required Quantity,Необходимо количество
 DocType: Lab Test Template,Lab Test Template,Лабораторен тестов шаблон
 apps/erpnext/erpnext/accounts/doctype/accounting_period/accounting_period.py,Accounting Period overlaps with {0},Счетоводният период се припокрива с {0}
@@ -6346,7 +6350,6 @@
 DocType: Request for Quotation Item,Project Name,Име на проекта
 apps/erpnext/erpnext/regional/italy/utils.py,Please set the Customer Address,"Моля, задайте адреса на клиента"
 DocType: Customer,Mention if non-standard receivable account,"Споменете, ако нестандартно вземане предвид"
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Customer &gt; Customer Group &gt; Territory,Клиент&gt; Клиентска група&gt; Територия
 DocType: Bank,Plaid Access Token,Плейд достъп до маркера
 apps/erpnext/erpnext/hr/doctype/employee_benefit_application/employee_benefit_application.py,Please add the remaining benefits {0} to any of the existing component,"Моля, добавете останалите предимства {0} към някой от съществуващите компоненти"
 DocType: Journal Entry Account,If Income or Expense,Ако приход или разход
@@ -6609,8 +6612,6 @@
 apps/erpnext/erpnext/buying/utils.py,Please enter quantity for Item {0},"Моля, въведете количество за т {0}"
 DocType: Quality Procedure,Processes,процеси
 DocType: Shift Type,First Check-in and Last Check-out,Първо настаняване и последно напускане
-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/regional/report/hsn_wise_summary_of_outward_supplies/hsn_wise_summary_of_outward_supplies.py,Total Taxable Amount,Обща облагаема сума
 DocType: Employee External Work History,Employee External Work History,Служител за външна работа
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.py,Job card {0} created,Създадена е работна карта {0}
@@ -6646,6 +6647,7 @@
 apps/erpnext/erpnext/accounts/doctype/payment_terms_template/payment_terms_template.py,Combined invoice portion must equal 100%,Комбинираната част от фактурите трябва да е равна на 100%
 DocType: Item Default,Default Expense Account,Разходна сметка по подразбиране
 DocType: GST Account,CGST Account,CGST профил
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Item Code &gt; Item Group &gt; Brand,Код на артикула&gt; Група артикули&gt; Марка
 apps/erpnext/erpnext/education/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py,Student Email ID,Student Email ID
 DocType: Employee,Notice (days),Известие (дни)
 DocType: POS Closing Voucher Invoices,POS Closing Voucher Invoices,Фактурите за ваучери за затваряне на POS
@@ -7284,6 +7286,7 @@
 DocType: Maintenance Visit,Maintenance Date,Поддръжка Дата
 DocType: Purchase Invoice Item,Rejected Serial No,Отхвърлени Пореден №
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py,Year start date or end date is overlapping with {0}. To avoid please set company,"Година на начална дата или крайна дата се припокриват с {0}. За да се избегне моля, задайте компания"
+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/selling/doctype/customer/customer.py,Please mention the Lead Name in Lead {0},"Моля, посочете водещото име в водещия {0}"
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py,Start date should be less than end date for Item {0},Начална дата трябва да бъде по-малко от крайната дата за позиция {0}
 DocType: Shift Type,Auto Attendance Settings,Настройки за автоматично присъствие
diff --git a/erpnext/translations/bn.csv b/erpnext/translations/bn.csv
index 790f340..8187b1f 100644
--- a/erpnext/translations/bn.csv
+++ b/erpnext/translations/bn.csv
@@ -165,7 +165,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py,Accountant,হিসাবরক্ষক
 apps/erpnext/erpnext/stock/report/item_price_stock/item_price_stock.py,Selling Price List,মূল্য তালিকা বিক্রি
 DocType: Patient,Tobacco Current Use,তামাক বর্তমান ব্যবহার
-apps/erpnext/erpnext/stock/report/item_price_stock/item_price_stock.py,Selling Rate,বিক্রি হার
+apps/erpnext/erpnext/selling/report/customer_wise_item_price/customer_wise_item_price.py,Selling Rate,বিক্রি হার
 apps/erpnext/erpnext/erpnext_integrations/doctype/plaid_settings/plaid_settings.js,Please save your document before adding a new account,নতুন অ্যাকাউন্ট যুক্ত করার আগে দয়া করে আপনার দস্তাবেজটি সংরক্ষণ করুন
 DocType: Cost Center,Stock User,স্টক ইউজার
 DocType: Soil Analysis,(Ca+Mg)/K,(CA ম্যাগনেসিয়াম + +) / কে
@@ -202,7 +202,6 @@
 DocType: Packed Item,Parent Detail docname,মূল বিস্তারিত docname
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py,"Reference: {0}, Item Code: {1} and Customer: {2}","রেফারেন্স: {0}, আইটেম কোড: {1} এবং গ্রাহক: {2}"
 apps/erpnext/erpnext/accounts/report/consolidated_financial_statement/consolidated_financial_statement.py,{0} {1} is not present in the parent company,{0} {1} মূল কোম্পানির মধ্যে উপস্থিত নেই
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Supplier &gt; Supplier Type,সরবরাহকারী&gt; সরবরাহকারী প্রকার
 apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py,Trial Period End Date Cannot be before Trial Period Start Date,ট্রায়ালের মেয়াদ শেষের তারিখটি ট্রায়ালের মেয়াদ শুরু তারিখের আগে হতে পারে না
 apps/erpnext/erpnext/utilities/user_progress.py,Kg,কেজি
 DocType: Tax Withholding Category,Tax Withholding Category,ট্যাক্স আটকানোর বিভাগ
@@ -314,6 +313,7 @@
 DocType: Quality Procedure Table,Responsible Individual,দায়িত্বশীল ব্যক্তি
 DocType: Naming Series,Prefix,উপসর্গ
 apps/erpnext/erpnext/hr/notification/training_scheduled/training_scheduled.html,Event Location,ইভেন্ট অবস্থান
+apps/erpnext/erpnext/selling/report/customer_wise_item_price/customer_wise_item_price.py,Available Stock,"মজুতে সহজলভ্য, সহজপ্রাপ্ত, সহজলভ্য"
 DocType: Asset Settings,Asset Settings,সম্পদ সেটিংস
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py,Consumable,Consumable
 DocType: Student,B-,বি-
@@ -346,7 +346,9 @@
 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 \
 				Serial No.",সিরিয়াল নং দ্বারা প্রসবের নিশ্চিত করতে পারবেন না \ Item {0} সাথে এবং \ Serial No. দ্বারা নিশ্চিত ডেলিভারি ছাড়া যোগ করা হয়।
+apps/erpnext/erpnext/education/doctype/instructor/instructor.py,Please setup Instructor Naming System in Education &gt; Education Settings,দয়া করে শিক্ষা&gt; শিক্ষা সেটিংসে প্রশিক্ষক নামকরণ সিস্টেম সেটআপ করুন
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py,At least one mode of payment is required for POS invoice.,পেমেন্ট অন্তত একটি মোড পিওএস চালান জন্য প্রয়োজন বোধ করা হয়.
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py,Batch no is required for batched item {0},ব্যাচ নং আইটেমের জন্য প্রয়োজনীয় {0}
 DocType: Bank Statement Transaction Invoice Item,Bank Statement Transaction Invoice Item,ব্যাংক বিবৃতি লেনদেন চালান আইটেম
 DocType: Salary Detail,Tax on flexible benefit,নমনীয় বেনিফিট ট্যাক্স
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py,Item {0} is not active or end of life has been reached,{0} আইটেম সক্রিয় নয় বা জীবনের শেষ হয়েছে পৌঁছেছেন
@@ -1635,7 +1637,6 @@
 DocType: Item Barcode,Item Barcode,আইটেম বারকোড
 DocType: Delivery Trip,In Transit,ট্রানজিটে
 DocType: Woocommerce Settings,Endpoints,এন্ডপয়েন্ট
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Item Code &gt; Item Group &gt; Brand,আইটেম কোড&gt; আইটেম গ্রুপ&gt; ব্র্যান্ড
 DocType: Shopping Cart Settings,Show Configure Button,কনফিগার বোতামটি প্রদর্শন করুন
 DocType: Quality Inspection Reading,Reading 6,6 পঠন
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js,Cannot {0} {1} {2} without any negative outstanding invoice,না {0} {1} {2} ছাড়া কোনো নেতিবাচক অসামান্য চালান Can
@@ -2177,6 +2178,7 @@
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js,Item 2,আইটেম 2
 DocType: Pricing Rule,Validate Applied Rule,প্রয়োগিত বিধি কার্যকর করুন
 DocType: QuickBooks Migrator,Authorization Endpoint,অনুমোদন শেষ বিন্দু
+DocType: Employee Onboarding,Notify users by email,ইমেল দ্বারা ব্যবহারকারীদের অবহিত
 DocType: Travel Request,International,আন্তর্জাতিক
 DocType: Training Event,Training Event,প্রশিক্ষণ ইভেন্ট
 DocType: Item,Auto re-order,অটো পুনরায় আদেশ
@@ -2776,7 +2778,6 @@
 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,একই নামের একটি গ্রাহক ইতিমধ্যে বিদ্যমান
-DocType: Contract,Inactive,নিষ্ক্রিয়
 apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.js,This will submit Salary Slips and create accrual Journal Entry. Do you want to proceed?,এটি বেতন স্লিপ জমা দেবে এবং জার্নাল এণ্ট্রি তৈরি করবে। আপনি কি এগিয়ে যেতে চান?
 DocType: Purchase Invoice,Total Net Weight,মোট নেট ওজন
 DocType: Purchase Order,Order Confirmation No,অর্ডারের নিশ্চয়তা নেই
@@ -3051,7 +3052,6 @@
 apps/erpnext/erpnext/accounts/party.py,Billing currency must be equal to either default company's currency or party account currency,বিলিং মুদ্রা ডিফল্ট কোম্পানির মুদ্রার বা পার্টি অ্যাকাউন্ট মুদ্রার সমান হতে হবে
 DocType: Packing Slip,Indicates that the package is a part of this delivery (Only Draft),বাক্স এই বন্টন (শুধু খসড়া) একটি অংশ কিনা তা চিহ্নিত
 apps/erpnext/erpnext/accounts/report/customer_ledger_summary/customer_ledger_summary.py,Closing Balance,অর্থ শেষ
-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: Soil Texture,Loam,দোআঁশ মাটি
 apps/erpnext/erpnext/controllers/accounts_controller.py,Row {0}: Due Date cannot be before posting date,সারি {0}: ডেট তারিখ তারিখ পোস্ট করার আগে হতে পারে না
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py,Quantity for Item {0} must be less than {1},আইটেমের জন্য পরিমাণ {0} চেয়ে কম হতে হবে {1}
@@ -3568,7 +3568,6 @@
 DocType: Stock Settings,Raise Material Request when stock reaches re-order level,শেয়ার পুনরায় আদেশ পর্যায়ে পৌঁছে যখন উপাদান অনুরোধ বাড়াতে
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py,Full-time,ফুল টাইম
 DocType: Payroll Entry,Employees,এমপ্লয়িজ
-apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py,Please setup numbering series for Attendance via Setup &gt; Numbering Series,দয়া করে সেটআপ&gt; নম্বরিং সিরিজের মাধ্যমে উপস্থিতির জন্য সংখ্যায়ন সিরিজটি সেট করুন
 DocType: Question,Single Correct Answer,একক সঠিক উত্তর
 DocType: Employee,Contact Details,যোগাযোগের ঠিকানা
 DocType: C-Form,Received Date,জন্ম গ্রহণ
@@ -4174,6 +4173,7 @@
 DocType: Pricing Rule,Price or Product Discount,মূল্য বা পণ্যের ছাড়
 apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.py,For row {0}: Enter planned qty,সারি {0} জন্য: পরিকল্পিত পরিমাণ লিখুন
 DocType: Account,Income Account,আয় অ্যাকাউন্ট
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Customer &gt; Customer Group &gt; Territory,গ্রাহক&gt; গ্রাহক গোষ্ঠী&gt; অঞ্চল
 DocType: Payment Request,Amount in customer's currency,গ্রাহকের মুদ্রার পরিমাণ
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js,Delivery,বিলি
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.py,Assigning Structures...,কাঠামো বরাদ্দ করা হচ্ছে ...
@@ -4223,7 +4223,6 @@
 DocType: HR Settings,Check Vacancies On Job Offer Creation,কাজের অফার তৈরিতে শূন্যপদগুলি পরীক্ষা করুন
 apps/erpnext/erpnext/utilities/user_progress.py,Go to Letterheads,লেটার হেডসে যান
 DocType: Subscription,Cancel At End Of Period,মেয়াদ শেষের সময় বাতিল
-apps/erpnext/erpnext/education/doctype/instructor/instructor.py,Please setup Instructor Naming System in Education &gt; Education Settings,দয়া করে শিক্ষা&gt; শিক্ষা সেটিংসে প্রশিক্ষক নামকরণ সিস্টেম সেটআপ করুন
 apps/erpnext/erpnext/hr/doctype/employee_promotion/employee_promotion.js,Property already added,সম্পত্তি ইতিমধ্যে যোগ করা
 DocType: Item Supplier,Item Supplier,আইটেম সরবরাহকারী
 apps/erpnext/erpnext/public/js/controllers/transaction.js,Please enter Item Code to get batch no,ব্যাচ কোন পেতে আইটেম কোড প্রবেশ করুন
@@ -4506,6 +4505,7 @@
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.js,Warning: Material Requested Qty is less than Minimum Order Qty,সতর্কতা: Qty অনুরোধ উপাদান নূন্যতম অর্ডার QTY কম হয়
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py,Account {0} is frozen,অ্যাকাউন্ট {0} নিথর হয়
 DocType: Quiz Question,Quiz Question,কুইজ প্রশ্ন
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Supplier &gt; Supplier Type,সরবরাহকারী&gt; সরবরাহকারী প্রকার
 DocType: Company,Legal Entity / Subsidiary with a separate Chart of Accounts belonging to the Organization.,সংস্থার একাত্মতার অ্যাকাউন্টের একটি পৃথক চার্ট সঙ্গে আইনি সত্তা / সাবসিডিয়ারি.
 DocType: Payment Request,Mute Email,নিঃশব্দ ইমেইল
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py,"Food, Beverage & Tobacco","খাদ্য, পানীয় ও তামাকের"
@@ -5012,7 +5012,6 @@
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py,Delivery warehouse required for stock item {0},ডেলিভারি গুদাম স্টক আইটেমটি জন্য প্রয়োজন {0}
 DocType: Packing Slip,The gross weight of the package. Usually net weight + packaging material weight. (for print),প্যাকেজের গ্রস ওজন. সাধারণত নেট ওজন + প্যাকেজিং উপাদান ওজন. (প্রিন্ট জন্য)
 DocType: Assessment Plan,Program,কার্যক্রম
-apps/erpnext/erpnext/hr/doctype/employee/employee.py,Please setup Employee Naming System in Human Resource &gt; HR Settings,মানব সম্পদ&gt; এইচআর সেটিংসে কর্মচারী নামকরণ সিস্টেম সেটআপ করুন
 DocType: Accounts Settings,Users with this role are allowed to set frozen accounts and create / modify accounting entries against frozen accounts,এই ব্যবহারকারীরা হিমায়িত অ্যাকাউন্ট বিরুদ্ধে হিসাব থেকে হিমায়িত অ্যাকাউন্ট সেট এবং তৈরি / পরিবর্তন করার অনুমতি দেওয়া হয়
 ,Project Billing Summary,প্রকল্পের বিলিংয়ের সংক্ষিপ্তসার
 DocType: Vital Signs,Cuts,কাট
@@ -5357,6 +5356,8 @@
 apps/erpnext/erpnext/accounts/doctype/monthly_distribution/monthly_distribution.py,Percentage Allocation should be equal to 100%,শতকরা বরাদ্দ 100% সমান হওয়া উচিত
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js,Please select Posting Date before selecting Party,দয়া করে পার্টির নির্বাচন সামনে পোস্টিং তারিখ নির্বাচন
 apps/erpnext/erpnext/config/accounting.py,Payment Terms based on conditions,শর্তের ভিত্তিতে প্রদানের শর্তাদি
+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: Program Enrollment,School House,স্কুল হাউস
 DocType: Serial No,Out of AMC,এএমসি আউট
 DocType: Opportunity,Opportunity Amount,সুযোগ পরিমাণ
@@ -5556,6 +5557,7 @@
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py,Order/Quot %,ORDER / quot%
 apps/erpnext/erpnext/config/healthcare.py,Record Patient Vitals,রেকর্ড পেশেন্ট Vitals
 DocType: Fee Schedule,Institution,প্রতিষ্ঠান
+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: Asset,Partially Depreciated,আংশিকভাবে মূল্যমান হ্রাস
 DocType: Issue,Opening Time,খোলার সময়
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py,From and To dates required,থেকে এবং প্রয়োজনীয় তারিখগুলি
@@ -5769,6 +5771,7 @@
 DocType: Quality Procedure Process,Link existing Quality Procedure.,বিদ্যমান গুণমানের পদ্ধতিটি লিঙ্ক করুন।
 apps/erpnext/erpnext/config/hr.py,Loans,ঋণ
 DocType: Healthcare Service Unit,Healthcare Service Unit,স্বাস্থ্যসেবা পরিষেবা ইউনিট
+,Customer-wise Item Price,গ্রাহক অনুযায়ী আইটেম দাম
 apps/erpnext/erpnext/public/js/financial_statements.js,Cash Flow Statement,ক্যাশ ফ্লো বিবৃতি
 apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.py,No material request created,কোন উপাদান অনুরোধ তৈরি
 apps/erpnext/erpnext/hr/doctype/loan_application/loan_application.py,Loan Amount cannot exceed Maximum Loan Amount of {0},ঋণের পরিমাণ সর্বোচ্চ ঋণের পরিমাণ বেশি হতে পারে না {0}
@@ -6028,6 +6031,7 @@
 apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py,Opening Value,খোলা মূল্য
 DocType: Salary Component,Formula,সূত্র
 apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py,Serial #,সিরিয়াল #
+apps/erpnext/erpnext/hr/doctype/employee/employee.py,Please setup Employee Naming System in Human Resource &gt; HR Settings,মানব সম্পদ&gt; এইচআর সেটিংসে কর্মচারী নামকরণ সিস্টেম সেটআপ করুন
 DocType: Material Request Plan Item,Required Quantity,প্রয়োজনীয় পরিমাণ
 DocType: Lab Test Template,Lab Test Template,ল্যাব টেস্ট টেমপ্লেট
 apps/erpnext/erpnext/setup/doctype/company/company.py,Sales Account,বিক্রয় অ্যাকাউন্ট
@@ -6272,7 +6276,6 @@
 DocType: Request for Quotation Item,Project Name,প্রকল্পের নাম
 apps/erpnext/erpnext/regional/italy/utils.py,Please set the Customer Address,গ্রাহক ঠিকানা সেট করুন
 DocType: Customer,Mention if non-standard receivable account,উল্লেখ অ স্ট্যান্ডার্ড প্রাপ্য তাহলে
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Customer &gt; Customer Group &gt; Territory,গ্রাহক&gt; গ্রাহক গোষ্ঠী&gt; অঞ্চল
 DocType: Bank,Plaid Access Token,প্লেড অ্যাক্সেস টোকেন
 apps/erpnext/erpnext/hr/doctype/employee_benefit_application/employee_benefit_application.py,Please add the remaining benefits {0} to any of the existing component,বিদ্যমান কম্পোনেন্টের যেকোনো একটিতে {1} অবশিষ্ট সুবিধার যোগ করুন
 DocType: Journal Entry Account,If Income or Expense,আয় বা ব্যয় যদি
@@ -6533,8 +6536,6 @@
 apps/erpnext/erpnext/buying/utils.py,Please enter quantity for Item {0},আইটেমের জন্য পরিমাণ লিখুন দয়া করে {0}
 DocType: Quality Procedure,Processes,প্রসেস
 DocType: Shift Type,First Check-in and Last Check-out,প্রথম চেক ইন এবং শেষ চেক আউট
-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/regional/report/hsn_wise_summary_of_outward_supplies/hsn_wise_summary_of_outward_supplies.py,Total Taxable Amount,মোট করযোগ্য পরিমাণ
 DocType: Employee External Work History,Employee External Work History,কর্মচারী বাহ্যিক কাজের ইতিহাস
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.py,Job card {0} created,কাজের কার্ড {0} তৈরি করা হয়েছে
@@ -6570,6 +6571,7 @@
 apps/erpnext/erpnext/accounts/doctype/payment_terms_template/payment_terms_template.py,Combined invoice portion must equal 100%,মিলিত চালান অংশ সমান 100%
 DocType: Item Default,Default Expense Account,ডিফল্ট ব্যায়ের অ্যাকাউন্ট
 DocType: GST Account,CGST Account,CGST অ্যাকাউন্ট
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Item Code &gt; Item Group &gt; Brand,আইটেম কোড&gt; আইটেম গ্রুপ&gt; ব্র্যান্ড
 apps/erpnext/erpnext/education/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py,Student Email ID,স্টুডেন্ট ইমেইল আইডি
 DocType: Employee,Notice (days),নোটিশ (দিন)
 DocType: POS Closing Voucher Invoices,POS Closing Voucher Invoices,পিওস সমাপ্তি ভাউচার ইনভয়েসস
@@ -7202,6 +7204,7 @@
 DocType: Maintenance Visit,Maintenance Date,রক্ষণাবেক্ষণ তারিখ
 DocType: Purchase Invoice Item,Rejected Serial No,প্রত্যাখ্যাত সিরিয়াল কোন
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py,Year start date or end date is overlapping with {0}. To avoid please set company,বছর শুরুর তারিখ বা শেষ তারিখ {0} সঙ্গে ওভারল্যাপিং হয়. এড়ানোর জন্য কোম্পানির সেট দয়া
+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/selling/doctype/customer/customer.py,Please mention the Lead Name in Lead {0},লিডের লিডের নাম উল্লেখ করুন {0}
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py,Start date should be less than end date for Item {0},আইটেম জন্য শেষ তারিখ চেয়ে কম হওয়া উচিত তারিখ শুরু {0}
 DocType: Shift Type,Auto Attendance Settings,স্বয়ংক্রিয় উপস্থিতি সেটিংস
diff --git a/erpnext/translations/bs.csv b/erpnext/translations/bs.csv
index 5d61f3c..2bb6e29 100644
--- a/erpnext/translations/bs.csv
+++ b/erpnext/translations/bs.csv
@@ -168,7 +168,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py,Accountant,Računovođa
 apps/erpnext/erpnext/stock/report/item_price_stock/item_price_stock.py,Selling Price List,Prodajni cjenik
 DocType: Patient,Tobacco Current Use,Upotreba duvana
-apps/erpnext/erpnext/stock/report/item_price_stock/item_price_stock.py,Selling Rate,Prodajna stopa
+apps/erpnext/erpnext/selling/report/customer_wise_item_price/customer_wise_item_price.py,Selling Rate,Prodajna stopa
 apps/erpnext/erpnext/erpnext_integrations/doctype/plaid_settings/plaid_settings.js,Please save your document before adding a new account,Spremite svoj dokument prije dodavanja novog računa
 DocType: Cost Center,Stock User,Stock korisnika
 DocType: Soil Analysis,(Ca+Mg)/K,(Ca + Mg) / K
@@ -205,7 +205,6 @@
 DocType: Packed Item,Parent Detail docname,Roditelj Detalj docname
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py,"Reference: {0}, Item Code: {1} and Customer: {2}","Referenca: {0}, Šifra: {1} i kupaca: {2}"
 apps/erpnext/erpnext/accounts/report/consolidated_financial_statement/consolidated_financial_statement.py,{0} {1} is not present in the parent company,{0} {1} nije prisutan u matičnoj kompaniji
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Supplier &gt; Supplier Type,Dobavljač&gt; vrsta dobavljača
 apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py,Trial Period End Date Cannot be before Trial Period Start Date,Krajnji datum probnog perioda ne može biti pre početka probnog perioda
 apps/erpnext/erpnext/utilities/user_progress.py,Kg,kg
 DocType: Tax Withholding Category,Tax Withholding Category,Kategorija za oduzimanje poreza
@@ -319,6 +318,7 @@
 DocType: Quality Procedure Table,Responsible Individual,Odgovorni pojedinac
 DocType: Naming Series,Prefix,Prefiks
 apps/erpnext/erpnext/hr/notification/training_scheduled/training_scheduled.html,Event Location,Lokacija događaja
+apps/erpnext/erpnext/selling/report/customer_wise_item_price/customer_wise_item_price.py,Available Stock,Dostupne zalihe
 DocType: Asset Settings,Asset Settings,Postavke sredstva
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py,Consumable,Potrošni
 DocType: Student,B-,B-
@@ -351,6 +351,7 @@
 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 \
 				Serial No.",Ne može se osigurati isporuka pomoću serijskog broja dok se \ Item {0} dodaje sa i bez Osiguranje isporuke od \ Serijski broj
+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/accounts/doctype/sales_invoice/sales_invoice.py,At least one mode of payment is required for POS invoice.,Najmanje jedan način plaćanja je potreban za POS računa.
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py,Batch no is required for batched item {0},Za serijski artikal nije potreban serijski broj {0}
 DocType: Bank Statement Transaction Invoice Item,Bank Statement Transaction Invoice Item,Stavka fakture za transakciju iz banke
@@ -874,7 +875,6 @@
 DocType: Vital Signs,Blood Pressure (systolic),Krvni pritisak (sistolni)
 apps/erpnext/erpnext/controllers/buying_controller.py,{0} {1} is {2},{0} {1} je {2}
 DocType: Item Price,Valid Upto,Vrijedi Upto
-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: Training Event,Workshop,radionica
 DocType: Supplier Scorecard Scoring Standing,Warn Purchase Orders,Upozoravajte narudžbenice
 apps/erpnext/erpnext/utilities/user_progress.py,List a few of your customers. They could be organizations or individuals.,Navedite nekoliko svojih kupaca. Oni mogu biti tvrtke ili fizičke osobe.
@@ -1677,7 +1677,6 @@
 DocType: Item Barcode,Item Barcode,Barkod artikla
 DocType: Delivery Trip,In Transit,U prolazu
 DocType: Woocommerce Settings,Endpoints,Krajnje tačke
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Item Code &gt; Item Group &gt; Brand,Kod artikla&gt; Grupa artikala&gt; Marka
 DocType: Shopping Cart Settings,Show Configure Button,Prikaži gumb Konfiguriraj
 DocType: Quality Inspection Reading,Reading 6,Čitanje 6
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js,Cannot {0} {1} {2} without any negative outstanding invoice,Ne mogu {0} {1} {2} bez ikakvih negativnih izuzetan fakture
@@ -2037,6 +2036,7 @@
 DocType: Cheque Print Template,Payer Settings,Payer Postavke
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js,No pending Material Requests found to link for the given items.,Nema traženih materijala koji su pronađeni za povezivanje za date stavke.
 apps/erpnext/erpnext/public/js/utils/party.js,Select company first,Prvo odaberite kompaniju
+apps/erpnext/erpnext/accounts/general_ledger.py,Account: <b>{0}</b> is capital Work in progress and can not be updated by Journal Entry,Račun: <b>{0}</b> je kapital Ne radi se i ne može se ažurirati unos u časopisu
 apps/erpnext/erpnext/education/doctype/quiz/quiz.py,Compare List function takes on list arguments,Funkcija Uporedi listu preuzima argumente liste
 DocType: Item Attribute Value,"This will be appended to the Item Code of the variant. For example, if your abbreviation is ""SM"", and the item code is ""T-SHIRT"", the item code of the variant will be ""T-SHIRT-SM""","Ovo će biti dodan na Šifra za varijantu. Na primjer, ako je vaš skraćenica ""SM"", a stavka kod je ""T-SHIRT"", stavka kod varijante će biti ""T-SHIRT-SM"""
 DocType: Salary Slip,Net Pay (in words) will be visible once you save the Salary Slip.,Neto plaća (riječima) će biti vidljiva nakon što spremite klizne plaće.
@@ -2221,6 +2221,7 @@
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js,Item 2,Stavku 2
 DocType: Pricing Rule,Validate Applied Rule,Potvrdite primijenjeno pravilo
 DocType: QuickBooks Migrator,Authorization Endpoint,Autorizacija Endpoint
+DocType: Employee Onboarding,Notify users by email,Obavijestite korisnike e-poštom
 DocType: Travel Request,International,International
 DocType: Training Event,Training Event,treningu
 DocType: Item,Auto re-order,Autorefiniš reda
@@ -2832,7 +2833,6 @@
 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
-DocType: Contract,Inactive,Neaktivan
 apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.js,This will submit Salary Slips and create accrual Journal Entry. Do you want to proceed?,Ovo će poslati naknade za plate i kreirati obračunski dnevnik. Da li želite da nastavite?
 DocType: Purchase Invoice,Total Net Weight,Ukupna neto težina
 DocType: Purchase Order,Order Confirmation No,Potvrda o porudžbini br
@@ -3108,7 +3108,6 @@
 apps/erpnext/erpnext/accounts/party.py,Billing currency must be equal to either default company's currency or party account currency,Valuta za obračun mora biti jednaka valuti valute kompanije ili valute partijskog računa
 DocType: Packing Slip,Indicates that the package is a part of this delivery (Only Draft),Ukazuje da je paket je dio ove isporuke (samo nacrti)
 apps/erpnext/erpnext/accounts/report/customer_ledger_summary/customer_ledger_summary.py,Closing Balance,Zatvaranje ravnoteže
-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}
 DocType: Soil Texture,Loam,Loam
 apps/erpnext/erpnext/controllers/accounts_controller.py,Row {0}: Due Date cannot be before posting date,Red {0}: Due Date ne može biti pre datuma objavljivanja
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py,Quantity for Item {0} must be less than {1},Količina za točku {0} mora biti manji od {1}
@@ -3632,7 +3631,6 @@
 DocType: Stock Settings,Raise Material Request when stock reaches re-order level,Podignite Materijal Zahtjev kad dionica dosegne ponovno poredak razinu
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py,Full-time,Puno radno vrijeme
 DocType: Payroll Entry,Employees,Zaposleni
-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: Question,Single Correct Answer,Jedan tačan odgovor
 DocType: Employee,Contact Details,Kontakt podaci
 DocType: C-Form,Received Date,Datum pozicija
@@ -4262,6 +4260,7 @@
 DocType: Pricing Rule,Price or Product Discount,Cijena ili popust na proizvod
 apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.py,For row {0}: Enter planned qty,Za red {0}: Unesite planirani broj
 DocType: Account,Income Account,Konto prihoda
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Customer &gt; Customer Group &gt; Territory,Kupac&gt; grupa kupaca&gt; teritorija
 DocType: Payment Request,Amount in customer's currency,Iznos u valuti kupca
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js,Delivery,Isporuka
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.py,Assigning Structures...,Dodjeljivanje struktura ...
@@ -4311,7 +4310,6 @@
 DocType: HR Settings,Check Vacancies On Job Offer Creation,Proverite slobodna radna mesta na izradi ponude posla
 apps/erpnext/erpnext/utilities/user_progress.py,Go to Letterheads,Idite u Letterheads
 DocType: Subscription,Cancel At End Of Period,Otkaži na kraju perioda
-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/hr/doctype/employee_promotion/employee_promotion.js,Property already added,Imovina je već dodata
 DocType: Item Supplier,Item Supplier,Dobavljač artikla
 apps/erpnext/erpnext/public/js/controllers/transaction.js,Please enter Item Code to get batch no,Unesite kod Predmeta da se hrpa nema
@@ -4608,6 +4606,7 @@
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.js,Warning: Material Requested Qty is less than Minimum Order Qty,Upozorenje : Materijal tražena količina manja nego minimalna narudžba kol
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py,Account {0} is frozen,Konto {0} je zamrznut
 DocType: Quiz Question,Quiz Question,Pitanje za kviz
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Supplier &gt; Supplier Type,Dobavljač&gt; vrsta dobavljača
 DocType: Company,Legal Entity / Subsidiary with a separate Chart of Accounts belonging to the Organization.,Pravna osoba / Podružnica sa zasebnim kontnom pripadaju Organizacije.
 DocType: Payment Request,Mute Email,Mute-mail
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py,"Food, Beverage & Tobacco","Hrana , piće i duhan"
@@ -5118,7 +5117,6 @@
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py,Delivery warehouse required for stock item {0},Isporuka skladište potrebno za zaliha stavku {0}
 DocType: Packing Slip,The gross weight of the package. Usually net weight + packaging material weight. (for print),Bruto težina paketa. Obično neto težina + ambalaža težina. (Za tisak)
 DocType: Assessment Plan,Program,program
-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: Accounts Settings,Users with this role are allowed to set frozen accounts and create / modify accounting entries against frozen accounts,Korisnici s ovom ulogom smiju postaviti zamrznute račune i izradu / izmjenu računovodstvenih unosa protiv zamrznutih računa
 ,Project Billing Summary,Sažetak naplate projekta
 DocType: Vital Signs,Cuts,Rezanja
@@ -5367,6 +5365,7 @@
 apps/erpnext/erpnext/quality_management/doctype/quality_review/quality_review_list.js,No Action,Nema akcije
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js,Valuation type charges can not marked as Inclusive,Prijava tip vrednovanja ne može označiti kao Inclusive
 DocType: POS Profile,Update Stock,Ažurirajte Stock
+apps/erpnext/erpnext/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/stock/doctype/packing_slip/packing_slip.js,Different UOM for items will lead to incorrect (Total) Net Weight value. Make sure that Net Weight of each item is in the same UOM.,Različite mjerne jedinice proizvoda će dovesti do ukupne pogrešne neto težine. Budite sigurni da je neto težina svakog proizvoda u istoj mjernoj jedinici.
 DocType: Certification Application,Payment Details,Detalji plaćanja
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py,BOM Rate,BOM Rate
@@ -5470,6 +5469,8 @@
 apps/erpnext/erpnext/accounts/doctype/monthly_distribution/monthly_distribution.py,Percentage Allocation should be equal to 100%,Postotak izdvajanja trebala bi biti jednaka 100 %
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js,Please select Posting Date before selecting Party,Molimo odaberite Datum knjiženja prije izbora stranke
 apps/erpnext/erpnext/config/accounting.py,Payment Terms based on conditions,Uslovi plaćanja na osnovu uslova
+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: Program Enrollment,School House,School House
 DocType: Serial No,Out of AMC,Od AMC
 DocType: Opportunity,Opportunity Amount,Mogućnost Iznos
@@ -5671,6 +5672,7 @@
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py,Order/Quot %,Kako / Quot%
 apps/erpnext/erpnext/config/healthcare.py,Record Patient Vitals,Snimite vitale pacijenta
 DocType: Fee Schedule,Institution,institucija
+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}
 DocType: Asset,Partially Depreciated,Djelomično oslabio
 DocType: Issue,Opening Time,Radno vrijeme
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py,From and To dates required,Od i Do datuma zahtijevanih
@@ -5887,6 +5889,7 @@
 DocType: Quality Procedure Process,Link existing Quality Procedure.,Povežite postojeći postupak kvaliteta.
 apps/erpnext/erpnext/config/hr.py,Loans,Krediti
 DocType: Healthcare Service Unit,Healthcare Service Unit,Jedinica za zdravstvenu zaštitu
+,Customer-wise Item Price,Kupcima prilagođena cijena
 apps/erpnext/erpnext/public/js/financial_statements.js,Cash Flow Statement,Izvještaj o novčanim tokovima
 apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.py,No material request created,Nije napravljen materijalni zahtev
 apps/erpnext/erpnext/hr/doctype/loan_application/loan_application.py,Loan Amount cannot exceed Maximum Loan Amount of {0},Iznos kredita ne može biti veći od Maksimalni iznos kredita od {0}
@@ -6148,6 +6151,7 @@
 apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py,Opening Value,otvaranje vrijednost
 DocType: Salary Component,Formula,formula
 apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py,Serial #,Serial #
+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: Material Request Plan Item,Required Quantity,Tražena količina
 DocType: Lab Test Template,Lab Test Template,Lab test šablon
 apps/erpnext/erpnext/accounts/doctype/accounting_period/accounting_period.py,Accounting Period overlaps with {0},Računovodstveno razdoblje se preklapa sa {0}
@@ -6398,7 +6402,6 @@
 DocType: Request for Quotation Item,Project Name,Naziv projekta
 apps/erpnext/erpnext/regional/italy/utils.py,Please set the Customer Address,Molimo postavite adresu kupca
 DocType: Customer,Mention if non-standard receivable account,Spomenuti ako nestandardni potraživanja račun
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Customer &gt; Customer Group &gt; Territory,Kupac&gt; grupa kupaca&gt; teritorija
 DocType: Bank,Plaid Access Token,Plaid Access Token
 apps/erpnext/erpnext/hr/doctype/employee_benefit_application/employee_benefit_application.py,Please add the remaining benefits {0} to any of the existing component,Dodajte preostale pogodnosti {0} bilo kojoj od postojećih komponenti
 DocType: Journal Entry Account,If Income or Expense,Ako prihoda i rashoda
@@ -6661,8 +6664,6 @@
 apps/erpnext/erpnext/buying/utils.py,Please enter quantity for Item {0},Molimo unesite količinu za točku {0}
 DocType: Quality Procedure,Processes,Procesi
 DocType: Shift Type,First Check-in and Last Check-out,Prva prijava i poslednja odjava
-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/regional/report/hsn_wise_summary_of_outward_supplies/hsn_wise_summary_of_outward_supplies.py,Total Taxable Amount,Ukupan iznos oporezivanja
 DocType: Employee External Work History,Employee External Work History,Istorija rada zaposlenog izvan preduzeća
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.py,Job card {0} created,Kartica za posao {0} kreirana
@@ -6698,6 +6699,7 @@
 apps/erpnext/erpnext/accounts/doctype/payment_terms_template/payment_terms_template.py,Combined invoice portion must equal 100%,Kombinovani deo računa mora biti 100%
 DocType: Item Default,Default Expense Account,Zadani račun rashoda
 DocType: GST Account,CGST Account,CGST nalog
+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/education/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py,Student Email ID,Student-mail ID
 DocType: Employee,Notice (days),Obavijest (dani )
 DocType: POS Closing Voucher Invoices,POS Closing Voucher Invoices,POS zaključavanje vaučera
@@ -7336,6 +7338,7 @@
 DocType: Maintenance Visit,Maintenance Date,Održavanje Datum
 DocType: Purchase Invoice Item,Rejected Serial No,Odbijen Serijski br
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py,Year start date or end date is overlapping with {0}. To avoid please set company,datum početka godine ili datum završetka je preklapaju sa {0}. Da bi se izbjegla molimo vas da postavite kompanija
+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/selling/doctype/customer/customer.py,Please mention the Lead Name in Lead {0},Molim vas da navedete Lead Lead u Lead-u {0}
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py,Start date should be less than end date for Item {0},Početak bi trebao biti manji od krajnjeg datuma za točke {0}
 DocType: Shift Type,Auto Attendance Settings,Postavke automatske posjećenosti
diff --git a/erpnext/translations/ca.csv b/erpnext/translations/ca.csv
index 43566ed..b518dda 100644
--- a/erpnext/translations/ca.csv
+++ b/erpnext/translations/ca.csv
@@ -168,7 +168,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py,Accountant,Accountant
 apps/erpnext/erpnext/stock/report/item_price_stock/item_price_stock.py,Selling Price List,Llista de preus de venda
 DocType: Patient,Tobacco Current Use,Ús del corrent del tabac
-apps/erpnext/erpnext/stock/report/item_price_stock/item_price_stock.py,Selling Rate,Velocitat de venda
+apps/erpnext/erpnext/selling/report/customer_wise_item_price/customer_wise_item_price.py,Selling Rate,Velocitat de venda
 apps/erpnext/erpnext/erpnext_integrations/doctype/plaid_settings/plaid_settings.js,Please save your document before adding a new account,Guardeu el document abans d’afegir un nou compte
 DocType: Cost Center,Stock User,Fotografia de l&#39;usuari
 DocType: Soil Analysis,(Ca+Mg)/K,(Ca + Mg) / K
@@ -205,7 +205,6 @@
 DocType: Packed Item,Parent Detail docname,Docname Detall de Pares
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py,"Reference: {0}, Item Code: {1} and Customer: {2}","Referència: {0}, Codi de l&#39;article: {1} i el Client: {2}"
 apps/erpnext/erpnext/accounts/report/consolidated_financial_statement/consolidated_financial_statement.py,{0} {1} is not present in the parent company,{0} {1} no està present a l&#39;empresa matriu
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Supplier &gt; Supplier Type,Proveïdor&gt; Tipus de proveïdor
 apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py,Trial Period End Date Cannot be before Trial Period Start Date,Període de prova Data de finalització No pot ser abans de la data de començament del període de prova
 apps/erpnext/erpnext/utilities/user_progress.py,Kg,Kg
 DocType: Tax Withholding Category,Tax Withholding Category,Categoria de retenció d&#39;impostos
@@ -319,6 +318,7 @@
 DocType: Quality Procedure Table,Responsible Individual,Individu responsable
 DocType: Naming Series,Prefix,Prefix
 apps/erpnext/erpnext/hr/notification/training_scheduled/training_scheduled.html,Event Location,Ubicació de l&#39;esdeveniment
+apps/erpnext/erpnext/selling/report/customer_wise_item_price/customer_wise_item_price.py,Available Stock,Estoc disponible
 DocType: Asset Settings,Asset Settings,Configuració d&#39;actius
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py,Consumable,Consumible
 DocType: Student,B-,B-
@@ -351,6 +351,7 @@
 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 \
 				Serial No.",No es pot garantir el lliurament per número de sèrie com a \ Article {0} s&#39;afegeix amb i sense Assegurar el lliurament mitjançant \ Número de sèrie
+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/accounts/doctype/sales_invoice/sales_invoice.py,At least one mode of payment is required for POS invoice.,Es requereix com a mínim una manera de pagament de la factura POS.
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py,Batch no is required for batched item {0},No es requereix cap lot per a l&#39;element lots {0}
 DocType: Bank Statement Transaction Invoice Item,Bank Statement Transaction Invoice Item,Estat de la factura de la factura de la transacció bancària
@@ -874,7 +875,6 @@
 DocType: Vital Signs,Blood Pressure (systolic),Pressió sanguínia (sistòlica)
 apps/erpnext/erpnext/controllers/buying_controller.py,{0} {1} is {2},{0} {1} és {2}
 DocType: Item Price,Valid Upto,Vàlid Fins
-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: Training Event,Workshop,Taller
 DocType: Supplier Scorecard Scoring Standing,Warn Purchase Orders,Aviseu comandes de compra
 apps/erpnext/erpnext/utilities/user_progress.py,List a few of your customers. They could be organizations or individuals.,Enumerar alguns dels seus clients. Podrien ser les organitzacions o individus.
@@ -1677,7 +1677,6 @@
 DocType: Item Barcode,Item Barcode,Codi de barres d'article
 DocType: Delivery Trip,In Transit,En trànsit
 DocType: Woocommerce Settings,Endpoints,Punts extrems
-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
 DocType: Shopping Cart Settings,Show Configure Button,Mostra el botó de configuració
 DocType: Quality Inspection Reading,Reading 6,Lectura 6
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js,Cannot {0} {1} {2} without any negative outstanding invoice,No es pot {0} {1} {2} sense cap factura pendent negatiu
@@ -2037,6 +2036,7 @@
 DocType: Cheque Print Template,Payer Settings,Configuració del pagador
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js,No pending Material Requests found to link for the given items.,No s&#39;ha trobat cap sol·licitud de material pendent per enllaçar per als ítems indicats.
 apps/erpnext/erpnext/public/js/utils/party.js,Select company first,Seleccioneu l&#39;empresa primer
+apps/erpnext/erpnext/accounts/general_ledger.py,Account: <b>{0}</b> is capital Work in progress and can not be updated by Journal Entry,Compte: <b>{0}</b> és un treball capital en curs i no pot ser actualitzat per Journal Entry
 apps/erpnext/erpnext/education/doctype/quiz/quiz.py,Compare List function takes on list arguments,La funció de llista Llista té arguments en la llista
 DocType: Item Attribute Value,"This will be appended to the Item Code of the variant. For example, if your abbreviation is ""SM"", and the item code is ""T-SHIRT"", the item code of the variant will be ""T-SHIRT-SM""","Això s'afegeix al Codi de l'article de la variant. Per exemple, si la seva abreviatura és ""SM"", i el codi de l'article és ""samarreta"", el codi de l'article de la variant serà ""SAMARRETA-SM"""
 DocType: Salary Slip,Net Pay (in words) will be visible once you save the Salary Slip.,El sou net (en paraules) serà visible un cop que es guardi la nòmina.
@@ -2221,6 +2221,7 @@
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js,Item 2,Article 2
 DocType: Pricing Rule,Validate Applied Rule,Validar la regla aplicada
 DocType: QuickBooks Migrator,Authorization Endpoint,Endpoint d&#39;autorització
+DocType: Employee Onboarding,Notify users by email,Aviseu els usuaris per correu electrònic
 DocType: Travel Request,International,Internacional
 DocType: Training Event,Training Event,Esdeveniment de Capacitació
 DocType: Item,Auto re-order,Acte reordenar
@@ -2832,7 +2833,6 @@
 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
-DocType: Contract,Inactive,Inactiu
 apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.js,This will submit Salary Slips and create accrual Journal Entry. Do you want to proceed?,Això enviarà Slips salarials i crear ingressos de periodificació acumulats. Voleu continuar?
 DocType: Purchase Invoice,Total Net Weight,Pes net total
 DocType: Purchase Order,Order Confirmation No,Confirmació d&#39;ordre no
@@ -3109,7 +3109,6 @@
 apps/erpnext/erpnext/accounts/party.py,Billing currency must be equal to either default company's currency or party account currency,La moneda de facturació ha de ser igual a la moneda de la companyia per defecte o la moneda del compte de partit
 DocType: Packing Slip,Indicates that the package is a part of this delivery (Only Draft),Indica que el paquet és una part d'aquest lliurament (Només Projecte)
 apps/erpnext/erpnext/accounts/report/customer_ledger_summary/customer_ledger_summary.py,Closing Balance,Balanç de cloenda
-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}
 DocType: Soil Texture,Loam,Loam
 apps/erpnext/erpnext/controllers/accounts_controller.py,Row {0}: Due Date cannot be before posting date,Fila {0}: data de venciment no pot ser abans de la data de publicació
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py,Quantity for Item {0} must be less than {1},Quantitat d'articles per {0} ha de ser menor de {1}
@@ -3633,7 +3632,6 @@
 DocType: Stock Settings,Raise Material Request when stock reaches re-order level,Llevant Sol·licitud de material quan l'acció arriba al nivell de re-ordre
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py,Full-time,Temps complet
 DocType: Payroll Entry,Employees,empleats
-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: Question,Single Correct Answer,Resposta única i correcta
 DocType: Employee,Contact Details,Detalls de contacte
 DocType: C-Form,Received Date,Data de recepció
@@ -4264,6 +4262,7 @@
 DocType: Pricing Rule,Price or Product Discount,Preu o descompte del producte
 apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.py,For row {0}: Enter planned qty,Per a la fila {0}: introduïu el qty planificat
 DocType: Account,Income Account,Compte d'ingressos
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Customer &gt; Customer Group &gt; Territory,Client&gt; Grup de clients&gt; Territori
 DocType: Payment Request,Amount in customer's currency,Suma de la moneda del client
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js,Delivery,Lliurament
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.py,Assigning Structures...,Assignació d&#39;estructures ...
@@ -4313,7 +4312,6 @@
 DocType: HR Settings,Check Vacancies On Job Offer Creation,Comproveu les vacants en la creació d’oferta de feina
 apps/erpnext/erpnext/utilities/user_progress.py,Go to Letterheads,Aneu als membres
 DocType: Subscription,Cancel At End Of Period,Cancel·la al final de període
-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/hr/doctype/employee_promotion/employee_promotion.js,Property already added,La propietat ja s&#39;ha afegit
 DocType: Item Supplier,Item Supplier,Article Proveïdor
 apps/erpnext/erpnext/public/js/controllers/transaction.js,Please enter Item Code to get batch no,"Si us plau, introduïu el codi d'article per obtenir lots no"
@@ -4610,6 +4608,7 @@
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.js,Warning: Material Requested Qty is less than Minimum Order Qty,Advertència: La quantitat de Material sol·licitada és inferior a la Quantitat mínima
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py,Account {0} is frozen,El compte {0} està bloquejat
 DocType: Quiz Question,Quiz Question,Pregunta del qüestionari
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Supplier &gt; Supplier Type,Proveïdor&gt; Tipus de proveïdor
 DocType: Company,Legal Entity / Subsidiary with a separate Chart of Accounts belonging to the Organization.,Entitat Legal / Subsidiari amb un gràfic separat de comptes que pertanyen a l'Organització.
 DocType: Payment Request,Mute Email,Silenciar-mail
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py,"Food, Beverage & Tobacco","Alimentació, begudes i tabac"
@@ -5120,7 +5119,6 @@
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py,Delivery warehouse required for stock item {0},Magatzem de lliurament requerit per tema de valors {0}
 DocType: Packing Slip,The gross weight of the package. Usually net weight + packaging material weight. (for print),"El pes brut del paquet. En general, el pes net + embalatge pes del material. (Per imprimir)"
 DocType: Assessment Plan,Program,programa
-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: Accounts Settings,Users with this role are allowed to set frozen accounts and create / modify accounting entries against frozen accounts,Els usuaris amb aquest rol poden establir comptes bloquejats i crear/modificar els assentaments comptables contra els comptes bloquejats
 ,Project Billing Summary,Resum de facturació del projecte
 DocType: Vital Signs,Cuts,Retalls
@@ -5369,6 +5367,7 @@
 apps/erpnext/erpnext/quality_management/doctype/quality_review/quality_review_list.js,No Action,Sense acció
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js,Valuation type charges can not marked as Inclusive,Càrrecs de tipus de valoració no poden marcat com Inclòs
 DocType: POS Profile,Update Stock,Actualització de Stock
+apps/erpnext/erpnext/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/stock/doctype/packing_slip/packing_slip.js,Different UOM for items will lead to incorrect (Total) Net Weight value. Make sure that Net Weight of each item is in the same UOM.,UDMs diferents per als articles provocarà pesos nets (Total) erronis. Assegureu-vos que pes net de cada article és de la mateixa UDM.
 DocType: Certification Application,Payment Details,Detalls del pagament
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py,BOM Rate,BOM Rate
@@ -5472,6 +5471,8 @@
 apps/erpnext/erpnext/accounts/doctype/monthly_distribution/monthly_distribution.py,Percentage Allocation should be equal to 100%,Percentatge d'assignació ha de ser igual a 100%
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js,Please select Posting Date before selecting Party,Seleccioneu Data d&#39;entrada abans de seleccionar la festa
 apps/erpnext/erpnext/config/accounting.py,Payment Terms based on conditions,Condicions de pagament en funció de les condicions
+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: Program Enrollment,School House,Casa de l&#39;escola
 DocType: Serial No,Out of AMC,Fora d'AMC
 DocType: Opportunity,Opportunity Amount,Import de l&#39;oportunitat
@@ -5674,6 +5675,7 @@
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py,Order/Quot %,Comanda / quot%
 apps/erpnext/erpnext/config/healthcare.py,Record Patient Vitals,Registre Vitals del pacient
 DocType: Fee Schedule,Institution,institució
+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}
 DocType: Asset,Partially Depreciated,parcialment depreciables
 DocType: Issue,Opening Time,Temps d'obertura
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py,From and To dates required,Des i Fins a la data sol·licitada
@@ -5890,6 +5892,7 @@
 DocType: Quality Procedure Process,Link existing Quality Procedure.,Enllaça el procediment de qualitat existent.
 apps/erpnext/erpnext/config/hr.py,Loans,Préstecs
 DocType: Healthcare Service Unit,Healthcare Service Unit,Unitat de serveis sanitaris
+,Customer-wise Item Price,Preu de l’article en relació amb el client
 apps/erpnext/erpnext/public/js/financial_statements.js,Cash Flow Statement,Estat de fluxos d&#39;efectiu
 apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.py,No material request created,No s&#39;ha creat cap sol·licitud de material
 apps/erpnext/erpnext/hr/doctype/loan_application/loan_application.py,Loan Amount cannot exceed Maximum Loan Amount of {0},Suma del préstec no pot excedir quantitat màxima del préstec de {0}
@@ -6151,6 +6154,7 @@
 apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py,Opening Value,Valor d&#39;obertura
 DocType: Salary Component,Formula,fórmula
 apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py,Serial #,Serial #
+apps/erpnext/erpnext/hr/doctype/employee/employee.py,Please setup Employee Naming System in Human Resource &gt; HR Settings,Configureu un sistema de nominació dels empleats a Recursos humans&gt; Configuració de recursos humans
 DocType: Material Request Plan Item,Required Quantity,Quantitat necessària
 DocType: Lab Test Template,Lab Test Template,Plantilla de prova de laboratori
 apps/erpnext/erpnext/accounts/doctype/accounting_period/accounting_period.py,Accounting Period overlaps with {0},El període de comptabilitat es superposa amb {0}
@@ -6401,7 +6405,6 @@
 DocType: Request for Quotation Item,Project Name,Nom del projecte
 apps/erpnext/erpnext/regional/italy/utils.py,Please set the Customer Address,Definiu l&#39;adreça del client
 DocType: Customer,Mention if non-standard receivable account,Esmenteu si compta per cobrar no estàndard
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Customer &gt; Customer Group &gt; Territory,Client&gt; Grup de clients&gt; Territori
 DocType: Bank,Plaid Access Token,Fitxa d&#39;accés a escoces
 apps/erpnext/erpnext/hr/doctype/employee_benefit_application/employee_benefit_application.py,Please add the remaining benefits {0} to any of the existing component,Afegiu els beneficis restants {0} a qualsevol dels components existents
 DocType: Journal Entry Account,If Income or Expense,Si ingressos o despeses
@@ -6664,8 +6667,6 @@
 apps/erpnext/erpnext/buying/utils.py,Please enter quantity for Item {0},Introduïu la quantitat d'articles per {0}
 DocType: Quality Procedure,Processes,Processos
 DocType: Shift Type,First Check-in and Last Check-out,Primera entrada i darrera sortida
-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/regional/report/hsn_wise_summary_of_outward_supplies/hsn_wise_summary_of_outward_supplies.py,Total Taxable Amount,Import total impost
 DocType: Employee External Work History,Employee External Work History,Historial de treball d'Empleat extern
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.py,Job card {0} created,S&#39;ha creat la targeta de treball {0}
@@ -6701,6 +6702,7 @@
 apps/erpnext/erpnext/accounts/doctype/payment_terms_template/payment_terms_template.py,Combined invoice portion must equal 100%,La part de facturació combinada ha de ser igual al 100%
 DocType: Item Default,Default Expense Account,Compte de Despeses predeterminat
 DocType: GST Account,CGST Account,Compte CGST
+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/education/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py,Student Email ID,Estudiant ID de correu electrònic
 DocType: Employee,Notice (days),Avís (dies)
 DocType: POS Closing Voucher Invoices,POS Closing Voucher Invoices,Factures de vals de tancament de punt de venda
@@ -7339,6 +7341,7 @@
 DocType: Maintenance Visit,Maintenance Date,Manteniment Data
 DocType: Purchase Invoice Item,Rejected Serial No,Número de sèrie Rebutjat
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py,Year start date or end date is overlapping with {0}. To avoid please set company,"Any d'inici o any finalització es solapa amb {0}. Per evitar, configuri l'empresa"
+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/selling/doctype/customer/customer.py,Please mention the Lead Name in Lead {0},"Si us plau, mencioneu el nom principal al client {0}"
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py,Start date should be less than end date for Item {0},La data d'inici ha de ser anterior a la data de finalització per l'article {0}
 DocType: Shift Type,Auto Attendance Settings,Configuració d&#39;assistència automàtica
diff --git a/erpnext/translations/cs.csv b/erpnext/translations/cs.csv
index bc79d33..0015c7f 100644
--- a/erpnext/translations/cs.csv
+++ b/erpnext/translations/cs.csv
@@ -167,7 +167,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py,Accountant,Účetní
 apps/erpnext/erpnext/stock/report/item_price_stock/item_price_stock.py,Selling Price List,Prodejní ceník
 DocType: Patient,Tobacco Current Use,Aktuální tabákové použití
-apps/erpnext/erpnext/stock/report/item_price_stock/item_price_stock.py,Selling Rate,Prodejní sazba
+apps/erpnext/erpnext/selling/report/customer_wise_item_price/customer_wise_item_price.py,Selling Rate,Prodejní sazba
 apps/erpnext/erpnext/erpnext_integrations/doctype/plaid_settings/plaid_settings.js,Please save your document before adding a new account,Před přidáním nového účtu uložte dokument
 DocType: Cost Center,Stock User,Sklad Uživatel
 DocType: Soil Analysis,(Ca+Mg)/K,(Ca + Mg) / K
@@ -204,7 +204,6 @@
 DocType: Packed Item,Parent Detail docname,Parent Detail docname
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py,"Reference: {0}, Item Code: {1} and Customer: {2}","Odkaz: {0}, kód položky: {1} a zákazník: {2}"
 apps/erpnext/erpnext/accounts/report/consolidated_financial_statement/consolidated_financial_statement.py,{0} {1} is not present in the parent company,{0} {1} není v mateřské společnosti
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Supplier &gt; Supplier Type,Dodavatel&gt; Typ dodavatele
 apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py,Trial Period End Date Cannot be before Trial Period Start Date,Datum ukončení zkušebního období nemůže být před datem zahájení zkušebního období
 apps/erpnext/erpnext/utilities/user_progress.py,Kg,Kg
 DocType: Tax Withholding Category,Tax Withholding Category,Daňové zadržení kategorie
@@ -318,6 +317,7 @@
 DocType: Quality Procedure Table,Responsible Individual,Odpovědná osoba
 DocType: Naming Series,Prefix,Prefix
 apps/erpnext/erpnext/hr/notification/training_scheduled/training_scheduled.html,Event Location,Umístění události
+apps/erpnext/erpnext/selling/report/customer_wise_item_price/customer_wise_item_price.py,Available Stock,Dostupné skladem
 DocType: Asset Settings,Asset Settings,Nastavení aktiv
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py,Consumable,Spotřební
 DocType: Student,B-,B-
@@ -350,6 +350,7 @@
 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 \
 				Serial No.","Nelze zajistit dodávku podle sériového čísla, protože je přidána položka {0} se službou Zajistit dodání podle \ sériového čísla"
+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/accounts/doctype/sales_invoice/sales_invoice.py,At least one mode of payment is required for POS invoice.,pro POS fakturu je nutná alespoň jeden způsob platby.
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py,Batch no is required for batched item {0},Šarže č. Je vyžadována pro dávkovou položku {0}
 DocType: Bank Statement Transaction Invoice Item,Bank Statement Transaction Invoice Item,Položka faktury bankovního výpisu
@@ -873,7 +874,6 @@
 DocType: Vital Signs,Blood Pressure (systolic),Krevní tlak (systolický)
 apps/erpnext/erpnext/controllers/buying_controller.py,{0} {1} is {2},{0} {1} je {2}
 DocType: Item Price,Valid Upto,Valid aľ
-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: Training Event,Workshop,Dílna
 DocType: Supplier Scorecard Scoring Standing,Warn Purchase Orders,Upozornění na nákupní objednávky
 apps/erpnext/erpnext/utilities/user_progress.py,List a few of your customers. They could be organizations or individuals.,Seznam několik svých zákazníků. Ty by mohly být organizace nebo jednotlivci.
@@ -1676,7 +1676,6 @@
 DocType: Item Barcode,Item Barcode,Položka Barcode
 DocType: Delivery Trip,In Transit,V tranzitu
 DocType: Woocommerce Settings,Endpoints,Koncové body
-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
 DocType: Shopping Cart Settings,Show Configure Button,Zobrazit tlačítko Konfigurovat
 DocType: Quality Inspection Reading,Reading 6,Čtení 6
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js,Cannot {0} {1} {2} without any negative outstanding invoice,Nelze {0} {1} {2} bez negativních vynikající faktura
@@ -2036,6 +2035,7 @@
 DocType: Cheque Print Template,Payer Settings,Nastavení plátce
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js,No pending Material Requests found to link for the given items.,Žádná nevyřízená žádost o materiál nebyla nalezena k odkazu na dané položky.
 apps/erpnext/erpnext/public/js/utils/party.js,Select company first,Nejprve vyberte společnost
+apps/erpnext/erpnext/accounts/general_ledger.py,Account: <b>{0}</b> is capital Work in progress and can not be updated by Journal Entry,Účet: <b>{0}</b> je kapitál Probíhá zpracování a nelze jej aktualizovat zápisem do deníku
 apps/erpnext/erpnext/education/doctype/quiz/quiz.py,Compare List function takes on list arguments,Funkce Porovnání seznamu přebírá argumenty seznamu
 DocType: Item Attribute Value,"This will be appended to the Item Code of the variant. For example, if your abbreviation is ""SM"", and the item code is ""T-SHIRT"", the item code of the variant will be ""T-SHIRT-SM""","To bude připojen na položku zákoníku varianty. Například, pokud vaše zkratka je ""SM"", a položka je kód ""T-SHIRT"", položka kód varianty bude ""T-SHIRT-SM"""
 DocType: Salary Slip,Net Pay (in words) will be visible once you save the Salary Slip.,"Čistá Pay (slovy) budou viditelné, jakmile uložíte výplatní pásce."
@@ -2220,6 +2220,7 @@
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js,Item 2,Položka 2
 DocType: Pricing Rule,Validate Applied Rule,Ověřte použité pravidlo
 DocType: QuickBooks Migrator,Authorization Endpoint,Autorizační koncový bod
+DocType: Employee Onboarding,Notify users by email,Upozornit uživatele e-mailem
 DocType: Travel Request,International,Mezinárodní
 DocType: Training Event,Training Event,Training Event
 DocType: Item,Auto re-order,Automatické znovuobjednání
@@ -2831,7 +2832,6 @@
 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
-DocType: Contract,Inactive,Neaktivní
 apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.js,This will submit Salary Slips and create accrual Journal Entry. Do you want to proceed?,Tím bude předkládán výplatní pásky a vytvářet záznamy časového rozvrhu. Chcete pokračovat?
 DocType: Purchase Invoice,Total Net Weight,Celková čistá hmotnost
 DocType: Purchase Order,Order Confirmation No,Potvrzení objednávky č
@@ -3108,7 +3108,6 @@
 apps/erpnext/erpnext/accounts/party.py,Billing currency must be equal to either default company's currency or party account currency,Měna fakturace se musí rovnat buď měně výchozí měny nebo měně stran účtu
 DocType: Packing Slip,Indicates that the package is a part of this delivery (Only Draft),"Označuje, že balíček je součástí této dodávky (Pouze návrhu)"
 apps/erpnext/erpnext/accounts/report/customer_ledger_summary/customer_ledger_summary.py,Closing Balance,Konečný zůstatek
-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}
 DocType: Soil Texture,Loam,Hlína
 apps/erpnext/erpnext/controllers/accounts_controller.py,Row {0}: Due Date cannot be before posting date,Řádek {0}: K datu splatnosti nemůže být datum odeslání
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py,Quantity for Item {0} must be less than {1},Množství k bodu {0} musí být menší než {1}
@@ -3632,7 +3631,6 @@
 DocType: Stock Settings,Raise Material Request when stock reaches re-order level,Zvýšit Materiál vyžádání při stock dosáhne úrovně re-order
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py,Full-time,Na plný úvazek
 DocType: Payroll Entry,Employees,zaměstnanci
-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: Question,Single Correct Answer,Jedna správná odpověď
 DocType: Employee,Contact Details,Kontaktní údaje
 DocType: C-Form,Received Date,Datum přijetí
@@ -4263,6 +4261,7 @@
 DocType: Pricing Rule,Price or Product Discount,Cena nebo sleva produktu
 apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.py,For row {0}: Enter planned qty,Pro řádek {0}: Zadejte plánované množství
 DocType: Account,Income Account,Účet příjmů
+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: Payment Request,Amount in customer's currency,Částka v měně zákazníka
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js,Delivery,Dodávka
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.py,Assigning Structures...,Přiřazení struktur ...
@@ -4312,7 +4311,6 @@
 DocType: HR Settings,Check Vacancies On Job Offer Creation,Zkontrolujte volná místa při vytváření pracovních nabídek
 apps/erpnext/erpnext/utilities/user_progress.py,Go to Letterheads,Přejděte na Letterheads
 DocType: Subscription,Cancel At End Of Period,Zrušit na konci období
-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/hr/doctype/employee_promotion/employee_promotion.js,Property already added,Vlastnictví již bylo přidáno
 DocType: Item Supplier,Item Supplier,Položka Dodavatel
 apps/erpnext/erpnext/public/js/controllers/transaction.js,Please enter Item Code to get batch no,"Prosím, zadejte kód položky se dostat dávku no"
@@ -4609,6 +4607,7 @@
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.js,Warning: Material Requested Qty is less than Minimum Order Qty,Upozornění: Materiál Požadované množství je menší než minimální objednávka Množství
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py,Account {0} is frozen,Účet {0} je zmrazen
 DocType: Quiz Question,Quiz Question,Kvízová otázka
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Supplier &gt; Supplier Type,Dodavatel&gt; Typ dodavatele
 DocType: Company,Legal Entity / Subsidiary with a separate Chart of Accounts belonging to the Organization.,"Právní subjekt / dceřiná společnost s oddělenou Graf účtů, které patří do organizace."
 DocType: Payment Request,Mute Email,Mute Email
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py,"Food, Beverage & Tobacco","Potraviny, nápoje a tabák"
@@ -5119,7 +5118,6 @@
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py,Delivery warehouse required for stock item {0},Dodávka sklad potřebný pro živočišnou položku {0}
 DocType: Packing Slip,The gross weight of the package. Usually net weight + packaging material weight. (for print),Celková hmotnost balení. Obvykle se čistá hmotnost + obalového materiálu hmotnosti. (Pro tisk)
 DocType: Assessment Plan,Program,Program
-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: Accounts Settings,Users with this role are allowed to set frozen accounts and create / modify accounting entries against frozen accounts,Uživatelé s touto rolí se mohou nastavit na zmrazené účty a vytvořit / upravit účetní zápisy proti zmrazených účtů
 ,Project Billing Summary,Přehled fakturace projektu
 DocType: Vital Signs,Cuts,Řezy
@@ -5367,6 +5365,7 @@
 apps/erpnext/erpnext/quality_management/doctype/quality_review/quality_review_list.js,No Action,Žádná akce
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js,Valuation type charges can not marked as Inclusive,Poplatky typu ocenění může není označen jako Inclusive
 DocType: POS Profile,Update Stock,Aktualizace skladem
+apps/erpnext/erpnext/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/stock/doctype/packing_slip/packing_slip.js,Different UOM for items will lead to incorrect (Total) Net Weight value. Make sure that Net Weight of each item is in the same UOM.,"Různé UOM položky povede k nesprávné (celkem) Čistá hmotnost hodnoty. Ujistěte se, že čistá hmotnost každé položky je ve stejném nerozpuštěných."
 DocType: Certification Application,Payment Details,Platební údaje
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py,BOM Rate,BOM Rate
@@ -5470,6 +5469,8 @@
 apps/erpnext/erpnext/accounts/doctype/monthly_distribution/monthly_distribution.py,Percentage Allocation should be equal to 100%,Podíl alokace by měla být ve výši 100%
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js,Please select Posting Date before selecting Party,"Prosím, vyberte Datum zveřejnění před výběrem Party"
 apps/erpnext/erpnext/config/accounting.py,Payment Terms based on conditions,Platební podmínky na základě podmínek
+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: Program Enrollment,School House,School House
 DocType: Serial No,Out of AMC,Out of AMC
 DocType: Opportunity,Opportunity Amount,Částka příležitostí
@@ -5671,6 +5672,7 @@
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py,Order/Quot %,Objednávka / kvóta%
 apps/erpnext/erpnext/config/healthcare.py,Record Patient Vitals,Zaznamenejte vitál pacientů
 DocType: Fee Schedule,Institution,Instituce
+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}
 DocType: Asset,Partially Depreciated,částečně odepisována
 DocType: Issue,Opening Time,Otevírací doba
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py,From and To dates required,Data OD a DO jsou vyžadována
@@ -5887,6 +5889,7 @@
 DocType: Quality Procedure Process,Link existing Quality Procedure.,Propojte stávající postup kvality.
 apps/erpnext/erpnext/config/hr.py,Loans,Půjčky
 DocType: Healthcare Service Unit,Healthcare Service Unit,Jednotka zdravotnických služeb
+,Customer-wise Item Price,Cena předmětu podle přání zákazníka
 apps/erpnext/erpnext/public/js/financial_statements.js,Cash Flow Statement,Přehled o peněžních tocích
 apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.py,No material request created,Žádná materiálová žádost nebyla vytvořena
 apps/erpnext/erpnext/hr/doctype/loan_application/loan_application.py,Loan Amount cannot exceed Maximum Loan Amount of {0},Výše úvěru nesmí být vyšší než Maximální výše úvěru částku {0}
@@ -6148,6 +6151,7 @@
 apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py,Opening Value,otevření Value
 DocType: Salary Component,Formula,Vzorec
 apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py,Serial #,Serial #
+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: Material Request Plan Item,Required Quantity,Požadované množství
 DocType: Lab Test Template,Lab Test Template,Šablona zkušebního laboratoře
 apps/erpnext/erpnext/accounts/doctype/accounting_period/accounting_period.py,Accounting Period overlaps with {0},Účetní období se překrývá s {0}
@@ -6398,7 +6402,6 @@
 DocType: Request for Quotation Item,Project Name,Název projektu
 apps/erpnext/erpnext/regional/italy/utils.py,Please set the Customer Address,Nastavte prosím zákaznickou adresu
 DocType: Customer,Mention if non-standard receivable account,Zmínka v případě nestandardní pohledávky účet
-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: Bank,Plaid Access Token,Plaid Access Token
 apps/erpnext/erpnext/hr/doctype/employee_benefit_application/employee_benefit_application.py,Please add the remaining benefits {0} to any of the existing component,Přidejte zbývající výhody {0} do kterékoli existující komponenty
 DocType: Journal Entry Account,If Income or Expense,Pokud je výnos nebo náklad
@@ -6661,8 +6664,6 @@
 apps/erpnext/erpnext/buying/utils.py,Please enter quantity for Item {0},"Zadejte prosím množství produktů, bod {0}"
 DocType: Quality Procedure,Processes,Procesy
 DocType: Shift Type,First Check-in and Last Check-out,První check-in a poslední check-out
-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/regional/report/hsn_wise_summary_of_outward_supplies/hsn_wise_summary_of_outward_supplies.py,Total Taxable Amount,Celková zdanitelná částka
 DocType: Employee External Work History,Employee External Work History,Zaměstnanec vnější práce History
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.py,Job card {0} created,Byla vytvořena karta {0}
@@ -6698,6 +6699,7 @@
 apps/erpnext/erpnext/accounts/doctype/payment_terms_template/payment_terms_template.py,Combined invoice portion must equal 100%,Kombinovaná část faktury se musí rovnat 100%
 DocType: Item Default,Default Expense Account,Výchozí výdajový účet
 DocType: GST Account,CGST Account,CGST účet
+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/education/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py,Student Email ID,Student ID e-mailu
 DocType: Employee,Notice (days),Oznámení (dny)
 DocType: POS Closing Voucher Invoices,POS Closing Voucher Invoices,Pokladní doklady POS
@@ -7336,6 +7338,7 @@
 DocType: Maintenance Visit,Maintenance Date,Datum údržby
 DocType: Purchase Invoice Item,Rejected Serial No,Odmítnuté sériové číslo
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py,Year start date or end date is overlapping with {0}. To avoid please set company,Rok datum zahájení nebo ukončení se překrývá s {0}. Aby se zabránilo nastavte firmu
+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/selling/doctype/customer/customer.py,Please mention the Lead Name in Lead {0},Uvedete prosím vedoucí jméno ve vedoucím {0}
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py,Start date should be less than end date for Item {0},Datum zahájení by měla být menší než konečné datum pro bod {0}
 DocType: Shift Type,Auto Attendance Settings,Nastavení automatické účasti
diff --git a/erpnext/translations/da.csv b/erpnext/translations/da.csv
index f85b87e..e2eac5d 100644
--- a/erpnext/translations/da.csv
+++ b/erpnext/translations/da.csv
@@ -168,7 +168,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py,Accountant,Revisor
 apps/erpnext/erpnext/stock/report/item_price_stock/item_price_stock.py,Selling Price List,Salgsprisliste
 DocType: Patient,Tobacco Current Use,Tobaks nuværende anvendelse
-apps/erpnext/erpnext/stock/report/item_price_stock/item_price_stock.py,Selling Rate,Salgspris
+apps/erpnext/erpnext/selling/report/customer_wise_item_price/customer_wise_item_price.py,Selling Rate,Salgspris
 apps/erpnext/erpnext/erpnext_integrations/doctype/plaid_settings/plaid_settings.js,Please save your document before adding a new account,"Gem dit dokument, før du tilføjer en ny konto"
 DocType: Cost Center,Stock User,Lagerbruger
 DocType: Soil Analysis,(Ca+Mg)/K,(Ca + Mg) / K
@@ -205,7 +205,6 @@
 DocType: Packed Item,Parent Detail docname,Parent Detail docname
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py,"Reference: {0}, Item Code: {1} and Customer: {2}","Reference: {0}, varekode: {1} og kunde: {2}"
 apps/erpnext/erpnext/accounts/report/consolidated_financial_statement/consolidated_financial_statement.py,{0} {1} is not present in the parent company,{0} {1} er ikke til stede i moderselskabet
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Supplier &gt; Supplier Type,Leverandør&gt; Leverandørtype
 apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py,Trial Period End Date Cannot be before Trial Period Start Date,Prøveperiode Slutdato kan ikke være før startperiode for prøveperiode
 apps/erpnext/erpnext/utilities/user_progress.py,Kg,Kg
 DocType: Tax Withholding Category,Tax Withholding Category,Skat tilbageholdende kategori
@@ -319,6 +318,7 @@
 DocType: Quality Procedure Table,Responsible Individual,Ansvarlig person
 DocType: Naming Series,Prefix,Præfiks
 apps/erpnext/erpnext/hr/notification/training_scheduled/training_scheduled.html,Event Location,Event Location
+apps/erpnext/erpnext/selling/report/customer_wise_item_price/customer_wise_item_price.py,Available Stock,Tilgængelig lager
 DocType: Asset Settings,Asset Settings,Aktiver instilligner
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py,Consumable,Forbrugsmaterialer
 DocType: Student,B-,B-
@@ -351,6 +351,7 @@
 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 \
 				Serial No.",Kan ikke sikre levering med serienummer som \ Item {0} tilføjes med og uden Sikre Levering med \ Serienr.
+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/accounts/doctype/sales_invoice/sales_invoice.py,At least one mode of payment is required for POS invoice.,Mindst én form for betaling er nødvendig for POS faktura.
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py,Batch no is required for batched item {0},Batch nr er påkrævet for batch vare {0}
 DocType: Bank Statement Transaction Invoice Item,Bank Statement Transaction Invoice Item,Bankoversigt Transaktionsfaktura
@@ -874,7 +875,6 @@
 DocType: Vital Signs,Blood Pressure (systolic),Blodtryk (systolisk)
 apps/erpnext/erpnext/controllers/buying_controller.py,{0} {1} is {2},{0} {1} er {2}
 DocType: Item Price,Valid Upto,Gyldig til
-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: Training Event,Workshop,Værksted
 DocType: Supplier Scorecard Scoring Standing,Warn Purchase Orders,Advarer indkøbsordrer
 apps/erpnext/erpnext/utilities/user_progress.py,List a few of your customers. They could be organizations or individuals.,Nævn et par af dine kunder. Disse kunne være firmaer eller privatpersoner.
@@ -1658,7 +1658,6 @@
 DocType: Item Barcode,Item Barcode,Item Barcode
 DocType: Delivery Trip,In Transit,Undervejs
 DocType: Woocommerce Settings,Endpoints,endpoints
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Item Code &gt; Item Group &gt; Brand,Varekode&gt; Varegruppe&gt; Mærke
 DocType: Shopping Cart Settings,Show Configure Button,Vis konfigurationsknap
 DocType: Quality Inspection Reading,Reading 6,Læsning 6
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js,Cannot {0} {1} {2} without any negative outstanding invoice,Kan ikke {0} {1} {2} uden nogen negativ udestående faktura
@@ -2018,6 +2017,7 @@
 DocType: Cheque Print Template,Payer Settings,payer Indstillinger
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js,No pending Material Requests found to link for the given items.,Ingen afventer materialeanmodninger fundet for at linke for de givne varer.
 apps/erpnext/erpnext/public/js/utils/party.js,Select company first,Vælg firma først
+apps/erpnext/erpnext/accounts/general_ledger.py,Account: <b>{0}</b> is capital Work in progress and can not be updated by Journal Entry,Konto: <b>{0}</b> er kapital Arbejde pågår og kan ikke opdateres af journalindtastning
 apps/erpnext/erpnext/education/doctype/quiz/quiz.py,Compare List function takes on list arguments,Funktionen Sammenlign liste tager listeargumenter på
 DocType: Item Attribute Value,"This will be appended to the Item Code of the variant. For example, if your abbreviation is ""SM"", and the item code is ""T-SHIRT"", the item code of the variant will be ""T-SHIRT-SM""","Dette vil blive føjet til varen af varianten. For eksempel, hvis dit forkortelse er ""SM"", og varenummeret er ""T-SHIRT"", så vil variantens varenummer blive ""T-SHIRT-SM"""
 DocType: Salary Slip,Net Pay (in words) will be visible once you save the Salary Slip.,"Nettoløn (i ord) vil være synlig, når du gemmer lønsedlen."
@@ -2202,6 +2202,7 @@
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js,Item 2,Vare 2
 DocType: Pricing Rule,Validate Applied Rule,Valider den anvendte regel
 DocType: QuickBooks Migrator,Authorization Endpoint,Autorisation endepunkt
+DocType: Employee Onboarding,Notify users by email,Underret brugerne via e-mail
 DocType: Travel Request,International,International
 DocType: Training Event,Training Event,Træning begivenhed
 DocType: Item,Auto re-order,Auto genbestil
@@ -2812,7 +2813,6 @@
 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
-DocType: Contract,Inactive,inaktive
 apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.js,This will submit Salary Slips and create accrual Journal Entry. Do you want to proceed?,Dette vil indgive Lønningslister og skabe periodiseringsjournalindtastning. Vil du fortsætte?
 DocType: Purchase Invoice,Total Net Weight,Samlet nettovægt
 DocType: Purchase Order,Order Confirmation No,Bekræftelsesbekendtgørelse nr
@@ -3089,7 +3089,6 @@
 apps/erpnext/erpnext/accounts/party.py,Billing currency must be equal to either default company's currency or party account currency,Faktureringsvaluta skal være ens med enten standardfirmaets valuta eller selskabskontoens valuta
 DocType: Packing Slip,Indicates that the package is a part of this delivery (Only Draft),"Angiver, at pakken er en del af denne leverance (Kun udkast)"
 apps/erpnext/erpnext/accounts/report/customer_ledger_summary/customer_ledger_summary.py,Closing Balance,Afslutningsbalance
-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}
 DocType: Soil Texture,Loam,lerjord
 apps/erpnext/erpnext/controllers/accounts_controller.py,Row {0}: Due Date cannot be before posting date,Række {0}: Forfaldsdato kan ikke være før bogføringsdato
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py,Quantity for Item {0} must be less than {1},Mængde for vare {0} skal være mindre end {1}
@@ -3612,7 +3611,6 @@
 DocType: Stock Settings,Raise Material Request when stock reaches re-order level,Start materialeanmodningen når lagerbestanden når genbestilningsniveauet
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py,Full-time,Fuld tid
 DocType: Payroll Entry,Employees,Medarbejdere
-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: Question,Single Correct Answer,Enkelt korrekt svar
 DocType: Employee,Contact Details,Kontaktoplysninger
 DocType: C-Form,Received Date,Modtaget d.
@@ -4223,6 +4221,7 @@
 DocType: Pricing Rule,Price or Product Discount,Pris eller produktrabat
 apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.py,For row {0}: Enter planned qty,For række {0}: Indtast planlagt antal
 DocType: Account,Income Account,Indtægtskonto
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Customer &gt; Customer Group &gt; Territory,Kunde&gt; Kundegruppe&gt; Territorium
 DocType: Payment Request,Amount in customer's currency,Beløb i kundens valuta
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js,Delivery,Levering
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.py,Assigning Structures...,Tildele strukturer ...
@@ -4272,7 +4271,6 @@
 DocType: HR Settings,Check Vacancies On Job Offer Creation,Tjek ledige stillinger ved oprettelse af jobtilbud
 apps/erpnext/erpnext/utilities/user_progress.py,Go to Letterheads,Gå til Letterheads
 DocType: Subscription,Cancel At End Of Period,Annuller ved slutningen af perioden
-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/hr/doctype/employee_promotion/employee_promotion.js,Property already added,Ejendom tilføjet allerede
 DocType: Item Supplier,Item Supplier,Vareleverandør
 apps/erpnext/erpnext/public/js/controllers/transaction.js,Please enter Item Code to get batch no,Indtast venligst varenr. for at få partinr.
@@ -4557,6 +4555,7 @@
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.js,Warning: Material Requested Qty is less than Minimum Order Qty,Advarsel: Anmodet materialemængde er mindre end minimum ordremængden
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py,Account {0} is frozen,Konto {0} er spærret
 DocType: Quiz Question,Quiz Question,Quiz Spørgsmål
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Supplier &gt; Supplier Type,Leverandør&gt; Leverandørtype
 DocType: Company,Legal Entity / Subsidiary with a separate Chart of Accounts belonging to the Organization.,Juridisk enhed / Datterselskab med en separat Kontoplan tilhører organisationen.
 DocType: Payment Request,Mute Email,Mute Email
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py,"Food, Beverage & Tobacco","Mad, drikke og tobak"
@@ -5067,7 +5066,6 @@
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py,Delivery warehouse required for stock item {0},Levering lager kræves for lagervare {0}
 DocType: Packing Slip,The gross weight of the package. Usually net weight + packaging material weight. (for print),Bruttovægt af pakken. Normalt nettovægt + emballagematerialevægt. (til udskrivning)
 DocType: Assessment Plan,Program,Program
-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: Accounts Settings,Users with this role are allowed to set frozen accounts and create / modify accounting entries against frozen accounts,Brugere med denne rolle får lov til at sætte indefrosne konti og oprette / ændre regnskabsposter mod indefrosne konti
 ,Project Billing Summary,Projekt faktureringsoversigt
 DocType: Vital Signs,Cuts,Cuts
@@ -5316,6 +5314,7 @@
 apps/erpnext/erpnext/quality_management/doctype/quality_review/quality_review_list.js,No Action,Ingen handling
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js,Valuation type charges can not marked as Inclusive,Værdiansættelse typen omkostninger ikke er markeret som Inclusive
 DocType: POS Profile,Update Stock,Opdatering Stock
+apps/erpnext/erpnext/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/stock/doctype/packing_slip/packing_slip.js,Different UOM for items will lead to incorrect (Total) Net Weight value. Make sure that Net Weight of each item is in the same UOM.,"Forskellige UOM for elementer vil føre til forkert (Total) Vægt værdi. Sørg for, at Nettovægt for hvert punkt er i den samme UOM."
 DocType: Certification Application,Payment Details,Betalingsoplysninger
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py,BOM Rate,BOM Rate
@@ -5419,6 +5418,8 @@
 apps/erpnext/erpnext/accounts/doctype/monthly_distribution/monthly_distribution.py,Percentage Allocation should be equal to 100%,Procentdel fordeling bør være lig med 100%
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js,Please select Posting Date before selecting Party,Vælg Bogføringsdato før du vælger Selskab
 apps/erpnext/erpnext/config/accounting.py,Payment Terms based on conditions,Betalingsbetingelser baseret på betingelser
+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: Program Enrollment,School House,School House
 DocType: Serial No,Out of AMC,Ud af AMC
 DocType: Opportunity,Opportunity Amount,Mulighedsbeløb
@@ -5621,6 +5622,7 @@
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py,Order/Quot %,Ordre / Quot%
 apps/erpnext/erpnext/config/healthcare.py,Record Patient Vitals,Optag Patient Vitals
 DocType: Fee Schedule,Institution,Institution
+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}
 DocType: Asset,Partially Depreciated,Delvist afskrevet
 DocType: Issue,Opening Time,Åbning tid
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py,From and To dates required,Fra og Til dato kræves
@@ -5837,6 +5839,7 @@
 DocType: Quality Procedure Process,Link existing Quality Procedure.,Kobl den eksisterende kvalitetsprocedure.
 apps/erpnext/erpnext/config/hr.py,Loans,lån
 DocType: Healthcare Service Unit,Healthcare Service Unit,Sundhedsvæsen Service Unit
+,Customer-wise Item Price,Kundemæssig vare pris
 apps/erpnext/erpnext/public/js/financial_statements.js,Cash Flow Statement,Pengestrømsanalyse
 apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.py,No material request created,Ingen væsentlig forespørgsel oprettet
 apps/erpnext/erpnext/hr/doctype/loan_application/loan_application.py,Loan Amount cannot exceed Maximum Loan Amount of {0},Lånebeløb kan ikke overstige det maksimale lånebeløb på {0}
@@ -6098,6 +6101,7 @@
 apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py,Opening Value,åbning Value
 DocType: Salary Component,Formula,Formel
 apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py,Serial #,Serienummer
+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: Material Request Plan Item,Required Quantity,Påkrævet mængde
 DocType: Lab Test Template,Lab Test Template,Lab Test Template
 apps/erpnext/erpnext/accounts/doctype/accounting_period/accounting_period.py,Accounting Period overlaps with {0},Regnskabsperiode overlapper med {0}
@@ -6347,7 +6351,6 @@
 DocType: Request for Quotation Item,Project Name,Sagsnavn
 apps/erpnext/erpnext/regional/italy/utils.py,Please set the Customer Address,Angiv kundeadresse
 DocType: Customer,Mention if non-standard receivable account,"Nævne, hvis ikke-standard tilgodehavende konto"
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Customer &gt; Customer Group &gt; Territory,Kunde&gt; Kundegruppe&gt; Territorium
 DocType: Bank,Plaid Access Token,Plaid Access Token
 apps/erpnext/erpnext/hr/doctype/employee_benefit_application/employee_benefit_application.py,Please add the remaining benefits {0} to any of the existing component,Tilføj venligst de resterende fordele {0} til en eksisterende komponent
 DocType: Journal Entry Account,If Income or Expense,Hvis indtægter og omkostninger
@@ -6610,8 +6613,6 @@
 apps/erpnext/erpnext/buying/utils.py,Please enter quantity for Item {0},Indtast mængde for vare {0}
 DocType: Quality Procedure,Processes,Processer
 DocType: Shift Type,First Check-in and Last Check-out,Første check-in og sidste check-out
-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/regional/report/hsn_wise_summary_of_outward_supplies/hsn_wise_summary_of_outward_supplies.py,Total Taxable Amount,Samlet skattepligtigt beløb
 DocType: Employee External Work History,Employee External Work History,Medarbejder Ekstern Work History
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.py,Job card {0} created,Jobkort {0} oprettet
@@ -6647,6 +6648,7 @@
 apps/erpnext/erpnext/accounts/doctype/payment_terms_template/payment_terms_template.py,Combined invoice portion must equal 100%,Kombineret faktura del skal svare til 100%
 DocType: Item Default,Default Expense Account,Standard udgiftskonto
 DocType: GST Account,CGST Account,CGST-konto
+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/education/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py,Student Email ID,Student Email ID
 DocType: Employee,Notice (days),Varsel (dage)
 DocType: POS Closing Voucher Invoices,POS Closing Voucher Invoices,POS Closing Voucher Fakturaer
@@ -7285,6 +7287,7 @@
 DocType: Maintenance Visit,Maintenance Date,Vedligeholdelsesdato
 DocType: Purchase Invoice Item,Rejected Serial No,Afvist serienummer
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py,Year start date or end date is overlapping with {0}. To avoid please set company,År startdato eller slutdato overlapper med {0}. For at undgå du indstille selskab
+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/selling/doctype/customer/customer.py,Please mention the Lead Name in Lead {0},Angiv Lead Name in Lead {0}
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py,Start date should be less than end date for Item {0},Start dato bør være mindre end slutdato for Item {0}
 DocType: Shift Type,Auto Attendance Settings,Indstillinger for automatisk deltagelse
diff --git a/erpnext/translations/de.csv b/erpnext/translations/de.csv
index ba9ee11..133fb9d 100644
--- a/erpnext/translations/de.csv
+++ b/erpnext/translations/de.csv
@@ -168,7 +168,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py,Accountant,Buchhalter
 apps/erpnext/erpnext/stock/report/item_price_stock/item_price_stock.py,Selling Price List,Verkaufspreisliste
 DocType: Patient,Tobacco Current Use,Tabakstrom Verwendung
-apps/erpnext/erpnext/stock/report/item_price_stock/item_price_stock.py,Selling Rate,Verkaufspreis
+apps/erpnext/erpnext/selling/report/customer_wise_item_price/customer_wise_item_price.py,Selling Rate,Verkaufspreis
 apps/erpnext/erpnext/erpnext_integrations/doctype/plaid_settings/plaid_settings.js,Please save your document before adding a new account,"Bitte speichern Sie Ihr Dokument, bevor Sie ein neues Konto hinzufügen"
 DocType: Cost Center,Stock User,Lager-Benutzer
 DocType: Soil Analysis,(Ca+Mg)/K,(Ca + Mg) / K
@@ -205,7 +205,6 @@
 DocType: Packed Item,Parent Detail docname,Übergeordnetes Detail Dokumentenname
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py,"Reference: {0}, Item Code: {1} and Customer: {2}","Referenz: {0}, Item Code: {1} und Kunde: {2}"
 apps/erpnext/erpnext/accounts/report/consolidated_financial_statement/consolidated_financial_statement.py,{0} {1} is not present in the parent company,{0} {1} ist in der Muttergesellschaft nicht vorhanden
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Supplier &gt; Supplier Type,Lieferant&gt; Lieferantentyp
 apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py,Trial Period End Date Cannot be before Trial Period Start Date,Testzeitraum-Enddatum Kann nicht vor dem Startdatum der Testzeitraumperiode liegen
 apps/erpnext/erpnext/utilities/user_progress.py,Kg,kg
 DocType: Tax Withholding Category,Tax Withholding Category,Steuereinbehalt Kategorie
@@ -319,6 +318,7 @@
 DocType: Quality Procedure Table,Responsible Individual,Verantwortliche Person
 DocType: Naming Series,Prefix,Präfix
 apps/erpnext/erpnext/hr/notification/training_scheduled/training_scheduled.html,Event Location,Veranstaltungsort
+apps/erpnext/erpnext/selling/report/customer_wise_item_price/customer_wise_item_price.py,Available Stock,Lagerbestand
 DocType: Asset Settings,Asset Settings,Einstellungen Vermögenswert
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py,Consumable,Verbrauchsgut
 DocType: Student,B-,B-
@@ -351,6 +351,7 @@
 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 \
 				Serial No.","Die Lieferung per Seriennummer kann nicht gewährleistet werden, da \ Item {0} mit und ohne &quot;Delivery Delivery by \ Serial No.&quot; hinzugefügt wird."
+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/accounts/doctype/sales_invoice/sales_invoice.py,At least one mode of payment is required for POS invoice.,Mindestens eine Art der Bezahlung ist für POS-Rechnung erforderlich.
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py,Batch no is required for batched item {0},Für den Sammelartikel {0} ist die Chargennummer erforderlich.
 DocType: Bank Statement Transaction Invoice Item,Bank Statement Transaction Invoice Item,Kontoauszug Transaktion Rechnungsposition
@@ -874,7 +875,6 @@
 DocType: Vital Signs,Blood Pressure (systolic),Blutdruck (systolisch)
 apps/erpnext/erpnext/controllers/buying_controller.py,{0} {1} is {2},{0} {1} ist {2}
 DocType: Item Price,Valid Upto,Gültig bis
-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: Training Event,Workshop,Werkstatt
 DocType: Supplier Scorecard Scoring Standing,Warn Purchase Orders,Warnung Bestellungen
 apps/erpnext/erpnext/utilities/user_progress.py,List a few of your customers. They could be organizations or individuals.,Bitte ein paar Kunden angeben. Dies können Firmen oder Einzelpersonen sein.
@@ -1677,7 +1677,6 @@
 DocType: Item Barcode,Item Barcode,Artikelbarcode
 DocType: Delivery Trip,In Transit,In Lieferung
 DocType: Woocommerce Settings,Endpoints,Endpunkte
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Item Code &gt; Item Group &gt; Brand,Artikelcode&gt; Artikelgruppe&gt; Marke
 DocType: Shopping Cart Settings,Show Configure Button,Schaltfläche &quot;Konfigurieren&quot; anzeigen
 DocType: Quality Inspection Reading,Reading 6,Ablesewert 6
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js,Cannot {0} {1} {2} without any negative outstanding invoice,Kann nicht {0} {1} {2} ohne negative ausstehende Rechnung
@@ -2037,6 +2036,7 @@
 DocType: Cheque Print Template,Payer Settings,Payer Einstellungen
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js,No pending Material Requests found to link for the given items.,"Es wurden keine ausstehenden Materialanforderungen gefunden, die für die angegebenen Artikel verknüpft sind."
 apps/erpnext/erpnext/public/js/utils/party.js,Select company first,Zuerst das Unternehmen auswählen
+apps/erpnext/erpnext/accounts/general_ledger.py,Account: <b>{0}</b> is capital Work in progress and can not be updated by Journal Entry,Konto: <b>{0}</b> ist in Bearbeitung und kann von Journal Entry nicht aktualisiert werden
 apps/erpnext/erpnext/education/doctype/quiz/quiz.py,Compare List function takes on list arguments,Die Funktion &quot;Liste vergleichen&quot; übernimmt Listenargumente
 DocType: Item Attribute Value,"This will be appended to the Item Code of the variant. For example, if your abbreviation is ""SM"", and the item code is ""T-SHIRT"", the item code of the variant will be ""T-SHIRT-SM""","Dies wird an den Artikelcode der Variante angehängt. Beispiel: Wenn Ihre Abkürzung ""SM"" und der Artikelcode ""T-SHIRT"" sind, so ist der Artikelcode der Variante ""T-SHIRT-SM"""
 DocType: Salary Slip,Net Pay (in words) will be visible once you save the Salary Slip.,"Nettolohn (in Worten) wird angezeigt, sobald Sie die Gehaltsabrechnung speichern."
@@ -2221,6 +2221,7 @@
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js,Item 2,Position 2
 DocType: Pricing Rule,Validate Applied Rule,Angewandte Regel validieren
 DocType: QuickBooks Migrator,Authorization Endpoint,Autorisierungsendpunkt
+DocType: Employee Onboarding,Notify users by email,Benutzer per E-Mail benachrichtigen
 DocType: Travel Request,International,International
 DocType: Training Event,Training Event,Schulungsveranstaltung
 DocType: Item,Auto re-order,Automatische Nachbestellung
@@ -2831,7 +2832,6 @@
 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
-DocType: Contract,Inactive,Inaktiv
 apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.js,This will submit Salary Slips and create accrual Journal Entry. Do you want to proceed?,Dies wird Gehaltsabrechnungen übermitteln und eine periodengerechte Journalbuchung erstellen. Willst du fortfahren?
 DocType: Purchase Invoice,Total Net Weight,Gesamtnettogewicht
 DocType: Purchase Order,Order Confirmation No,Auftragsbestätigung Nr
@@ -3108,7 +3108,6 @@
 apps/erpnext/erpnext/accounts/party.py,Billing currency must be equal to either default company's currency or party account currency,Die Abrechnungswährung muss entweder der Unternehmenswährung oder der Währung des Debitoren-/Kreditorenkontos entsprechen
 DocType: Packing Slip,Indicates that the package is a part of this delivery (Only Draft),"Zeigt an, dass das Paket ein Teil dieser Lieferung ist (nur Entwurf)"
 apps/erpnext/erpnext/accounts/report/customer_ledger_summary/customer_ledger_summary.py,Closing Balance,Schlussbilanz
-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}
 DocType: Soil Texture,Loam,Lehm
 apps/erpnext/erpnext/controllers/accounts_controller.py,Row {0}: Due Date cannot be before posting date,Zeile {0}: Fälligkeitsdatum darf nicht vor dem Buchungsdatum liegen
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py,Quantity for Item {0} must be less than {1},Menge für Artikel {0} muss kleiner sein als {1}
@@ -3631,7 +3630,6 @@
 DocType: Stock Settings,Raise Material Request when stock reaches re-order level,"Materialanfrage erstellen, wenn der Lagerbestand unter einen Wert sinkt"
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py,Full-time,Vollzeit
 DocType: Payroll Entry,Employees,Mitarbeiter
-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: Question,Single Correct Answer,Einzelne richtige Antwort
 DocType: Employee,Contact Details,Kontakt-Details
 DocType: C-Form,Received Date,Empfangsdatum
@@ -4261,6 +4259,7 @@
 DocType: Pricing Rule,Price or Product Discount,Preis- oder Produktrabatt
 apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.py,For row {0}: Enter planned qty,Für Zeile {0}: Geben Sie die geplante Menge ein
 DocType: Account,Income Account,Ertragskonto
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Customer &gt; Customer Group &gt; Territory,Kunde&gt; Kundengruppe&gt; Gebiet
 DocType: Payment Request,Amount in customer's currency,Betrag in Kundenwährung
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js,Delivery,Auslieferung
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.py,Assigning Structures...,Zuordnung von Strukturen.....
@@ -4310,7 +4309,6 @@
 DocType: HR Settings,Check Vacancies On Job Offer Creation,Stellenangebote bei der Erstellung von Stellenangeboten prüfen
 apps/erpnext/erpnext/utilities/user_progress.py,Go to Letterheads,Gehe zu Briefköpfe
 DocType: Subscription,Cancel At End Of Period,Am Ende der Periode abbrechen
-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/hr/doctype/employee_promotion/employee_promotion.js,Property already added,Die Eigenschaft wurde bereits hinzugefügt
 DocType: Item Supplier,Item Supplier,Artikellieferant
 apps/erpnext/erpnext/public/js/controllers/transaction.js,Please enter Item Code to get batch no,Bitte die Artikelnummer eingeben um die Chargennummer zu erhalten
@@ -4607,6 +4605,7 @@
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.js,Warning: Material Requested Qty is less than Minimum Order Qty,Achtung : Materialanfragemenge ist geringer als die Mindestbestellmenge
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py,Account {0} is frozen,Konto {0} ist gesperrt
 DocType: Quiz Question,Quiz Question,Quizfrage
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Supplier &gt; Supplier Type,Lieferant&gt; Lieferantentyp
 DocType: Company,Legal Entity / Subsidiary with a separate Chart of Accounts belonging to the Organization.,"Juristische Person/Niederlassung mit einem separaten Kontenplan, die zum Unternehmen gehört."
 DocType: Payment Request,Mute Email,Mute Email
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py,"Food, Beverage & Tobacco","Lebensmittel, Getränke und Tabak"
@@ -5117,7 +5116,6 @@
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py,Delivery warehouse required for stock item {0},Auslieferungslager für Lagerartikel {0} erforderlich
 DocType: Packing Slip,The gross weight of the package. Usually net weight + packaging material weight. (for print),Das Bruttogewicht des Pakets. Normalerweise Nettogewicht + Verpackungsgweicht. (Für den Ausdruck)
 DocType: Assessment Plan,Program,Programm
-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: Accounts Settings,Users with this role are allowed to set frozen accounts and create / modify accounting entries against frozen accounts,Benutzer mit dieser Rolle sind berechtigt Konten zu sperren und  Buchungen zu gesperrten Konten zu erstellen/verändern
 ,Project Billing Summary,Projektabrechnungszusammenfassung
 DocType: Vital Signs,Cuts,Schnitte
@@ -5366,6 +5364,7 @@
 apps/erpnext/erpnext/quality_management/doctype/quality_review/quality_review_list.js,No Action,Keine Aktion
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js,Valuation type charges can not marked as Inclusive,"Bewertungsart Gebühren kann nicht als ""inklusive"" markiert werden"
 DocType: POS Profile,Update Stock,Lagerbestand aktualisieren
+apps/erpnext/erpnext/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/stock/doctype/packing_slip/packing_slip.js,Different UOM for items will lead to incorrect (Total) Net Weight value. Make sure that Net Weight of each item is in the same UOM.,"Unterschiedliche Maßeinheiten für Artikel führen zu falschen Werten für das (Gesamt-)Nettogewicht. Es muss sicher gestellt sein, dass das Nettogewicht jedes einzelnen Artikels in der gleichen Maßeinheit angegeben ist."
 DocType: Certification Application,Payment Details,Zahlungsdetails
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py,BOM Rate,Stückpreis
@@ -5469,6 +5468,8 @@
 apps/erpnext/erpnext/accounts/doctype/monthly_distribution/monthly_distribution.py,Percentage Allocation should be equal to 100%,Prozentuale Aufteilung sollte gleich 100% sein
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js,Please select Posting Date before selecting Party,Bitte wählen Sie Buchungsdatum vor dem Party-Auswahl
 apps/erpnext/erpnext/config/accounting.py,Payment Terms based on conditions,Zahlungsbedingungen basieren auf Bedingungen
+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: Program Enrollment,School House,School House
 DocType: Serial No,Out of AMC,Außerhalb des jährlichen Wartungsvertrags
 DocType: Opportunity,Opportunity Amount,Betrag der Chance
@@ -5670,6 +5671,7 @@
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py,Order/Quot %,Bestellung / Quot%
 apps/erpnext/erpnext/config/healthcare.py,Record Patient Vitals,Datensatz Patient Vitals
 DocType: Fee Schedule,Institution,Institution
+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}
 DocType: Asset,Partially Depreciated,Teilweise abgeschrieben
 DocType: Issue,Opening Time,Öffnungszeit
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py,From and To dates required,Von- und Bis-Daten erforderlich
@@ -5886,6 +5888,7 @@
 DocType: Quality Procedure Process,Link existing Quality Procedure.,Bestehendes Qualitätsverfahren verknüpfen.
 apps/erpnext/erpnext/config/hr.py,Loans,Kredite
 DocType: Healthcare Service Unit,Healthcare Service Unit,Healthcare Serviceeinheit
+,Customer-wise Item Price,Kundenbezogener Artikelpreis
 apps/erpnext/erpnext/public/js/financial_statements.js,Cash Flow Statement,Geldflussrechnung
 apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.py,No material request created,Es wurde keine Materialanforderung erstellt
 apps/erpnext/erpnext/hr/doctype/loan_application/loan_application.py,Loan Amount cannot exceed Maximum Loan Amount of {0},Darlehensbetrag darf nicht höher als der Maximalbetrag {0} sein
@@ -6147,6 +6150,7 @@
 apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py,Opening Value,Öffnungswert
 DocType: Salary Component,Formula,Formel
 apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py,Serial #,Serien #
+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: Material Request Plan Item,Required Quantity,Benötigte Menge
 DocType: Lab Test Template,Lab Test Template,Labortestvorlage
 apps/erpnext/erpnext/accounts/doctype/accounting_period/accounting_period.py,Accounting Period overlaps with {0},Abrechnungszeitraum überschneidet sich mit {0}
@@ -6396,7 +6400,6 @@
 DocType: Request for Quotation Item,Project Name,Projektname
 apps/erpnext/erpnext/regional/italy/utils.py,Please set the Customer Address,Bitte geben Sie die Kundenadresse an
 DocType: Customer,Mention if non-standard receivable account,"Vermerken, wenn es sich um kein Standard-Forderungskonto handelt"
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Customer &gt; Customer Group &gt; Territory,Kunde&gt; Kundengruppe&gt; Gebiet
 DocType: Bank,Plaid Access Token,Plaid Access Token
 apps/erpnext/erpnext/hr/doctype/employee_benefit_application/employee_benefit_application.py,Please add the remaining benefits {0} to any of the existing component,Fügen Sie die verbleibenden Vorteile {0} zu einer vorhandenen Komponente hinzu
 DocType: Journal Entry Account,If Income or Expense,Wenn Ertrag oder Aufwand
@@ -6657,8 +6660,6 @@
 apps/erpnext/erpnext/buying/utils.py,Please enter quantity for Item {0},Bitte die Menge für Artikel {0} eingeben
 DocType: Quality Procedure,Processes,Prozesse
 DocType: Shift Type,First Check-in and Last Check-out,Erster Check-in und letzter Check-out
-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/regional/report/hsn_wise_summary_of_outward_supplies/hsn_wise_summary_of_outward_supplies.py,Total Taxable Amount,Total Steuerbetrag
 DocType: Employee External Work History,Employee External Work History,Externe Berufserfahrung des Mitarbeiters
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.py,Job card {0} created,Jobkarte {0} erstellt
@@ -6694,6 +6695,7 @@
 apps/erpnext/erpnext/accounts/doctype/payment_terms_template/payment_terms_template.py,Combined invoice portion must equal 100%,Der kombinierte Rechnungsanteil muss 100% betragen
 DocType: Item Default,Default Expense Account,Standardaufwandskonto
 DocType: GST Account,CGST Account,CGST Konto
+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/education/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py,Student Email ID,Studenten E-Mail-ID
 DocType: Employee,Notice (days),Meldung(s)(-Tage)
 DocType: POS Closing Voucher Invoices,POS Closing Voucher Invoices,POS-Abschlussgutschein-Rechnungen
@@ -7332,6 +7334,7 @@
 DocType: Maintenance Visit,Maintenance Date,Wartungsdatum
 DocType: Purchase Invoice Item,Rejected Serial No,Abgelehnte Seriennummer
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py,Year start date or end date is overlapping with {0}. To avoid please set company,"Jahresbeginn oder Enddatum überlappt mit {0}. Bitte ein Unternehmen wählen, um dies zu verhindern"
+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/selling/doctype/customer/customer.py,Please mention the Lead Name in Lead {0},Bitte erwähnen Sie den Lead Name in Lead {0}
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py,Start date should be less than end date for Item {0},Startdatum sollte für den Artikel {0} vor dem Enddatum liegen
 DocType: Shift Type,Auto Attendance Settings,Einstellungen für die automatische Teilnahme
diff --git a/erpnext/translations/el.csv b/erpnext/translations/el.csv
index 6e9c2c1..c9c2173 100644
--- a/erpnext/translations/el.csv
+++ b/erpnext/translations/el.csv
@@ -168,7 +168,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py,Accountant,Λογιστής
 apps/erpnext/erpnext/stock/report/item_price_stock/item_price_stock.py,Selling Price List,Τιμοκατάλογος πώλησης
 DocType: Patient,Tobacco Current Use,Καπνός τρέχουσα χρήση
-apps/erpnext/erpnext/stock/report/item_price_stock/item_price_stock.py,Selling Rate,Πωλήσεις
+apps/erpnext/erpnext/selling/report/customer_wise_item_price/customer_wise_item_price.py,Selling Rate,Πωλήσεις
 apps/erpnext/erpnext/erpnext_integrations/doctype/plaid_settings/plaid_settings.js,Please save your document before adding a new account,Αποθηκεύστε το έγγραφό σας πριν προσθέσετε νέο λογαριασμό
 DocType: Cost Center,Stock User,Χρήστης Αποθεματικού
 DocType: Soil Analysis,(Ca+Mg)/K,(Ca + Mg) / Κ
@@ -205,7 +205,6 @@
 DocType: Packed Item,Parent Detail docname,Όνομα αρχείου γονικής λεπτομέρεια
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py,"Reference: {0}, Item Code: {1} and Customer: {2}","Αναφορά: {0}, Κωδικός είδους: {1} και Πελάτης: {2}"
 apps/erpnext/erpnext/accounts/report/consolidated_financial_statement/consolidated_financial_statement.py,{0} {1} is not present in the parent company,{0} {1} δεν υπάρχει στη μητρική εταιρεία
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Supplier &gt; Supplier Type,Προμηθευτής&gt; Τύπος προμηθευτή
 apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py,Trial Period End Date Cannot be before Trial Period Start Date,Η ημερομηνία λήξης της δοκιμαστικής περιόδου δεν μπορεί να είναι πριν την ημερομηνία έναρξης της δοκιμαστικής περιόδου
 apps/erpnext/erpnext/utilities/user_progress.py,Kg,Kg
 DocType: Tax Withholding Category,Tax Withholding Category,Κατηγορίες παρακράτησης φόρου
@@ -319,6 +318,7 @@
 DocType: Quality Procedure Table,Responsible Individual,Υπεύθυνο άτομο
 DocType: Naming Series,Prefix,Πρόθεμα
 apps/erpnext/erpnext/hr/notification/training_scheduled/training_scheduled.html,Event Location,Τοποθεσία συμβάντος
+apps/erpnext/erpnext/selling/report/customer_wise_item_price/customer_wise_item_price.py,Available Stock,Διαθέσιμο στοκ
 DocType: Asset Settings,Asset Settings,Ρυθμίσεις περιουσιακών στοιχείων
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py,Consumable,Αναλώσιμα
 DocType: Student,B-,ΣΙ-
@@ -351,6 +351,7 @@
 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 \
 				Serial No.","Δεν είναι δυνατή η εξασφάλιση της παράδοσης με σειριακό αριθμό, καθώς προστίθεται το στοιχείο {0} με και χωρίς την παράμετρο &quot;Εξασφαλίστε την παράδοση&quot; με \"
+apps/erpnext/erpnext/education/doctype/instructor/instructor.py,Please setup Instructor Naming System in Education &gt; Education Settings,Ρυθμίστε το Σύστημα Ονοματοδοσίας Εκπαιδευτών στην Εκπαίδευση&gt; Ρυθμίσεις Εκπαίδευσης
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py,At least one mode of payment is required for POS invoice.,Τουλάχιστον ένα τρόπο πληρωμής απαιτείται για POS τιμολόγιο.
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py,Batch no is required for batched item {0},Δεν απαιτείται παρτίδα για το παρατεταμένο αντικείμενο {0}
 DocType: Bank Statement Transaction Invoice Item,Bank Statement Transaction Invoice Item,Στοιχείο Τιμολογίου Συναλλαγής Τραπεζικής Κατάστασης
@@ -874,7 +875,6 @@
 DocType: Vital Signs,Blood Pressure (systolic),Πίεση αίματος (συστολική)
 apps/erpnext/erpnext/controllers/buying_controller.py,{0} {1} is {2},{0} {1} είναι {2}
 DocType: Item Price,Valid Upto,Ισχύει μέχρι
-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: Training Event,Workshop,Συνεργείο
 DocType: Supplier Scorecard Scoring Standing,Warn Purchase Orders,Προειδοποίηση παραγγελιών αγοράς
 apps/erpnext/erpnext/utilities/user_progress.py,List a few of your customers. They could be organizations or individuals.,Απαριθμήστε μερικούς από τους πελάτες σας. Θα μπορούσαν να είναι φορείς ή ιδιώτες.
@@ -1677,7 +1677,6 @@
 DocType: Item Barcode,Item Barcode,Barcode είδους
 DocType: Delivery Trip,In Transit,Στη διαμετακόμιση
 DocType: Woocommerce Settings,Endpoints,Τελικά σημεία
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Item Code &gt; Item Group &gt; Brand,Κωδικός στοιχείου&gt; Ομάδα στοιχείων&gt; Μάρκα
 DocType: Shopping Cart Settings,Show Configure Button,Εμφάνιση πλήκτρου διαμόρφωσης
 DocType: Quality Inspection Reading,Reading 6,Μέτρηση 6
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js,Cannot {0} {1} {2} without any negative outstanding invoice,"Δεν είναι δυνατή η {0} {1} {2}, χωρίς οποιαδήποτε αρνητική εκκρεμών τιμολογίων"
@@ -2037,6 +2036,7 @@
 DocType: Cheque Print Template,Payer Settings,Ρυθμίσεις πληρωτή
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js,No pending Material Requests found to link for the given items.,Δεν υπάρχουν εκκρεμή αιτήματα υλικού που βρέθηκαν να συνδέονται για τα συγκεκριμένα στοιχεία.
 apps/erpnext/erpnext/public/js/utils/party.js,Select company first,Επιλέξτε πρώτα την εταιρεία
+apps/erpnext/erpnext/accounts/general_ledger.py,Account: <b>{0}</b> is capital Work in progress and can not be updated by Journal Entry,Λογαριασμός: Το <b>{0}</b> είναι κεφάλαιο Οι εργασίες βρίσκονται σε εξέλιξη και δεν μπορούν να ενημερωθούν με καταχώριση ημερολογίου
 apps/erpnext/erpnext/education/doctype/quiz/quiz.py,Compare List function takes on list arguments,Η Λειτουργία σύγκρισης λίστας παίρνει επιχειρήματα λίστας
 DocType: Item Attribute Value,"This will be appended to the Item Code of the variant. For example, if your abbreviation is ""SM"", and the item code is ""T-SHIRT"", the item code of the variant will be ""T-SHIRT-SM""","Αυτό θα πρέπει να επισυνάπτεται στο κφδικό είδους της παραλλαγής. Για παράδειγμα, εάν η συντομογραφία σας είναι «sm» και ο κωδικός του είδους είναι ""t-shirt"", ο κωδικός του της παραλλαγής του είδους θα είναι ""t-shirt-sm"""
 DocType: Salary Slip,Net Pay (in words) will be visible once you save the Salary Slip.,Οι καθαρές αποδοχές (ολογράφως) θα είναι ορατές τη στιγμή που θα αποθηκεύσετε τη βεβαίωση αποδοχών
@@ -2221,6 +2221,7 @@
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js,Item 2,Στοιχείο 2
 DocType: Pricing Rule,Validate Applied Rule,Επικύρωση του εφαρμοσμένου κανόνα
 DocType: QuickBooks Migrator,Authorization Endpoint,Τελικό σημείο εξουσιοδότησης
+DocType: Employee Onboarding,Notify users by email,Ειδοποιήστε τους χρήστες μέσω ηλεκτρονικού ταχυδρομείου
 DocType: Travel Request,International,Διεθνές
 DocType: Training Event,Training Event,εκπαίδευση Event
 DocType: Item,Auto re-order,Αυτόματη εκ νέου προκειμένου
@@ -2831,7 +2832,6 @@
 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,Ένας πελάτης με το ίδιο όνομα υπάρχει ήδη
-DocType: Contract,Inactive,Αδρανής
 apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.js,This will submit Salary Slips and create accrual Journal Entry. Do you want to proceed?,Αυτό θα παρουσιάσει τα μισθολογικά φύλλα και θα δημιουργήσει εγγραφή εισόδου περιοδικών. Θέλετε να συνεχίσετε?
 DocType: Purchase Invoice,Total Net Weight,Συνολικό Καθαρό Βάρος
 DocType: Purchase Order,Order Confirmation No,Αριθμός επιβεβαίωσης παραγγελίας
@@ -3108,7 +3108,6 @@
 apps/erpnext/erpnext/accounts/party.py,Billing currency must be equal to either default company's currency or party account currency,Το νόμισμα χρέωσης πρέπει να είναι ίσο είτε με το νόμισμα της εταιρείας προεπιλογής είτε με το νόμισμα του λογαριασμού κόμματος
 DocType: Packing Slip,Indicates that the package is a part of this delivery (Only Draft),Δηλώνει ότι το συσκευασία είναι ένα μέρος αυτής της παράδοσης (μόνο πρόχειρο)
 apps/erpnext/erpnext/accounts/report/customer_ledger_summary/customer_ledger_summary.py,Closing Balance,Τελικό υπόλοιπο
-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: Soil Texture,Loam,Παχύ χώμα
 apps/erpnext/erpnext/controllers/accounts_controller.py,Row {0}: Due Date cannot be before posting date,Γραμμή {0}: Η ημερομηνία λήξης δεν μπορεί να είναι πριν από την ημερομηνία δημοσίευσης
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py,Quantity for Item {0} must be less than {1},Η ποσότητα για το είδος {0} πρέπει να είναι λιγότερη από {1}
@@ -3631,7 +3630,6 @@
 DocType: Stock Settings,Raise Material Request when stock reaches re-order level,Δημιουργία αιτήματος υλικού όταν το απόθεμα φτάνει το επίπεδο για επαναπαραγγελία
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py,Full-time,Πλήρης απασχόληση
 DocType: Payroll Entry,Employees,εργαζόμενοι
-apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py,Please setup numbering series for Attendance via Setup &gt; Numbering Series,Ρυθμίστε τη σειρά αρίθμησης για τη συμμετοχή μέσω του προγράμματος Εγκατάστασης&gt; Σειρά αρίθμησης
 DocType: Question,Single Correct Answer,Ενιαία σωστή απάντηση
 DocType: Employee,Contact Details,Στοιχεία επικοινωνίας επαφής
 DocType: C-Form,Received Date,Ημερομηνία παραλαβής
@@ -4262,6 +4260,7 @@
 DocType: Pricing Rule,Price or Product Discount,Τιμή ή Προϊόν Έκπτωση
 apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.py,For row {0}: Enter planned qty,Για τη σειρά {0}: Εισάγετε προγραμματισμένη ποσότητα
 DocType: Account,Income Account,Λογαριασμός εσόδων
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Customer &gt; Customer Group &gt; Territory,Πελάτης&gt; Ομάδα πελατών&gt; Επικράτεια
 DocType: Payment Request,Amount in customer's currency,Ποσό σε νόμισμα του πελάτη
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js,Delivery,Παράδοση
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.py,Assigning Structures...,Αντιστοίχιση δομών ...
@@ -4311,7 +4310,6 @@
 DocType: HR Settings,Check Vacancies On Job Offer Creation,Ελέγξτε τις κενές θέσεις στη δημιουργία προσφοράς εργασίας
 apps/erpnext/erpnext/utilities/user_progress.py,Go to Letterheads,Πηγαίνετε στο Letterheads
 DocType: Subscription,Cancel At End Of Period,Ακύρωση στο τέλος της περιόδου
-apps/erpnext/erpnext/education/doctype/instructor/instructor.py,Please setup Instructor Naming System in Education &gt; Education Settings,Ρυθμίστε το Σύστημα Ονοματοδοσίας Εκπαιδευτών στην Εκπαίδευση&gt; Ρυθμίσεις Εκπαίδευσης
 apps/erpnext/erpnext/hr/doctype/employee_promotion/employee_promotion.js,Property already added,Τα ακίνητα έχουν ήδη προστεθεί
 DocType: Item Supplier,Item Supplier,Προμηθευτής είδους
 apps/erpnext/erpnext/public/js/controllers/transaction.js,Please enter Item Code to get batch no,Παρακαλώ εισάγετε κωδικό είδους για να δείτε τον αρ. παρτίδας
@@ -4608,6 +4606,7 @@
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.js,Warning: Material Requested Qty is less than Minimum Order Qty,Προειδοποίηση : ζητήθηκε ποσότητα υλικού που είναι μικρότερη από την ελάχιστη ποσότητα παραγγελίας
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py,Account {0} is frozen,Ο λογαριασμός {0} έχει παγώσει
 DocType: Quiz Question,Quiz Question,Ερώτηση κουίζ
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Supplier &gt; Supplier Type,Προμηθευτής&gt; Τύπος προμηθευτή
 DocType: Company,Legal Entity / Subsidiary with a separate Chart of Accounts belonging to the Organization.,Νομικό πρόσωπο / θυγατρικές εταιρείες με ξεχωριστό λογιστικό σχέδιο που ανήκουν στον οργανισμό.
 DocType: Payment Request,Mute Email,Σίγαση Email
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py,"Food, Beverage & Tobacco","Τρόφιμα, ποτά και καπνός"
@@ -5118,7 +5117,6 @@
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py,Delivery warehouse required for stock item {0},Παράδοση αποθήκη που απαιτούνται για τη θέση του αποθέματος {0}
 DocType: Packing Slip,The gross weight of the package. Usually net weight + packaging material weight. (for print),Το μεικτό βάρος της συσκευασίας. Συνήθως καθαρό βάρος + βάρος υλικού συσκευασίας. (Για εκτύπωση)
 DocType: Assessment Plan,Program,Πρόγραμμα
-apps/erpnext/erpnext/hr/doctype/employee/employee.py,Please setup Employee Naming System in Human Resource &gt; HR Settings,Ρυθμίστε το Σύστημα Ονοματοδοσίας Εργαζομένων σε Ανθρώπινο Δυναμικό&gt; Ρυθμίσεις HR
 DocType: Accounts Settings,Users with this role are allowed to set frozen accounts and create / modify accounting entries against frozen accounts,Οι χρήστες με αυτό το ρόλο μπορούν να καθορίζουν δεσμευμένους λογαριασμούς και τη δημιουργία / τροποποίηση των λογιστικών εγγραφών δεσμευμένων λογαριασμών
 ,Project Billing Summary,Περίληψη χρεώσεων έργου
 DocType: Vital Signs,Cuts,Κόβει
@@ -5367,6 +5365,7 @@
 apps/erpnext/erpnext/quality_management/doctype/quality_review/quality_review_list.js,No Action,Καμία ενέργεια
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js,Valuation type charges can not marked as Inclusive,Χρεώσεις τύπου αποτίμηση δεν μπορεί να χαρακτηρίζεται ως Inclusive
 DocType: POS Profile,Update Stock,Ενημέρωση αποθέματος
+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/stock/doctype/packing_slip/packing_slip.js,Different UOM for items will lead to incorrect (Total) Net Weight value. Make sure that Net Weight of each item is in the same UOM.,Διαφορετικές Μ.Μ.για τα είδη θα οδηγήσουν σε λανθασμένη τιμή ( σύνολο ) καθαρού βάρους. Βεβαιωθείτε ότι το καθαρό βάρος κάθε είδοςυ είναι στην ίδια Μ.Μ.
 DocType: Certification Application,Payment Details,Οι λεπτομέρειες πληρωμής
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py,BOM Rate,Τιμή Λ.Υ.
@@ -5470,6 +5469,8 @@
 apps/erpnext/erpnext/accounts/doctype/monthly_distribution/monthly_distribution.py,Percentage Allocation should be equal to 100%,Το ποσοστό κατανομής θα πρέπει να είναι ίσο με το 100 %
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js,Please select Posting Date before selecting Party,Επιλέξτε Απόσπαση Ημερομηνία πριν από την επιλογή Κόμματος
 apps/erpnext/erpnext/config/accounting.py,Payment Terms based on conditions,Όροι πληρωμής βάσει των όρων
+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: Program Enrollment,School House,Σχολείο
 DocType: Serial No,Out of AMC,Εκτός Ε.Σ.Υ.
 DocType: Opportunity,Opportunity Amount,Ποσό ευκαιρίας
@@ -5671,6 +5672,7 @@
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py,Order/Quot %,Παραγγελία / Quot%
 apps/erpnext/erpnext/config/healthcare.py,Record Patient Vitals,Καταγράψτε τα ζιζάνια των ασθενών
 DocType: Fee Schedule,Institution,Ίδρυμα
+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: Asset,Partially Depreciated,μερικώς αποσβένονται
 DocType: Issue,Opening Time,Ώρα ανοίγματος
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py,From and To dates required,Τα πεδία από και έως ημερομηνία είναι απαραίτητα
@@ -5887,6 +5889,7 @@
 DocType: Quality Procedure Process,Link existing Quality Procedure.,Συνδέστε την υφιστάμενη διαδικασία ποιότητας.
 apps/erpnext/erpnext/config/hr.py,Loans,Δάνεια
 DocType: Healthcare Service Unit,Healthcare Service Unit,Μονάδα Υπηρεσιών Υγείας
+,Customer-wise Item Price,Πελατοκεντρική τιμή προϊόντος
 apps/erpnext/erpnext/public/js/financial_statements.js,Cash Flow Statement,Κατάσταση ταμειακών ροών
 apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.py,No material request created,Δεν δημιουργήθηκε κανένα υλικό υλικό
 apps/erpnext/erpnext/hr/doctype/loan_application/loan_application.py,Loan Amount cannot exceed Maximum Loan Amount of {0},Ποσό δανείου δεν μπορεί να υπερβαίνει το μέγιστο ύψος των δανείων Ποσό {0}
@@ -6148,6 +6151,7 @@
 apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py,Opening Value,Αξία ανοίγματος
 DocType: Salary Component,Formula,Τύπος
 apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py,Serial #,Σειριακός αριθμός #
+apps/erpnext/erpnext/hr/doctype/employee/employee.py,Please setup Employee Naming System in Human Resource &gt; HR Settings,Ρυθμίστε το Σύστημα Ονοματοδοσίας Εργαζομένων σε Ανθρώπινο Δυναμικό&gt; Ρυθμίσεις HR
 DocType: Material Request Plan Item,Required Quantity,Απαιτούμενη ποσότητα
 DocType: Lab Test Template,Lab Test Template,Πρότυπο δοκιμής εργαστηρίου
 apps/erpnext/erpnext/accounts/doctype/accounting_period/accounting_period.py,Accounting Period overlaps with {0},Η περίοδος λογιστικής επικαλύπτεται με {0}
@@ -6398,7 +6402,6 @@
 DocType: Request for Quotation Item,Project Name,Όνομα έργου
 apps/erpnext/erpnext/regional/italy/utils.py,Please set the Customer Address,Ρυθμίστε τη διεύθυνση του πελάτη
 DocType: Customer,Mention if non-standard receivable account,Αναφέρετε αν μη τυποποιημένα εισπρακτέα λογαριασμού
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Customer &gt; Customer Group &gt; Territory,Πελάτης&gt; Ομάδα πελατών&gt; Επικράτεια
 DocType: Bank,Plaid Access Token,Plain Access Token
 apps/erpnext/erpnext/hr/doctype/employee_benefit_application/employee_benefit_application.py,Please add the remaining benefits {0} to any of the existing component,Προσθέστε τα υπόλοιπα οφέλη {0} σε οποιοδήποτε από τα υπάρχοντα στοιχεία
 DocType: Journal Entry Account,If Income or Expense,Εάν είναι έσοδα ή δαπάνη
@@ -6661,8 +6664,6 @@
 apps/erpnext/erpnext/buying/utils.py,Please enter quantity for Item {0},Παρακαλώ εισάγετε ποσότητα για το είδος {0}
 DocType: Quality Procedure,Processes,Διαδικασίες
 DocType: Shift Type,First Check-in and Last Check-out,Πρώτο check-in και τελευταίο check-out
-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/regional/report/hsn_wise_summary_of_outward_supplies/hsn_wise_summary_of_outward_supplies.py,Total Taxable Amount,Συνολικό φορολογητέο ποσό
 DocType: Employee External Work History,Employee External Work History,Ιστορικό εξωτερικών εργασιών υπαλλήλου
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.py,Job card {0} created,Δημιουργήθηκε η κάρτα εργασίας {0}
@@ -6698,6 +6699,7 @@
 apps/erpnext/erpnext/accounts/doctype/payment_terms_template/payment_terms_template.py,Combined invoice portion must equal 100%,Το τμήμα του συνδυασμένου τιμολογίου πρέπει να ισούται με το 100%
 DocType: Item Default,Default Expense Account,Προεπιλεγμένος λογαριασμός δαπανών
 DocType: GST Account,CGST Account,Λογαριασμός CGST
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Item Code &gt; Item Group &gt; Brand,Κωδικός στοιχείου&gt; Ομάδα στοιχείων&gt; Μάρκα
 apps/erpnext/erpnext/education/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py,Student Email ID,Φοιτητής Email ID
 DocType: Employee,Notice (days),Ειδοποίηση (ημέρες)
 DocType: POS Closing Voucher Invoices,POS Closing Voucher Invoices,Τα τιμολόγια των δελτίων κλεισίματος POS
@@ -7336,6 +7338,7 @@
 DocType: Maintenance Visit,Maintenance Date,Ημερομηνία συντήρησης
 DocType: Purchase Invoice Item,Rejected Serial No,Σειριακός αριθμός που απορρίφθηκε
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py,Year start date or end date is overlapping with {0}. To avoid please set company,Έτος ημερομηνία έναρξης ή την ημερομηνία λήξης είναι η επικάλυψη με {0}. Για την αποφυγή ορίστε εταιρείας
+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/selling/doctype/customer/customer.py,Please mention the Lead Name in Lead {0},Αναφέρετε το Επικεφαλής Ονόματος στον Επικεφαλής {0}
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py,Start date should be less than end date for Item {0},Η ημερομηνία έναρξης θα πρέπει να είναι προγενέστερη της ημερομηνίας λήξης για το είδος {0}
 DocType: Shift Type,Auto Attendance Settings,Ρυθμίσεις αυτόματης παρακολούθησης
diff --git a/erpnext/translations/es.csv b/erpnext/translations/es.csv
index 759e195..ee087ea 100644
--- a/erpnext/translations/es.csv
+++ b/erpnext/translations/es.csv
@@ -168,7 +168,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py,Accountant,Contador
 apps/erpnext/erpnext/stock/report/item_price_stock/item_price_stock.py,Selling Price List,Lista de Precios de Venta
 DocType: Patient,Tobacco Current Use,Consumo Actual de Tabaco
-apps/erpnext/erpnext/stock/report/item_price_stock/item_price_stock.py,Selling Rate,Tasa de Ventas
+apps/erpnext/erpnext/selling/report/customer_wise_item_price/customer_wise_item_price.py,Selling Rate,Tasa de Ventas
 apps/erpnext/erpnext/erpnext_integrations/doctype/plaid_settings/plaid_settings.js,Please save your document before adding a new account,Guarde su documento antes de agregar una nueva cuenta
 DocType: Cost Center,Stock User,Usuario de almacén
 DocType: Soil Analysis,(Ca+Mg)/K,(Ca + Mg) / K
@@ -205,7 +205,6 @@
 DocType: Packed Item,Parent Detail docname,Detalle principal docname
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py,"Reference: {0}, Item Code: {1} and Customer: {2}","Referencia: {0}, Código del Artículo: {1} y Cliente: {2}"
 apps/erpnext/erpnext/accounts/report/consolidated_financial_statement/consolidated_financial_statement.py,{0} {1} is not present in the parent company,{0} {1} no está presente en la empresa padre
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Supplier &gt; Supplier Type,Proveedor&gt; Tipo de proveedor
 apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py,Trial Period End Date Cannot be before Trial Period Start Date,La Fecha de Finalización del Período de Prueba no puede ser anterior a la Fecha de Inicio del Período de Prueba
 apps/erpnext/erpnext/utilities/user_progress.py,Kg,Kilogramo
 DocType: Tax Withholding Category,Tax Withholding Category,Categoría de Retención de Impuestos
@@ -319,6 +318,7 @@
 DocType: Quality Procedure Table,Responsible Individual,Persona responsable
 DocType: Naming Series,Prefix,Prefijo
 apps/erpnext/erpnext/hr/notification/training_scheduled/training_scheduled.html,Event Location,Lugar del Evento
+apps/erpnext/erpnext/selling/report/customer_wise_item_price/customer_wise_item_price.py,Available Stock,Stock disponible
 DocType: Asset Settings,Asset Settings,Configuración de Activos
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py,Consumable,Consumible
 DocType: Student,B-,B-
@@ -351,6 +351,7 @@
 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 \
 				Serial No.","No se puede garantizar la entrega por número de serie, ya que \ Item {0} se agrega con y sin Garantizar entrega por \ Serial No."
+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/accounts/doctype/sales_invoice/sales_invoice.py,At least one mode of payment is required for POS invoice.,Se requiere al menos un modo de pago de la factura POS.
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py,Batch no is required for batched item {0},No se requiere lote para el artículo en lote {0}
 DocType: Bank Statement Transaction Invoice Item,Bank Statement Transaction Invoice Item,Estado de Factura de Transacción de Extracto Bancario
@@ -874,7 +875,6 @@
 DocType: Vital Signs,Blood Pressure (systolic),Presión Arterial (sistólica)
 apps/erpnext/erpnext/controllers/buying_controller.py,{0} {1} is {2},{0} {1} es {2}
 DocType: Item Price,Valid Upto,Válido Hasta
-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: Training Event,Workshop,Taller
 DocType: Supplier Scorecard Scoring Standing,Warn Purchase Orders,Avisar en Órdenes de Compra
 apps/erpnext/erpnext/utilities/user_progress.py,List a few of your customers. They could be organizations or individuals.,Enumere algunos de sus clientes. Pueden ser organizaciones o personas.
@@ -1658,7 +1658,6 @@
 DocType: Item Barcode,Item Barcode,Código de Barras del Producto
 DocType: Delivery Trip,In Transit,En Transito
 DocType: Woocommerce Settings,Endpoints,Endpoints
-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
 DocType: Shopping Cart Settings,Show Configure Button,Mostrar el botón Configurar
 DocType: Quality Inspection Reading,Reading 6,Lectura 6
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js,Cannot {0} {1} {2} without any negative outstanding invoice,No se puede {0} {1} {2} sin ninguna factura pendiente negativa
@@ -2018,6 +2017,7 @@
 DocType: Cheque Print Template,Payer Settings,Configuración del pagador
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js,No pending Material Requests found to link for the given items.,No se encontraron solicitudes de material pendientes de vincular para los artículos dados.
 apps/erpnext/erpnext/public/js/utils/party.js,Select company first,Seleccione primero la Compañia
+apps/erpnext/erpnext/accounts/general_ledger.py,Account: <b>{0}</b> is capital Work in progress and can not be updated by Journal Entry,Cuenta: <b>{0}</b> es capital Trabajo en progreso y no puede actualizarse mediante Entrada de diario
 apps/erpnext/erpnext/education/doctype/quiz/quiz.py,Compare List function takes on list arguments,La función Comparar lista toma argumentos de la lista
 DocType: Item Attribute Value,"This will be appended to the Item Code of the variant. For example, if your abbreviation is ""SM"", and the item code is ""T-SHIRT"", the item code of the variant will be ""T-SHIRT-SM""","Esto se añade al código del producto y la variante. Por ejemplo, si su abreviatura es ""SM"", y el código del artículo es ""CAMISETA"", entonces el código de artículo de la variante será ""CAMISETA-SM"""
 DocType: Salary Slip,Net Pay (in words) will be visible once you save the Salary Slip.,Pago neto (en palabras) será visible una vez que guarde la nómina salarial.
@@ -2202,6 +2202,7 @@
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js,Item 2,Elemento 2
 DocType: Pricing Rule,Validate Applied Rule,Validar regla aplicada
 DocType: QuickBooks Migrator,Authorization Endpoint,Endpoint de Autorización
+DocType: Employee Onboarding,Notify users by email,Notificar a los usuarios por correo electrónico
 DocType: Travel Request,International,Internacional
 DocType: Training Event,Training Event,Evento de Capacitación
 DocType: Item,Auto re-order,Ordenar Automáticamente
@@ -2812,7 +2813,6 @@
 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
-DocType: Contract,Inactive,Inactivo
 apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.js,This will submit Salary Slips and create accrual Journal Entry. Do you want to proceed?,Esto enviará hojas de salario y creará asientos acumulados. ¿Quieres proceder?
 DocType: Purchase Invoice,Total Net Weight,Peso Neto Total
 DocType: Purchase Order,Order Confirmation No,Confirmación de Pedido Nro
@@ -3089,7 +3089,6 @@
 apps/erpnext/erpnext/accounts/party.py,Billing currency must be equal to either default company's currency or party account currency,La moneda de facturación debe ser igual a la moneda de la compañía predeterminada o la moneda de la cuenta de la parte
 DocType: Packing Slip,Indicates that the package is a part of this delivery (Only Draft),Indica que el paquete es una parte de esta entrega (Sólo borradores)
 apps/erpnext/erpnext/accounts/report/customer_ledger_summary/customer_ledger_summary.py,Closing Balance,Balance de cierre
-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}
 DocType: Soil Texture,Loam,Marga
 apps/erpnext/erpnext/controllers/accounts_controller.py,Row {0}: Due Date cannot be before posting date,Fila {0}: Fecha de Vencimiento no puede ser anterior a la Fecha de Contabilización
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py,Quantity for Item {0} must be less than {1},La cantidad del producto {0} debe ser menor que {1}
@@ -3612,7 +3611,6 @@
 DocType: Stock Settings,Raise Material Request when stock reaches re-order level,Generar un pedido de materiales cuando se alcance un nivel bajo el stock
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py,Full-time,Jornada completa
 DocType: Payroll Entry,Employees,Empleados
-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: Question,Single Correct Answer,Respuesta correcta única
 DocType: Employee,Contact Details,Detalles de contacto
 DocType: C-Form,Received Date,Fecha de recepción
@@ -4223,6 +4221,7 @@
 DocType: Pricing Rule,Price or Product Discount,Precio o descuento del producto
 apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.py,For row {0}: Enter planned qty,Para la fila {0}: ingrese cantidad planificada
 DocType: Account,Income Account,Cuenta de ingresos
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Customer &gt; Customer Group &gt; Territory,Cliente&gt; Grupo de clientes&gt; Territorio
 DocType: Payment Request,Amount in customer's currency,Monto en divisa del cliente
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js,Delivery,Entregar
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.py,Assigning Structures...,Asignando Estructuras ...
@@ -4272,7 +4271,6 @@
 DocType: HR Settings,Check Vacancies On Job Offer Creation,Comprobar vacantes en la creación de ofertas de trabajo
 apps/erpnext/erpnext/utilities/user_progress.py,Go to Letterheads,Ir a Membretes
 DocType: Subscription,Cancel At End Of Period,Cancelar al Final del Período
-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/hr/doctype/employee_promotion/employee_promotion.js,Property already added,Propiedad ya Agregada
 DocType: Item Supplier,Item Supplier,Proveedor del Producto
 apps/erpnext/erpnext/public/js/controllers/transaction.js,Please enter Item Code to get batch no,"Por favor, ingrese el código del producto para obtener el numero de lote"
@@ -4569,6 +4567,7 @@
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.js,Warning: Material Requested Qty is less than Minimum Order Qty,Advertencia: La requisición de materiales es menor que la orden mínima establecida
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py,Account {0} is frozen,La cuenta {0} está congelada
 DocType: Quiz Question,Quiz Question,Pregunta de prueba
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Supplier &gt; Supplier Type,Proveedor&gt; Tipo de proveedor
 DocType: Company,Legal Entity / Subsidiary with a separate Chart of Accounts belonging to the Organization.,Entidad Legal / Subsidiario con un Catalogo de Cuentas separado que pertenece a la Organización.
 DocType: Payment Request,Mute Email,Email Silenciado
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py,"Food, Beverage & Tobacco","Alimentos, bebidas y tabaco"
@@ -5079,7 +5078,6 @@
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py,Delivery warehouse required for stock item {0},Almacén de entrega requerido para el inventrio del producto {0}
 DocType: Packing Slip,The gross weight of the package. Usually net weight + packaging material weight. (for print),El peso bruto del paquete. Peso + embalaje Normalmente material neto . (para impresión)
 DocType: Assessment Plan,Program,Programa
-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: Accounts Settings,Users with this role are allowed to set frozen accounts and create / modify accounting entries against frozen accounts,Los usuarios con este rol pueden establecer cuentas congeladas y crear / modificar los asientos contables para las mismas
 ,Project Billing Summary,Resumen de facturación del proyecto
 DocType: Vital Signs,Cuts,Cortes
@@ -5328,6 +5326,7 @@
 apps/erpnext/erpnext/quality_management/doctype/quality_review/quality_review_list.js,No Action,Ninguna acción
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js,Valuation type charges can not marked as Inclusive,Cargos de tipo de valoración no pueden marcado como Incluido
 DocType: POS Profile,Update Stock,Actualizar el Inventario
+apps/erpnext/erpnext/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/stock/doctype/packing_slip/packing_slip.js,Different UOM for items will lead to incorrect (Total) Net Weight value. Make sure that Net Weight of each item is in the same UOM.,Unidad de Medida diferente para elementos dará lugar a Peso Neto (Total) incorrecto. Asegúrese de que el peso neto de cada artículo esté en la misma Unidad de Medida.
 DocType: Certification Application,Payment Details,Detalles del Pago
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py,BOM Rate,Coeficiente de la lista de materiales (LdM)
@@ -5431,6 +5430,8 @@
 apps/erpnext/erpnext/accounts/doctype/monthly_distribution/monthly_distribution.py,Percentage Allocation should be equal to 100%,El porcentaje de asignación debe ser igual al 100%
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js,Please select Posting Date before selecting Party,"Por favor, seleccione fecha de publicación antes de seleccionar la Parte"
 apps/erpnext/erpnext/config/accounting.py,Payment Terms based on conditions,Términos de pago basados en condiciones
+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: Program Enrollment,School House,Casa Escolar
 DocType: Serial No,Out of AMC,Fuera de CMA (Contrato de mantenimiento anual)
 DocType: Opportunity,Opportunity Amount,Monto de Oportunidad
@@ -5632,6 +5633,7 @@
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py,Order/Quot %,Orden / Cotización %
 apps/erpnext/erpnext/config/healthcare.py,Record Patient Vitals,Registra las constantes vitales de los pacientes
 DocType: Fee Schedule,Institution,Institució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}
 DocType: Asset,Partially Depreciated,Despreciables Parcialmente
 DocType: Issue,Opening Time,Hora de Apertura
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py,From and To dates required,Desde y Hasta la fecha solicitada
@@ -5848,6 +5850,7 @@
 DocType: Quality Procedure Process,Link existing Quality Procedure.,Enlace Procedimiento de calidad existente.
 apps/erpnext/erpnext/config/hr.py,Loans,Préstamos
 DocType: Healthcare Service Unit,Healthcare Service Unit,Unidad de servicios de salud
+,Customer-wise Item Price,Precio del artículo sabio para el cliente
 apps/erpnext/erpnext/public/js/financial_statements.js,Cash Flow Statement,Estado de Flujos de Efectivo
 apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.py,No material request created,No se ha creado ninguna solicitud material
 apps/erpnext/erpnext/hr/doctype/loan_application/loan_application.py,Loan Amount cannot exceed Maximum Loan Amount of {0},Monto del préstamo no puede exceder cantidad máxima del préstamo de {0}
@@ -6109,6 +6112,7 @@
 apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py,Opening Value,Valor de Apertura
 DocType: Salary Component,Formula,Fórmula
 apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py,Serial #,Serial #.
+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: Material Request Plan Item,Required Quantity,Cantidad requerida
 DocType: Lab Test Template,Lab Test Template,Plantilla de Prueba de Laboratorio
 apps/erpnext/erpnext/accounts/doctype/accounting_period/accounting_period.py,Accounting Period overlaps with {0},El período contable se superpone con {0}
@@ -6358,7 +6362,6 @@
 DocType: Request for Quotation Item,Project Name,Nombre de Proyecto
 apps/erpnext/erpnext/regional/italy/utils.py,Please set the Customer Address,"Por favor, configure la dirección del cliente"
 DocType: Customer,Mention if non-standard receivable account,Indique si utiliza una cuenta por cobrar distinta a la predeterminada
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Customer &gt; Customer Group &gt; Territory,Cliente&gt; Grupo de clientes&gt; Territorio
 DocType: Bank,Plaid Access Token,Token de acceso a cuadros
 apps/erpnext/erpnext/hr/doctype/employee_benefit_application/employee_benefit_application.py,Please add the remaining benefits {0} to any of the existing component,Agregue los beneficios restantes {0} a cualquiera de los componentes existentes
 DocType: Journal Entry Account,If Income or Expense,Indique si es un ingreso o egreso
@@ -6621,8 +6624,6 @@
 apps/erpnext/erpnext/buying/utils.py,Please enter quantity for Item {0},"Por favor, ingrese la cantidad para el producto {0}"
 DocType: Quality Procedure,Processes,Procesos
 DocType: Shift Type,First Check-in and Last Check-out,Primer check-in y último check-out
-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/regional/report/hsn_wise_summary_of_outward_supplies/hsn_wise_summary_of_outward_supplies.py,Total Taxable Amount,Monto Imponible Total
 DocType: Employee External Work History,Employee External Work History,Historial de de trabajos anteriores
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.py,Job card {0} created,Tarjeta de Trabajo {0} creada
@@ -6658,6 +6659,7 @@
 apps/erpnext/erpnext/accounts/doctype/payment_terms_template/payment_terms_template.py,Combined invoice portion must equal 100%,La porción combinada de la factura debe ser igual al 100%
 DocType: Item Default,Default Expense Account,Cuenta de gastos por defecto
 DocType: GST Account,CGST Account,Cuenta CGST
+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/education/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py,Student Email ID,ID de Correo Electrónico de Estudiante
 DocType: Employee,Notice (days),Aviso (días)
 DocType: POS Closing Voucher Invoices,POS Closing Voucher Invoices,Facturas de cupones de cierre de POS
@@ -7296,6 +7298,7 @@
 DocType: Maintenance Visit,Maintenance Date,Fecha de Mantenimiento
 DocType: Purchase Invoice Item,Rejected Serial No,No. de serie rechazado
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py,Year start date or end date is overlapping with {0}. To avoid please set company,Fecha de inicio de año o fecha de finalización  de año está traslapando con {0}. Para evitar porfavor establezca empresa
+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/selling/doctype/customer/customer.py,Please mention the Lead Name in Lead {0},Por favor mencione el nombre principal en la iniciativa {0}
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py,Start date should be less than end date for Item {0},La fecha de inicio debe ser menor que la fecha de finalización para el producto {0}
 DocType: Shift Type,Auto Attendance Settings,Configuraciones de asistencia automática
diff --git a/erpnext/translations/et.csv b/erpnext/translations/et.csv
index 3836686..5e8d125 100644
--- a/erpnext/translations/et.csv
+++ b/erpnext/translations/et.csv
@@ -166,7 +166,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py,Accountant,Raamatupidaja
 apps/erpnext/erpnext/stock/report/item_price_stock/item_price_stock.py,Selling Price List,Müügi hinnakiri
 DocType: Patient,Tobacco Current Use,Tubaka praegune kasutamine
-apps/erpnext/erpnext/stock/report/item_price_stock/item_price_stock.py,Selling Rate,Müügihind
+apps/erpnext/erpnext/selling/report/customer_wise_item_price/customer_wise_item_price.py,Selling Rate,Müügihind
 apps/erpnext/erpnext/erpnext_integrations/doctype/plaid_settings/plaid_settings.js,Please save your document before adding a new account,Enne uue konto lisamist salvestage dokument
 DocType: Cost Center,Stock User,Stock Kasutaja
 DocType: Soil Analysis,(Ca+Mg)/K,(Ca + Mg) / K
@@ -203,7 +203,6 @@
 DocType: Packed Item,Parent Detail docname,Parent Detail docname
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py,"Reference: {0}, Item Code: {1} and Customer: {2}","Viide: {0}, Kood: {1} ja kliendi: {2}"
 apps/erpnext/erpnext/accounts/report/consolidated_financial_statement/consolidated_financial_statement.py,{0} {1} is not present in the parent company,{0} {1} ei ole emaettevõttes
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Supplier &gt; Supplier Type,Tarnija&gt; Tarnija tüüp
 apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py,Trial Period End Date Cannot be before Trial Period Start Date,Katseperioodi lõppkuupäev ei saa olla enne katseperioodi alguskuupäeva
 apps/erpnext/erpnext/utilities/user_progress.py,Kg,Kg
 DocType: Tax Withholding Category,Tax Withholding Category,Maksu kinnipidamise kategooria
@@ -316,6 +315,7 @@
 DocType: Quality Procedure Table,Responsible Individual,Vastutustundlik inimene
 DocType: Naming Series,Prefix,Eesliide
 apps/erpnext/erpnext/hr/notification/training_scheduled/training_scheduled.html,Event Location,Sündmuse asukoht
+apps/erpnext/erpnext/selling/report/customer_wise_item_price/customer_wise_item_price.py,Available Stock,Saadaval laos
 DocType: Asset Settings,Asset Settings,Varade seaded
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py,Consumable,Tarbitav
 DocType: Student,B-,B-
@@ -348,6 +348,7 @@
 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 \
 				Serial No.","Ei saa tagada tarnimise järjekorranumbriga, kuna \ Poolel {0} lisatakse ja ilma, et tagada tarnimine \ seerianumbriga"
+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/accounts/doctype/sales_invoice/sales_invoice.py,At least one mode of payment is required for POS invoice.,Vähemalt üks makseviis on vajalik POS arve.
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py,Batch no is required for batched item {0},Partii nr on partiiga {0} vajalik
 DocType: Bank Statement Transaction Invoice Item,Bank Statement Transaction Invoice Item,Pangakonto tehingu arve kirje
@@ -870,7 +871,6 @@
 DocType: Vital Signs,Blood Pressure (systolic),Vererõhk (süstoolne)
 apps/erpnext/erpnext/controllers/buying_controller.py,{0} {1} is {2},{0} {1} on {2}
 DocType: Item Price,Valid Upto,Kehtib Upto
-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: Training Event,Workshop,töökoda
 DocType: Supplier Scorecard Scoring Standing,Warn Purchase Orders,Hoiata ostutellimusi
 apps/erpnext/erpnext/utilities/user_progress.py,List a few of your customers. They could be organizations or individuals.,Nimekiri paar oma klientidele. Nad võivad olla organisatsioonid ja üksikisikud.
@@ -1654,7 +1654,6 @@
 DocType: Item Barcode,Item Barcode,Punkt Triipkood
 DocType: Delivery Trip,In Transit,Teel
 DocType: Woocommerce Settings,Endpoints,Lõppjooned
-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
 DocType: Shopping Cart Settings,Show Configure Button,Kuva nupp Seadista
 DocType: Quality Inspection Reading,Reading 6,Lugemine 6
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js,Cannot {0} {1} {2} without any negative outstanding invoice,Ei saa {0} {1} {2} ilma negatiivse tasumata arve
@@ -2014,6 +2013,7 @@
 DocType: Cheque Print Template,Payer Settings,maksja seaded
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js,No pending Material Requests found to link for the given items.,Ükski ootel materiaalsetest taotlustest ei leitud antud esemete linkimiseks.
 apps/erpnext/erpnext/public/js/utils/party.js,Select company first,Esmalt valige ettevõte
+apps/erpnext/erpnext/accounts/general_ledger.py,Account: <b>{0}</b> is capital Work in progress and can not be updated by Journal Entry,Konto: <b>{0}</b> on kapital Käimasolev töö ja seda ei saa ajakirjakanne värskendada
 apps/erpnext/erpnext/education/doctype/quiz/quiz.py,Compare List function takes on list arguments,Funktsioon Võrdle loendit võtab nimekirja argumendid
 DocType: Item Attribute Value,"This will be appended to the Item Code of the variant. For example, if your abbreviation is ""SM"", and the item code is ""T-SHIRT"", the item code of the variant will be ""T-SHIRT-SM""","See on lisatud Kood variandi. Näiteks, kui teie lühend on ""SM"", ning objekti kood on ""T-särk"", kirje kood variant on ""T-särk SM"""
 DocType: Salary Slip,Net Pay (in words) will be visible once you save the Salary Slip.,Netopalk (sõnadega) ilmuvad nähtavale kui salvestate palgatõend.
@@ -2198,6 +2198,7 @@
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js,Item 2,Punkt 2
 DocType: Pricing Rule,Validate Applied Rule,Kinnitage rakendatud reegel
 DocType: QuickBooks Migrator,Authorization Endpoint,Autoriseerimise lõpp-punkt
+DocType: Employee Onboarding,Notify users by email,Kasutajaid teavitage e-posti teel
 DocType: Travel Request,International,Rahvusvaheline
 DocType: Training Event,Training Event,koolitus Sündmus
 DocType: Item,Auto re-order,Auto ümber korraldada
@@ -2808,7 +2809,6 @@
 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
-DocType: Contract,Inactive,Mitteaktiivne
 apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.js,This will submit Salary Slips and create accrual Journal Entry. Do you want to proceed?,See esitab Palkade loendused ja loob kogunenud ajakirja kande. Kas soovite jätkata?
 DocType: Purchase Invoice,Total Net Weight,Netokaal kokku
 DocType: Purchase Order,Order Confirmation No,Telli kinnitus nr
@@ -3084,7 +3084,6 @@
 apps/erpnext/erpnext/accounts/party.py,Billing currency must be equal to either default company's currency or party account currency,Arveldusvaluuta peab olema võrdne kas ettevõtte vaikimisi valuuta või partei konto valuutaga
 DocType: Packing Slip,Indicates that the package is a part of this delivery (Only Draft),"Näitab, et pakend on osa sellest sünnitust (Ainult eelnõu)"
 apps/erpnext/erpnext/accounts/report/customer_ledger_summary/customer_ledger_summary.py,Closing Balance,Saldo sulgemine
-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
 DocType: Soil Texture,Loam,Loam
 apps/erpnext/erpnext/controllers/accounts_controller.py,Row {0}: Due Date cannot be before posting date,Rida {0}: tähtaeg ei saa olla enne postitamise kuupäeva
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py,Quantity for Item {0} must be less than {1},Kogus Punkt {0} peab olema väiksem kui {1}
@@ -3607,7 +3606,6 @@
 DocType: Stock Settings,Raise Material Request when stock reaches re-order level,"Tõsta materjal taotlus, kui aktsia jõuab uuesti, et tase"
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py,Full-time,Täiskohaga
 DocType: Payroll Entry,Employees,Töötajad
-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: Question,Single Correct Answer,Üksik õige vastus
 DocType: Employee,Contact Details,Kontaktandmed
 DocType: C-Form,Received Date,Vastatud kuupäev
@@ -4216,6 +4214,7 @@
 DocType: Pricing Rule,Price or Product Discount,Hind või toote allahindlus
 apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.py,For row {0}: Enter planned qty,Rida {0}: sisestage kavandatud kogus
 DocType: Account,Income Account,Tulukonto
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Customer &gt; Customer Group &gt; Territory,Klient&gt; kliendigrupp&gt; territoorium
 DocType: Payment Request,Amount in customer's currency,Summa kliendi valuuta
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js,Delivery,Tarne
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.py,Assigning Structures...,Struktuuride määramine ...
@@ -4265,7 +4264,6 @@
 DocType: HR Settings,Check Vacancies On Job Offer Creation,Kontrollige tööpakkumiste loomise vabu kohti
 apps/erpnext/erpnext/utilities/user_progress.py,Go to Letterheads,Mine kleebiste juurde
 DocType: Subscription,Cancel At End Of Period,Lõpetage perioodi lõpus
-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/hr/doctype/employee_promotion/employee_promotion.js,Property already added,Kinnisvara on juba lisatud
 DocType: Item Supplier,Item Supplier,Punkt Tarnija
 apps/erpnext/erpnext/public/js/controllers/transaction.js,Please enter Item Code to get batch no,Palun sisestage Kood saada partii ei
@@ -4550,6 +4548,7 @@
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.js,Warning: Material Requested Qty is less than Minimum Order Qty,Hoiatus: Materjal Taotletud Kogus alla Tellimuse Miinimum Kogus
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py,Account {0} is frozen,Konto {0} on külmutatud
 DocType: Quiz Question,Quiz Question,Viktoriiniküsimus
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Supplier &gt; Supplier Type,Tarnija&gt; Tarnija tüüp
 DocType: Company,Legal Entity / Subsidiary with a separate Chart of Accounts belonging to the Organization.,Juriidilise isiku / tütarettevõtte eraldi kontoplaani kuuluv organisatsioon.
 DocType: Payment Request,Mute Email,Mute Email
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py,"Food, Beverage & Tobacco","Toit, jook ja tubakas"
@@ -5060,7 +5059,6 @@
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py,Delivery warehouse required for stock item {0},Toimetaja lattu vajalik varude objekti {0}
 DocType: Packing Slip,The gross weight of the package. Usually net weight + packaging material weight. (for print),Brutokaal pakendis. Tavaliselt netokaal + pakkematerjali kaal. (trüki)
 DocType: Assessment Plan,Program,programm
-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: Accounts Settings,Users with this role are allowed to set frozen accounts and create / modify accounting entries against frozen accounts,Kasutajad seda rolli on lubatud kehtestada külmutatud kontode ja luua / muuta raamatupidamiskirjeteks vastu külmutatud kontode
 ,Project Billing Summary,Projekti arvelduse kokkuvõte
 DocType: Vital Signs,Cuts,Kärped
@@ -5307,6 +5305,7 @@
 apps/erpnext/erpnext/quality_management/doctype/quality_review/quality_review_list.js,No Action,Tegevust pole
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js,Valuation type charges can not marked as Inclusive,Hindamine tüübist tasu ei märgitud Inclusive
 DocType: POS Profile,Update Stock,Värskenda Stock
+apps/erpnext/erpnext/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/stock/doctype/packing_slip/packing_slip.js,Different UOM for items will lead to incorrect (Total) Net Weight value. Make sure that Net Weight of each item is in the same UOM.,"Erinevad UOM objekte viib vale (kokku) Net Weight väärtus. Veenduge, et Net Weight iga objekt on sama UOM."
 DocType: Certification Application,Payment Details,Makse andmed
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py,BOM Rate,Bom Rate
@@ -5410,6 +5409,8 @@
 apps/erpnext/erpnext/accounts/doctype/monthly_distribution/monthly_distribution.py,Percentage Allocation should be equal to 100%,Protsentuaalne jaotus peaks olema suurem kui 100%
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js,Please select Posting Date before selecting Party,Palun valige Postitamise kuupäev enne valides Party
 apps/erpnext/erpnext/config/accounting.py,Payment Terms based on conditions,Maksetingimused vastavalt tingimustele
+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: Program Enrollment,School House,School House
 DocType: Serial No,Out of AMC,Out of AMC
 DocType: Opportunity,Opportunity Amount,Võimaluse summa
@@ -5609,6 +5610,7 @@
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py,Order/Quot %,Tellimus / Caster%
 apps/erpnext/erpnext/config/healthcare.py,Record Patient Vitals,Salvesta patsiendil Vitals
 DocType: Fee Schedule,Institution,Institutsioon
+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
 DocType: Asset,Partially Depreciated,osaliselt Amortiseerunud
 DocType: Issue,Opening Time,Avamine aeg
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py,From and To dates required,Ja sealt soovitud vaja
@@ -5825,6 +5827,7 @@
 DocType: Quality Procedure Process,Link existing Quality Procedure.,Siduge olemasolev kvaliteediprotseduur.
 apps/erpnext/erpnext/config/hr.py,Loans,Laenud
 DocType: Healthcare Service Unit,Healthcare Service Unit,Tervishoiuteenuse üksus
+,Customer-wise Item Price,Kliendi tarkuse hind
 apps/erpnext/erpnext/public/js/financial_statements.js,Cash Flow Statement,Rahavoogude aruanne
 apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.py,No material request created,Ükski materiaalne taotlus pole loodud
 apps/erpnext/erpnext/hr/doctype/loan_application/loan_application.py,Loan Amount cannot exceed Maximum Loan Amount of {0},Laenusumma ei tohi ületada Maksimaalne laenusumma {0}
@@ -6086,6 +6089,7 @@
 apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py,Opening Value,Seis
 DocType: Salary Component,Formula,valem
 apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py,Serial #,Serial #
+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: Material Request Plan Item,Required Quantity,Vajalik kogus
 DocType: Lab Test Template,Lab Test Template,Lab Test Template
 apps/erpnext/erpnext/accounts/doctype/accounting_period/accounting_period.py,Accounting Period overlaps with {0},Arvestusperiood kattub {0} -ga
@@ -6335,7 +6339,6 @@
 DocType: Request for Quotation Item,Project Name,Projekti nimi
 apps/erpnext/erpnext/regional/italy/utils.py,Please set the Customer Address,Palun määrake kliendi aadress
 DocType: Customer,Mention if non-standard receivable account,Nimetatakse mittestandardsete saadaoleva konto
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Customer &gt; Customer Group &gt; Territory,Klient&gt; kliendigrupp&gt; territoorium
 DocType: Bank,Plaid Access Token,Plaidjuurdepääsuluba
 apps/erpnext/erpnext/hr/doctype/employee_benefit_application/employee_benefit_application.py,Please add the remaining benefits {0} to any of the existing component,Palun lisage ülejäänud eelised {0} mis tahes olemasolevale komponendile
 DocType: Journal Entry Account,If Income or Expense,Kui tulu või kuluna
@@ -6598,8 +6601,6 @@
 apps/erpnext/erpnext/buying/utils.py,Please enter quantity for Item {0},Palun sisestage koguse Punkt {0}
 DocType: Quality Procedure,Processes,Protsessid
 DocType: Shift Type,First Check-in and Last Check-out,Esimene sisseregistreerimine ja viimane väljaregistreerimine
-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/regional/report/hsn_wise_summary_of_outward_supplies/hsn_wise_summary_of_outward_supplies.py,Total Taxable Amount,Kogu maksustatav summa
 DocType: Employee External Work History,Employee External Work History,Töötaja Väline tööandjad
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.py,Job card {0} created,Töökaart {0} loodud
@@ -6635,6 +6636,7 @@
 apps/erpnext/erpnext/accounts/doctype/payment_terms_template/payment_terms_template.py,Combined invoice portion must equal 100%,Kombineeritud arveosa peab olema 100%
 DocType: Item Default,Default Expense Account,Vaikimisi ärikohtumisteks
 DocType: GST Account,CGST Account,CGST konto
+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/education/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py,Student Email ID,Student E-ID
 DocType: Employee,Notice (days),Teade (päeva)
 DocType: POS Closing Voucher Invoices,POS Closing Voucher Invoices,POS sulgemisveokeri arve
@@ -7273,6 +7275,7 @@
 DocType: Maintenance Visit,Maintenance Date,Hooldus kuupäev
 DocType: Purchase Invoice Item,Rejected Serial No,Tagasilükatud Järjekorranumber
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py,Year start date or end date is overlapping with {0}. To avoid please set company,"Aasta algus- või lõppkuupäev kattub {0}. Et vältida, määrake ettevõte"
+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/selling/doctype/customer/customer.py,Please mention the Lead Name in Lead {0},Palun mainige juhtiva nime juhtimisel {0}
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py,Start date should be less than end date for Item {0},Alguskuupäev peab olema väiksem kui lõppkuupäev Punkt {0}
 DocType: Shift Type,Auto Attendance Settings,Automaatse osalemise seaded
diff --git a/erpnext/translations/fa.csv b/erpnext/translations/fa.csv
index dfca114..9e99ca3 100644
--- a/erpnext/translations/fa.csv
+++ b/erpnext/translations/fa.csv
@@ -165,7 +165,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py,Accountant,حسابدار
 apps/erpnext/erpnext/stock/report/item_price_stock/item_price_stock.py,Selling Price List,لیست قیمت فروش
 DocType: Patient,Tobacco Current Use,مصرف فعلی توتون و تنباکو
-apps/erpnext/erpnext/stock/report/item_price_stock/item_price_stock.py,Selling Rate,قیمت فروش
+apps/erpnext/erpnext/selling/report/customer_wise_item_price/customer_wise_item_price.py,Selling Rate,قیمت فروش
 apps/erpnext/erpnext/erpnext_integrations/doctype/plaid_settings/plaid_settings.js,Please save your document before adding a new account,لطفا قبل از اضافه کردن حساب جدید ، سند خود را ذخیره کنید
 DocType: Cost Center,Stock User,سهام کاربر
 DocType: Soil Analysis,(Ca+Mg)/K,(Ca + Mg) / K
@@ -202,7 +202,6 @@
 DocType: Packed Item,Parent Detail docname,جزئیات docname پدر و مادر
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py,"Reference: {0}, Item Code: {1} and Customer: {2}",مرجع: {0}، کد مورد: {1} و ضوابط: {2}
 apps/erpnext/erpnext/accounts/report/consolidated_financial_statement/consolidated_financial_statement.py,{0} {1} is not present in the parent company,{0} {1} در شرکت مادر وجود ندارد
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Supplier &gt; Supplier Type,عرضه کننده&gt; نوع عرضه کننده
 apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py,Trial Period End Date Cannot be before Trial Period Start Date,تاریخ پایان دوره آزمایشی نمی تواند قبل از دوره آزمایشی تاریخ شروع شود
 apps/erpnext/erpnext/utilities/user_progress.py,Kg,کیلوگرم
 DocType: Tax Withholding Category,Tax Withholding Category,بخش مالیات اجباری
@@ -314,6 +313,7 @@
 DocType: Quality Procedure Table,Responsible Individual,فرد مسئول
 DocType: Naming Series,Prefix,پیشوند
 apps/erpnext/erpnext/hr/notification/training_scheduled/training_scheduled.html,Event Location,محل رویداد
+apps/erpnext/erpnext/selling/report/customer_wise_item_price/customer_wise_item_price.py,Available Stock,ذخیره موجود
 DocType: Asset Settings,Asset Settings,تنظیمات دارایی
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py,Consumable,مصرفی
 DocType: Student,B-,B-
@@ -346,6 +346,7 @@
 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 \
 				Serial No.",می توانید تحویل توسط Serial No را تضمین نکنید \ Item {0} با و بدون تأیید تحویل توسط \ سریال اضافه می شود
+apps/erpnext/erpnext/education/doctype/instructor/instructor.py,Please setup Instructor Naming System in Education &gt; Education Settings,لطفاً سیستم نامگذاری مربی را در آموزش و پرورش&gt; تنظیمات آموزش تنظیم کنید
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py,At least one mode of payment is required for POS invoice.,باید حداقل یک حالت پرداخت برای فاکتور POS مورد نیاز است.
 DocType: Bank Statement Transaction Invoice Item,Bank Statement Transaction Invoice Item,بیانیه بانکی صورت حساب صورتحساب تراکنش
 DocType: Salary Detail,Tax on flexible benefit,مالیات بر سود انعطاف پذیر
@@ -560,6 +561,7 @@
 DocType: Inpatient Record,Admitted Datetime,تاریخ تایید پذیرفته شد
 DocType: Work Order,Backflush raw materials from work-in-progress warehouse,مواد خام اولیه از انبار کار در حال پیشرفت
 apps/erpnext/erpnext/stock/report/item_variant_details/item_variant_details.py,Open Orders,سفارشات را باز کنید
+apps/erpnext/erpnext/hr/doctype/employee_benefit_claim/employee_benefit_claim.py,Unable to find Salary Component {0},یافتن جزء حقوق و دستمزد {0} یافت نشد
 apps/erpnext/erpnext/healthcare/setup.py,Low Sensitivity,حساسیت کم
 apps/erpnext/erpnext/erpnext_integrations/doctype/shopify_log/shopify_log.js,Order rescheduled for sync,سفارش همگام سازی مجدد
 apps/erpnext/erpnext/templates/emails/training_event.html,Please confirm once you have completed your training,لطفا پس از اتمام آموزش خود را تأیید کنید
@@ -1601,6 +1603,7 @@
 DocType: Marketplace Settings,Custom Data,داده های سفارشی
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py,Warehouses with existing transaction can not be converted to ledger.,انبارها با معامله موجود می توانید به دفتر تبدیل نمی کند.
 DocType: Service Day,Service Day,روز خدمت
+apps/erpnext/erpnext/projects/doctype/project/project.py,Project Summary for {0},خلاصه پروژه برای {0}
 apps/erpnext/erpnext/hub_node/api.py,Unable to update remote activity,امکان به روزرسانی فعالیت از راه دور وجود ندارد
 apps/erpnext/erpnext/controllers/buying_controller.py,Serial no is mandatory for the item {0},شماره سریال برای آیتم {0} اجباری است
 DocType: Bank Reconciliation,Total Amount,مقدار کل
@@ -1633,7 +1636,6 @@
 DocType: Item Barcode,Item Barcode,بارکد مورد
 DocType: Delivery Trip,In Transit,در ترانزیت
 DocType: Woocommerce Settings,Endpoints,نقطه پایانی
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Item Code &gt; Item Group &gt; Brand,کد کالا&gt; گروه مورد&gt; نام تجاری
 DocType: Shopping Cart Settings,Show Configure Button,نمایش دکمه پیکربندی
 DocType: Quality Inspection Reading,Reading 6,خواندن 6
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js,Cannot {0} {1} {2} without any negative outstanding invoice,آیا می توانم {0} {1} {2} بدون هیچ فاکتور برجسته منفی
@@ -1991,6 +1993,7 @@
 DocType: Cheque Print Template,Payer Settings,تنظیمات پرداخت کننده
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js,No pending Material Requests found to link for the given items.,هیچ درخواستی در انتظار درخواست برای پیدا کردن لینک برای موارد داده شده یافت نشد.
 apps/erpnext/erpnext/public/js/utils/party.js,Select company first,اولین شرکت را انتخاب کنید
+apps/erpnext/erpnext/accounts/general_ledger.py,Account: <b>{0}</b> is capital Work in progress and can not be updated by Journal Entry,حساب: <b>{0}</b> سرمایه در حال انجام است و توسط Journal Entry قابل به روزرسانی نیست
 apps/erpnext/erpnext/education/doctype/quiz/quiz.py,Compare List function takes on list arguments,تابع مقایسه لیست آرگومان های لیست را می گیرد
 DocType: Item Attribute Value,"This will be appended to the Item Code of the variant. For example, if your abbreviation is ""SM"", and the item code is ""T-SHIRT"", the item code of the variant will be ""T-SHIRT-SM""",این خواهد شد به کد مورد از نوع اضافه خواهد شد. برای مثال، اگر شما مخفف &quot;SM&quot; است، و کد مورد است &quot;تی شرت&quot;، کد مورد از نوع خواهد بود &quot;تی شرت-SM&quot;
 DocType: Salary Slip,Net Pay (in words) will be visible once you save the Salary Slip.,پرداخت خالص (به عبارت) قابل مشاهده خواهد بود یک بار شما را لغزش حقوق و دستمزد را نجات دهد.
@@ -2087,6 +2090,7 @@
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py,Optional Holiday List not set for leave period {0},فهرست تعطیلات اختیاری برای مدت زمان تعطیل تنظیم نمی شود {0}
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py,Research,پژوهش
 apps/erpnext/erpnext/regional/report/eway_bill/eway_bill.py,To Address 2,برای آدرس 2
+apps/erpnext/erpnext/manufacturing/doctype/job_card/job_card.py,Row {0}: From time must be less than to time,ردیف {0}: از زمان باید کمتر از زمان باشد
 DocType: Maintenance Visit Purpose,Work Done,کار تمام شد
 apps/erpnext/erpnext/controllers/item_variant.py,Please specify at least one attribute in the Attributes table,لطفا حداقل یک ویژگی در جدول صفات مشخص
 DocType: Announcement,All Students,همه ی دانش آموزان
@@ -2173,6 +2177,7 @@
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js,Item 2,آیتم 2
 DocType: Pricing Rule,Validate Applied Rule,یک قانون کاربردی را تأیید کنید
 DocType: QuickBooks Migrator,Authorization Endpoint,نقطه پایانی مجوز
+DocType: Employee Onboarding,Notify users by email,از طریق ایمیل به کاربران اطلاع دهید
 DocType: Travel Request,International,بین المللی
 DocType: Training Event,Training Event,برنامه آموزشی
 DocType: Item,Auto re-order,خودکار دوباره سفارش
@@ -2775,7 +2780,6 @@
 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,یک مشتری با همین نام قبلا وجود دارد
-DocType: Contract,Inactive,غیر فعال
 apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.js,This will submit Salary Slips and create accrual Journal Entry. Do you want to proceed?,این باعث می شود که حقوق و دستمزد را ایجاد کنید و مجله ورودی تعهدی ایجاد کنید. آیا شما می خواهید ادامه دهید؟
 DocType: Purchase Invoice,Total Net Weight,مجموع وزن خالص
 DocType: Purchase Order,Order Confirmation No,سفارش تأیید شماره
@@ -3565,7 +3569,6 @@
 DocType: Stock Settings,Raise Material Request when stock reaches re-order level,افزایش درخواست مواد زمانی که سهام سطح دوباره سفارش می رسد
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py,Full-time,تمام وقت
 DocType: Payroll Entry,Employees,کارمندان
-apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py,Please setup numbering series for Attendance via Setup &gt; Numbering Series,لطفاً سریال های شماره گذاری را برای حضور از طریق تنظیم&gt; سری شماره گذاری تنظیم کنید
 DocType: Question,Single Correct Answer,جواب درست صحیح
 DocType: Employee,Contact Details,اطلاعات تماس
 DocType: C-Form,Received Date,تاریخ دریافت
@@ -4169,6 +4172,7 @@
 DocType: Pricing Rule,Price or Product Discount,قیمت یا تخفیف محصول
 apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.py,For row {0}: Enter planned qty,برای ردیف {0}: تعداد برنامه ریزی شده را وارد کنید
 DocType: Account,Income Account,حساب درآمد
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Customer &gt; Customer Group &gt; Territory,مشتری&gt; گروه مشتری&gt; سرزمین
 DocType: Payment Request,Amount in customer's currency,مبلغ پول مشتری
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js,Delivery,تحویل
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.py,Assigning Structures...,اختصاص ساختارها ...
@@ -4217,7 +4221,6 @@
 DocType: HR Settings,Check Vacancies On Job Offer Creation,فرصتهای شغلی در ایجاد پیشنهاد شغلی را بررسی کنید
 apps/erpnext/erpnext/utilities/user_progress.py,Go to Letterheads,برو به نامه ها
 DocType: Subscription,Cancel At End Of Period,لغو در پایان دوره
-apps/erpnext/erpnext/education/doctype/instructor/instructor.py,Please setup Instructor Naming System in Education &gt; Education Settings,لطفاً سیستم نامگذاری مربی را در آموزش و پرورش&gt; تنظیمات آموزش تنظیم کنید
 apps/erpnext/erpnext/hr/doctype/employee_promotion/employee_promotion.js,Property already added,املاک در حال حاضر اضافه شده است
 DocType: Item Supplier,Item Supplier,تامین کننده مورد
 apps/erpnext/erpnext/public/js/controllers/transaction.js,Please enter Item Code to get batch no,لطفا کد مورد وارد کنید دسته ای هیچ
@@ -4498,6 +4501,7 @@
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.js,Warning: Material Requested Qty is less than Minimum Order Qty,هشدار: مواد درخواست شده تعداد کمتر از حداقل تعداد سفارش تعداد است
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py,Account {0} is frozen,حساب {0} فریز شده است
 DocType: Quiz Question,Quiz Question,سوال مسابقه
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Supplier &gt; Supplier Type,عرضه کننده&gt; نوع عرضه کننده
 DocType: Company,Legal Entity / Subsidiary with a separate Chart of Accounts belonging to the Organization.,حقوقی نهاد / جانبی با نمودار جداگانه حساب متعلق به سازمان.
 DocType: Payment Request,Mute Email,بیصدا کردن ایمیل
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py,"Food, Beverage & Tobacco",مواد غذایی، آشامیدنی و دخانیات
@@ -5003,7 +5007,6 @@
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py,Delivery warehouse required for stock item {0},انبار تحویل مورد نیاز برای سهام مورد {0}
 DocType: Packing Slip,The gross weight of the package. Usually net weight + packaging material weight. (for print),وزن ناخالص از بسته. معمولا وزن خالص + وزن مواد بسته بندی. (برای چاپ)
 DocType: Assessment Plan,Program,برنامه
-apps/erpnext/erpnext/hr/doctype/employee/employee.py,Please setup Employee Naming System in Human Resource &gt; HR Settings,لطفاً سیستم نامگذاری کارمندان را در منابع انسانی&gt; تنظیمات HR تنظیم کنید
 DocType: Accounts Settings,Users with this role are allowed to set frozen accounts and create / modify accounting entries against frozen accounts,کاربران با این نقش ها اجازه تنظیم حساب های یخ زده و ایجاد / تغییر نوشته های حسابداری در برابر حساب منجمد
 ,Project Billing Summary,خلاصه صورتحساب پروژه
 DocType: Vital Signs,Cuts,برش
@@ -5346,6 +5349,8 @@
 apps/erpnext/erpnext/accounts/doctype/monthly_distribution/monthly_distribution.py,Percentage Allocation should be equal to 100%,درصد تخصیص باید به 100٪ برابر باشد
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js,Please select Posting Date before selecting Party,لطفا ارسال تاریخ قبل از انتخاب حزب را انتخاب کنید
 apps/erpnext/erpnext/config/accounting.py,Payment Terms based on conditions,شرایط پرداخت بر اساس شرایط
+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: Program Enrollment,School House,مدرسه خانه
 DocType: Serial No,Out of AMC,از AMC
 DocType: Opportunity,Opportunity Amount,مقدار فرصت
@@ -5757,6 +5762,7 @@
 DocType: Quality Procedure Process,Link existing Quality Procedure.,رویه کیفیت موجود را پیوند دهید.
 apps/erpnext/erpnext/config/hr.py,Loans,وام
 DocType: Healthcare Service Unit,Healthcare Service Unit,واحد خدمات سلامت
+,Customer-wise Item Price,قیمت کالای خردمندانه مشتری
 apps/erpnext/erpnext/public/js/financial_statements.js,Cash Flow Statement,صورت جریان وجوه نقد
 apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.py,No material request created,درخواست مادری ایجاد نشد
 apps/erpnext/erpnext/hr/doctype/loan_application/loan_application.py,Loan Amount cannot exceed Maximum Loan Amount of {0},وام مبلغ می توانید حداکثر مبلغ وام از تجاوز نمی {0}
@@ -6016,6 +6022,7 @@
 apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py,Opening Value,ارزش باز
 DocType: Salary Component,Formula,فرمول
 apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py,Serial #,سریال #
+apps/erpnext/erpnext/hr/doctype/employee/employee.py,Please setup Employee Naming System in Human Resource &gt; HR Settings,لطفاً سیستم نامگذاری کارمندان را در منابع انسانی&gt; تنظیمات HR تنظیم کنید
 DocType: Material Request Plan Item,Required Quantity,مقدار مورد نیاز
 DocType: Lab Test Template,Lab Test Template,آزمایش آزمایشی
 apps/erpnext/erpnext/accounts/doctype/accounting_period/accounting_period.py,Accounting Period overlaps with {0},دوره حسابداری با {0} همپوشانی دارد
@@ -6260,7 +6267,6 @@
 DocType: Request for Quotation Item,Project Name,نام پروژه
 apps/erpnext/erpnext/regional/italy/utils.py,Please set the Customer Address,لطفاً آدرس مشتری را تنظیم کنید
 DocType: Customer,Mention if non-standard receivable account,ذکر است اگر حسابهای دریافتنی غیر استاندارد
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Customer &gt; Customer Group &gt; Territory,مشتری&gt; گروه مشتری&gt; سرزمین
 DocType: Bank,Plaid Access Token,نشانه دسترسی به Plaid
 apps/erpnext/erpnext/hr/doctype/employee_benefit_application/employee_benefit_application.py,Please add the remaining benefits {0} to any of the existing component,لطفا مزایای باقیمانده {0} را به هر یک از اجزای موجود اضافه کنید
 DocType: Journal Entry Account,If Income or Expense,اگر درآمد یا هزینه
@@ -6519,8 +6525,6 @@
 apps/erpnext/erpnext/buying/utils.py,Please enter quantity for Item {0},لطفا مقدار برای آیتم را وارد کنید {0}
 DocType: Quality Procedure,Processes,مراحل
 DocType: Shift Type,First Check-in and Last Check-out,اولین ورود به سیستم و آخرین check-out
-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/regional/report/hsn_wise_summary_of_outward_supplies/hsn_wise_summary_of_outward_supplies.py,Total Taxable Amount,مقدار کل مالیاتی
 DocType: Employee External Work History,Employee External Work History,کارمند خارجی سابقه کار
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.py,Job card {0} created,کارت کار {0} ایجاد شد
@@ -6556,6 +6560,7 @@
 apps/erpnext/erpnext/accounts/doctype/payment_terms_template/payment_terms_template.py,Combined invoice portion must equal 100%,بخش فاکتور ترکیبی باید برابر با 100٪
 DocType: Item Default,Default Expense Account,حساب پیش فرض هزینه
 DocType: GST Account,CGST Account,حساب CGST
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Item Code &gt; Item Group &gt; Brand,کد کالا&gt; گروه مورد&gt; نام تجاری
 apps/erpnext/erpnext/education/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py,Student Email ID,دانشجو ID ایمیل
 DocType: Employee,Notice (days),مقررات (روز)
 DocType: POS Closing Voucher Invoices,POS Closing Voucher Invoices,POS صورتحساب بسته بندی کوپن
@@ -7187,6 +7192,7 @@
 DocType: Maintenance Visit,Maintenance Date,تاریخ نگهداری و تعمیرات
 DocType: Purchase Invoice Item,Rejected Serial No,رد سریال
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py,Year start date or end date is overlapping with {0}. To avoid please set company,تاریخ شروع سال یا تاریخ پایان است با هم تداخل دارند با {0}. برای جلوگیری از به مدیر مجموعه شرکت
+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/selling/doctype/customer/customer.py,Please mention the Lead Name in Lead {0},لطفا نام سرب در سرب را ذکر کنید {0}
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py,Start date should be less than end date for Item {0},تاریخ شروع باید کمتر از تاریخ پایان برای مورد است {0}
 DocType: Shift Type,Auto Attendance Settings,تنظیمات حضور و غیاب خودکار
diff --git a/erpnext/translations/fi.csv b/erpnext/translations/fi.csv
index 20cdd8d..74919aa 100644
--- a/erpnext/translations/fi.csv
+++ b/erpnext/translations/fi.csv
@@ -168,7 +168,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py,Accountant,Kirjanpitäjä
 apps/erpnext/erpnext/stock/report/item_price_stock/item_price_stock.py,Selling Price List,Myynnin hinnasto
 DocType: Patient,Tobacco Current Use,Tupakan nykyinen käyttö
-apps/erpnext/erpnext/stock/report/item_price_stock/item_price_stock.py,Selling Rate,Myynnin määrä
+apps/erpnext/erpnext/selling/report/customer_wise_item_price/customer_wise_item_price.py,Selling Rate,Myynnin määrä
 apps/erpnext/erpnext/erpnext_integrations/doctype/plaid_settings/plaid_settings.js,Please save your document before adding a new account,Tallenna asiakirjasi ennen uuden tilin lisäämistä
 DocType: Cost Center,Stock User,Varaston peruskäyttäjä
 DocType: Soil Analysis,(Ca+Mg)/K,(Ca + Mg) / K
@@ -205,7 +205,6 @@
 DocType: Packed Item,Parent Detail docname,Pääselostuksen docname
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py,"Reference: {0}, Item Code: {1} and Customer: {2}","Viite: {0}, kohta Koodi: {1} ja Asiakas: {2}"
 apps/erpnext/erpnext/accounts/report/consolidated_financial_statement/consolidated_financial_statement.py,{0} {1} is not present in the parent company,{0} {1} ei ole emoyhtiössä
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Supplier &gt; Supplier Type,Toimittaja&gt; Toimittajan tyyppi
 apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py,Trial Period End Date Cannot be before Trial Period Start Date,Koeajan päättymispäivä Ei voi olla ennen koeajan alkamispäivää
 apps/erpnext/erpnext/utilities/user_progress.py,Kg,Kg
 DocType: Tax Withholding Category,Tax Withholding Category,Veronpidätysluokka
@@ -319,6 +318,7 @@
 DocType: Quality Procedure Table,Responsible Individual,Vastuullinen henkilö
 DocType: Naming Series,Prefix,Etuliite
 apps/erpnext/erpnext/hr/notification/training_scheduled/training_scheduled.html,Event Location,Tapahtuman sijainti
+apps/erpnext/erpnext/selling/report/customer_wise_item_price/customer_wise_item_price.py,Available Stock,Saatavissa olevat varastot
 DocType: Asset Settings,Asset Settings,Omaisuusasetukset
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py,Consumable,käytettävä
 DocType: Student,B-,B -
@@ -351,6 +351,7 @@
 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 \
 				Serial No.","Varmista, ettei toimitusta sarjanumerolla ole \ Item {0} lisätään ilman tai ilman varmennusta toimitusta varten \ Sarjanumero"
+apps/erpnext/erpnext/education/doctype/instructor/instructor.py,Please setup Instructor Naming System in Education &gt; Education Settings,Asenna ohjaajien nimeämisjärjestelmä kohdassa Koulutus&gt; Koulutusasetukset
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py,At least one mode of payment is required for POS invoice.,Ainakin yksi maksutavan vaaditaan POS laskun.
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py,Batch no is required for batched item {0},Erä ei vaadita erässä {0}
 DocType: Bank Statement Transaction Invoice Item,Bank Statement Transaction Invoice Item,Pankkitili-tapahtuman laskuerä
@@ -874,7 +875,6 @@
 DocType: Vital Signs,Blood Pressure (systolic),Verenpaine (systolinen)
 apps/erpnext/erpnext/controllers/buying_controller.py,{0} {1} is {2},{0} {1} on {2}
 DocType: Item Price,Valid Upto,Voimassa asti
-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: Training Event,Workshop,työpaja
 DocType: Supplier Scorecard Scoring Standing,Warn Purchase Orders,Varoittaa ostotilauksia
 apps/erpnext/erpnext/utilities/user_progress.py,List a few of your customers. They could be organizations or individuals.,Luettele muutamia asiakkaitasi. Asiakkaat voivat olla organisaatioita tai yksilöitä.
@@ -1658,7 +1658,6 @@
 DocType: Item Barcode,Item Barcode,tuote viivakoodi
 DocType: Delivery Trip,In Transit,Matkalla
 DocType: Woocommerce Settings,Endpoints,Endpoints
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Item Code &gt; Item Group &gt; Brand,Tuotekoodi&gt; Tuoteryhmä&gt; Tuotemerkki
 DocType: Shopping Cart Settings,Show Configure Button,Näytä asetuspainike
 DocType: Quality Inspection Reading,Reading 6,Lukema 6
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js,Cannot {0} {1} {2} without any negative outstanding invoice,Ei voi {0} {1} {2} ilman negatiivista maksamatta laskun
@@ -2018,6 +2017,7 @@
 DocType: Cheque Print Template,Payer Settings,Maksajan Asetukset
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js,No pending Material Requests found to link for the given items.,"Ei odotettavissa olevia materiaalipyyntöjä, jotka löytyvät linkistä tiettyihin kohteisiin."
 apps/erpnext/erpnext/public/js/utils/party.js,Select company first,Valitse ensin yritys
+apps/erpnext/erpnext/accounts/general_ledger.py,Account: <b>{0}</b> is capital Work in progress and can not be updated by Journal Entry,"Tili: <b>{0}</b> on pääoma Käynnissä oleva työ, jota ei voi päivittää päiväkirjakirjauksella"
 apps/erpnext/erpnext/education/doctype/quiz/quiz.py,Compare List function takes on list arguments,Vertaa luetteloa -toiminto ottaa vastaan luetteloargumentit
 DocType: Item Attribute Value,"This will be appended to the Item Code of the variant. For example, if your abbreviation is ""SM"", and the item code is ""T-SHIRT"", the item code of the variant will be ""T-SHIRT-SM""","Tämä liitetään mallin tuotenumeroon esim, jos lyhenne on ""SM"" ja tuotekoodi on ""T-PAITA"", mallin tuotekoodi on ""T-PAITA-SM"""
 DocType: Salary Slip,Net Pay (in words) will be visible once you save the Salary Slip.,Nettomaksu (sanoina) näkyy kun tallennat palkkalaskelman.
@@ -2202,6 +2202,7 @@
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js,Item 2,Nimike 2
 DocType: Pricing Rule,Validate Applied Rule,Vahvista sovellettu sääntö
 DocType: QuickBooks Migrator,Authorization Endpoint,Valtuutuksen päätepiste
+DocType: Employee Onboarding,Notify users by email,Ilmoita käyttäjille sähköpostitse
 DocType: Travel Request,International,kansainvälinen
 DocType: Training Event,Training Event,koulutustapahtuma
 DocType: Item,Auto re-order,Auto re-order
@@ -2812,7 +2813,6 @@
 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
-DocType: Contract,Inactive,Epäaktiivinen
 apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.js,This will submit Salary Slips and create accrual Journal Entry. Do you want to proceed?,Tämä lähettää palkkapäiväsijoitukset ja luo suoritepäiväkirja-merkinnän. Haluatko edetä?
 DocType: Purchase Invoice,Total Net Weight,Nettopaino yhteensä
 DocType: Purchase Order,Order Confirmation No,Tilausvahvistus nro
@@ -3089,7 +3089,6 @@
 apps/erpnext/erpnext/accounts/party.py,Billing currency must be equal to either default company's currency or party account currency,Laskutusvaluutan on vastattava joko yrityksen oletusvaluuttaa tai osapuolten tilin valuuttaa
 DocType: Packing Slip,Indicates that the package is a part of this delivery (Only Draft),"osoittaa, pakkaus on vain osa tätä toimitusta (luonnos)"
 apps/erpnext/erpnext/accounts/report/customer_ledger_summary/customer_ledger_summary.py,Closing Balance,Loppusaldo
-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}
 DocType: Soil Texture,Loam,savimaata
 apps/erpnext/erpnext/controllers/accounts_controller.py,Row {0}: Due Date cannot be before posting date,Rivi {0}: eräpäivä ei voi olla ennen lähettämispäivää
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py,Quantity for Item {0} must be less than {1},Määrä alamomentille {0} on oltava pienempi kuin {1}
@@ -3612,7 +3611,6 @@
 DocType: Stock Settings,Raise Material Request when stock reaches re-order level,Luo hankintapyyntö kun saldo on alle tilauspisteen
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py,Full-time,päätoiminen
 DocType: Payroll Entry,Employees,Työntekijät
-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: Question,Single Correct Answer,Yksi oikea vastaus
 DocType: Employee,Contact Details,"yhteystiedot, lisätiedot"
 DocType: C-Form,Received Date,Saivat Date
@@ -4223,6 +4221,7 @@
 DocType: Pricing Rule,Price or Product Discount,Hinta tai tuote-alennus
 apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.py,For row {0}: Enter planned qty,Rivi {0}: Syötä suunniteltu määrä
 DocType: Account,Income Account,tulotili
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Customer &gt; Customer Group &gt; Territory,Asiakas&gt; Asiakasryhmä&gt; Alue
 DocType: Payment Request,Amount in customer's currency,Summa asiakkaan valuutassa
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js,Delivery,Toimitus
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.py,Assigning Structures...,Määritetään rakenteita ...
@@ -4272,7 +4271,6 @@
 DocType: HR Settings,Check Vacancies On Job Offer Creation,Tarkista avoimien työpaikkojen luomisen tarjoukset
 apps/erpnext/erpnext/utilities/user_progress.py,Go to Letterheads,Siirry kirjelomakkeisiin
 DocType: Subscription,Cancel At End Of Period,Peruuta lopussa
-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/hr/doctype/employee_promotion/employee_promotion.js,Property already added,Omaisuus on jo lisätty
 DocType: Item Supplier,Item Supplier,tuote toimittaja
 apps/erpnext/erpnext/public/js/controllers/transaction.js,Please enter Item Code to get batch no,Syötä tuotekoodi saadaksesi eränumeron
@@ -4557,6 +4555,7 @@
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.js,Warning: Material Requested Qty is less than Minimum Order Qty,Varoitus: Pyydetty materiaalin määrä alittaa minimi hankintaerän
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py,Account {0} is frozen,tili {0} on jäädytetty
 DocType: Quiz Question,Quiz Question,Tietokilpailu
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Supplier &gt; Supplier Type,Toimittaja&gt; Toimittajan tyyppi
 DocType: Company,Legal Entity / Subsidiary with a separate Chart of Accounts belonging to the Organization.,"juridinen hlö / tytäryhtiö, jolla on erillinen tilikartta kuuluu organisaatioon"
 DocType: Payment Request,Mute Email,Mute Sähköposti
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py,"Food, Beverage & Tobacco","Ruoka, Juoma ja Tupakka"
@@ -5067,7 +5066,6 @@
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py,Delivery warehouse required for stock item {0},Toimitus varasto tarvitaan varastonimike {0}
 DocType: Packing Slip,The gross weight of the package. Usually net weight + packaging material weight. (for print),"Pakkauksen bruttopaino, yleensä tuotteen nettopaino + pakkausmateriaalin paino  (tulostukseen)"
 DocType: Assessment Plan,Program,Ohjelmoida
-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: Accounts Settings,Users with this role are allowed to set frozen accounts and create / modify accounting entries against frozen accounts,"Roolin omaavat käyttäjät voivat jäädyttää tilejä, sekä luoda ja muokata kirjanpidon kirjauksia jäädytettyillä tileillä"
 ,Project Billing Summary,Projektin laskutusyhteenveto
 DocType: Vital Signs,Cuts,leikkaukset
@@ -5316,6 +5314,7 @@
 apps/erpnext/erpnext/quality_management/doctype/quality_review/quality_review_list.js,No Action,Ei toimintaa
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js,Valuation type charges can not marked as Inclusive,Arvotyypin maksuja ei voi merkata sisältyviksi
 DocType: POS Profile,Update Stock,Päivitä varasto
+apps/erpnext/erpnext/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/stock/doctype/packing_slip/packing_slip.js,Different UOM for items will lead to incorrect (Total) Net Weight value. Make sure that Net Weight of each item is in the same UOM.,"Erilaiset mittayksiköt voivat johtaa virheellisiin (kokonais) painoarvoihin. Varmista, että joka kohdassa käytetään samaa mittayksikköä."
 DocType: Certification Application,Payment Details,Maksutiedot
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py,BOM Rate,BOM taso
@@ -5419,6 +5418,8 @@
 apps/erpnext/erpnext/accounts/doctype/monthly_distribution/monthly_distribution.py,Percentage Allocation should be equal to 100%,Prosenttiosuuden jako tulisi olla yhtä suuri 100%
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js,Please select Posting Date before selecting Party,Valitse tositepäivä ennen osapuolta
 apps/erpnext/erpnext/config/accounting.py,Payment Terms based on conditions,Maksuehdot ehtojen perusteella
+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: Program Enrollment,School House,School House
 DocType: Serial No,Out of AMC,Ylläpitosopimus ei ole voimassa
 DocType: Opportunity,Opportunity Amount,Mahdollisuusmäärä
@@ -5620,6 +5621,7 @@
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py,Order/Quot %,Tilaus / Quot%
 apps/erpnext/erpnext/config/healthcare.py,Record Patient Vitals,Record potilaan vitals
 DocType: Fee Schedule,Institution,Instituutio
+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}
 DocType: Asset,Partially Depreciated,Osittain poistoja
 DocType: Issue,Opening Time,Aukeamisaika
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py,From and To dates required,alkaen- ja päätyen päivä vaaditaan
@@ -5836,6 +5838,7 @@
 DocType: Quality Procedure Process,Link existing Quality Procedure.,Yhdistä olemassa oleva laatumenettely.
 apps/erpnext/erpnext/config/hr.py,Loans,lainat
 DocType: Healthcare Service Unit,Healthcare Service Unit,Terveydenhuollon palveluyksikkö
+,Customer-wise Item Price,Asiakaskohtainen tuotehinta
 apps/erpnext/erpnext/public/js/financial_statements.js,Cash Flow Statement,Rahavirtalaskelma
 apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.py,No material request created,Materiaalihakua ei ole luotu
 apps/erpnext/erpnext/hr/doctype/loan_application/loan_application.py,Loan Amount cannot exceed Maximum Loan Amount of {0},Lainamäärä voi ylittää suurin lainamäärä on {0}
@@ -6097,6 +6100,7 @@
 apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py,Opening Value,Opening Arvo
 DocType: Salary Component,Formula,Kaava
 apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py,Serial #,Sarja #
+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: Material Request Plan Item,Required Quantity,Vaadittu määrä
 DocType: Lab Test Template,Lab Test Template,Lab Test Template
 apps/erpnext/erpnext/accounts/doctype/accounting_period/accounting_period.py,Accounting Period overlaps with {0},Tilikausi päällekkäin {0} kanssa
@@ -6346,7 +6350,6 @@
 DocType: Request for Quotation Item,Project Name,Projektin nimi
 apps/erpnext/erpnext/regional/italy/utils.py,Please set the Customer Address,Aseta asiakasosoite
 DocType: Customer,Mention if non-standard receivable account,Mainitse jos ei-standardi velalliset
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Customer &gt; Customer Group &gt; Territory,Asiakas&gt; Asiakasryhmä&gt; Alue
 DocType: Bank,Plaid Access Token,Plaid Access Token
 apps/erpnext/erpnext/hr/doctype/employee_benefit_application/employee_benefit_application.py,Please add the remaining benefits {0} to any of the existing component,Lisää jäljellä olevat edut {0} mihin tahansa olemassa olevaan komponenttiin
 DocType: Journal Entry Account,If Income or Expense,Mikäli tulot tai kustannukset
@@ -6609,8 +6612,6 @@
 apps/erpnext/erpnext/buying/utils.py,Please enter quantity for Item {0},Kirjoita kpl määrä tuotteelle {0}
 DocType: Quality Procedure,Processes,Prosessit
 DocType: Shift Type,First Check-in and Last Check-out,Ensimmäinen sisäänkirjautuminen ja viimeinen uloskirjautuminen
-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/regional/report/hsn_wise_summary_of_outward_supplies/hsn_wise_summary_of_outward_supplies.py,Total Taxable Amount,Verotettava kokonaismäärä
 DocType: Employee External Work History,Employee External Work History,työntekijän muu työkokemus
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.py,Job card {0} created,Työtili {0} luotiin
@@ -6646,6 +6647,7 @@
 apps/erpnext/erpnext/accounts/doctype/payment_terms_template/payment_terms_template.py,Combined invoice portion must equal 100%,Yhdistetyn laskutusosan on oltava 100%
 DocType: Item Default,Default Expense Account,Oletus kustannustili
 DocType: GST Account,CGST Account,CGST-tili
+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/education/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py,Student Email ID,Opiskelijan Sähköposti ID
 DocType: Employee,Notice (days),Ilmoitus (päivää)
 DocType: POS Closing Voucher Invoices,POS Closing Voucher Invoices,POS-vetoilmoituslaskut
@@ -7290,6 +7292,7 @@
 DocType: Maintenance Visit,Maintenance Date,"huolto, päivä"
 DocType: Purchase Invoice Item,Rejected Serial No,Hylätty sarjanumero
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py,Year start date or end date is overlapping with {0}. To avoid please set company,Vuoden aloituspäivä tai lopetuspäivä on päällekkäinen {0}. Välttämiseksi aseta yritys
+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/selling/doctype/customer/customer.py,Please mention the Lead Name in Lead {0},Mainitse Lead Name Lead {0}
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py,Start date should be less than end date for Item {0},aloituspäivä tulee olla pienempi kuin päättymispäivä tuotteelle {0}
 DocType: Shift Type,Auto Attendance Settings,Automaattinen osallistumisasetukset
diff --git a/erpnext/translations/fr.csv b/erpnext/translations/fr.csv
index 938a496..bcdffbe 100644
--- a/erpnext/translations/fr.csv
+++ b/erpnext/translations/fr.csv
@@ -168,7 +168,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py,Accountant,Comptable
 apps/erpnext/erpnext/stock/report/item_price_stock/item_price_stock.py,Selling Price List,Liste de prix de vente
 DocType: Patient,Tobacco Current Use,Consommation actuelle de tabac
-apps/erpnext/erpnext/stock/report/item_price_stock/item_price_stock.py,Selling Rate,Prix de vente
+apps/erpnext/erpnext/selling/report/customer_wise_item_price/customer_wise_item_price.py,Selling Rate,Prix de vente
 apps/erpnext/erpnext/erpnext_integrations/doctype/plaid_settings/plaid_settings.js,Please save your document before adding a new account,Veuillez enregistrer votre document avant d&#39;ajouter un nouveau compte.
 DocType: Cost Center,Stock User,Chargé des Stocks
 DocType: Soil Analysis,(Ca+Mg)/K,(Ca + Mg) / K
@@ -205,7 +205,6 @@
 DocType: Packed Item,Parent Detail docname,Nom de Document du Détail Parent
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py,"Reference: {0}, Item Code: {1} and Customer: {2}","Référence: {0}, Code de l&#39;article: {1} et Client: {2}"
 apps/erpnext/erpnext/accounts/report/consolidated_financial_statement/consolidated_financial_statement.py,{0} {1} is not present in the parent company,{0} {1} n&#39;est pas présent dans la société mère
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Supplier &gt; Supplier Type,Fournisseur&gt; Type de fournisseur
 apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py,Trial Period End Date Cannot be before Trial Period Start Date,La date de fin de la période d'évaluation ne peut pas précéder la date de début de la période d'évaluation
 apps/erpnext/erpnext/utilities/user_progress.py,Kg,Kg
 DocType: Tax Withholding Category,Tax Withholding Category,Catégorie de taxation à la source
@@ -319,6 +318,7 @@
 DocType: Quality Procedure Table,Responsible Individual,Individu responsable
 DocType: Naming Series,Prefix,Préfixe
 apps/erpnext/erpnext/hr/notification/training_scheduled/training_scheduled.html,Event Location,Lieu de l'Événement
+apps/erpnext/erpnext/selling/report/customer_wise_item_price/customer_wise_item_price.py,Available Stock,Stock disponible
 DocType: Asset Settings,Asset Settings,Paramètres des actifs
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py,Consumable,Consommable
 DocType: Student,B-,B-
@@ -351,6 +351,7 @@
 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 \
 				Serial No.",Ne peut pas assurer la livraison par numéro de série car \ Item {0} est ajouté avec et sans la livraison par numéro de série
+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/accounts/doctype/sales_invoice/sales_invoice.py,At least one mode of payment is required for POS invoice.,Au moins un mode de paiement est nécessaire pour une facture de PDV
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py,Batch no is required for batched item {0},Le numéro de lot est requis pour l&#39;article en lot {0}.
 DocType: Bank Statement Transaction Invoice Item,Bank Statement Transaction Invoice Item,Poste de facture d'une transaction bancaire
@@ -875,7 +876,6 @@
 DocType: Vital Signs,Blood Pressure (systolic),Pression Artérielle (Systolique)
 apps/erpnext/erpnext/controllers/buying_controller.py,{0} {1} is {2},{0} {1} est {2}
 DocType: Item Price,Valid Upto,Valide Jusqu'au
-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: Training Event,Workshop,Atelier
 DocType: Supplier Scorecard Scoring Standing,Warn Purchase Orders,Avertir lors de Bons de Commande
 apps/erpnext/erpnext/utilities/user_progress.py,List a few of your customers. They could be organizations or individuals.,Listez quelques-uns de vos clients. Ils peuvent être des entreprise ou des individus.
@@ -1679,7 +1679,6 @@
 DocType: Item Barcode,Item Barcode,Code barre article
 DocType: Delivery Trip,In Transit,En transit
 DocType: Woocommerce Settings,Endpoints,Points de terminaison
-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
 DocType: Shopping Cart Settings,Show Configure Button,Afficher le bouton de configuration
 DocType: Quality Inspection Reading,Reading 6,Lecture 6
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js,Cannot {0} {1} {2} without any negative outstanding invoice,Can not {0} {1} {2} sans aucune facture impayée négative
@@ -2039,6 +2038,7 @@
 DocType: Cheque Print Template,Payer Settings,Paramètres du Payeur
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js,No pending Material Requests found to link for the given items.,Aucune demande de matériel en attente n&#39;a été trouvée pour créer un lien vers les articles donnés.
 apps/erpnext/erpnext/public/js/utils/party.js,Select company first,Sélectionnez d'abord la société
+apps/erpnext/erpnext/accounts/general_ledger.py,Account: <b>{0}</b> is capital Work in progress and can not be updated by Journal Entry,Compte: <b>{0}</b> est un travail capital et ne peut pas être mis à jour par une écriture au journal.
 apps/erpnext/erpnext/education/doctype/quiz/quiz.py,Compare List function takes on list arguments,La fonction de comparaison de liste accepte les arguments de liste
 DocType: Item Attribute Value,"This will be appended to the Item Code of the variant. For example, if your abbreviation is ""SM"", and the item code is ""T-SHIRT"", the item code of the variant will be ""T-SHIRT-SM""","Ce sera ajoutée au Code de la Variante de l'Article. Par exemple, si votre abréviation est «SM», et le code de l'article est ""T-SHIRT"", le code de l'article de la variante sera ""T-SHIRT-SM"""
 DocType: Salary Slip,Net Pay (in words) will be visible once you save the Salary Slip.,Salaire Net (en lettres) sera visible une fois que vous aurez enregistré la Fiche de Paie.
@@ -2223,6 +2223,7 @@
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js,Item 2,Article 2
 DocType: Pricing Rule,Validate Applied Rule,Valider la règle appliquée
 DocType: QuickBooks Migrator,Authorization Endpoint,Autorisation Endpoint
+DocType: Employee Onboarding,Notify users by email,Notifier les utilisateurs par email
 DocType: Travel Request,International,International
 DocType: Training Event,Training Event,Évènement de Formation
 DocType: Item,Auto re-order,Re-commande auto
@@ -2833,7 +2834,6 @@
 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à
-DocType: Contract,Inactive,Inactif
 apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.js,This will submit Salary Slips and create accrual Journal Entry. Do you want to proceed?,Cela permettra de soumettre des bulletins de salaire et de créer une écriture de journal d&#39;accumulation. Voulez-vous poursuivre?
 DocType: Purchase Invoice,Total Net Weight,Poids net total
 DocType: Purchase Order,Order Confirmation No,No de confirmation de commande
@@ -3110,7 +3110,6 @@
 apps/erpnext/erpnext/accounts/party.py,Billing currency must be equal to either default company's currency or party account currency,La devise de facturation doit être égale à la devise de la société par défaut ou à la devise du compte du partenaire
 DocType: Packing Slip,Indicates that the package is a part of this delivery (Only Draft),Indique que le paquet est une partie de cette livraison (Brouillons Seulement)
 apps/erpnext/erpnext/accounts/report/customer_ledger_summary/customer_ledger_summary.py,Closing Balance,Solde de clôture
-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}
 DocType: Soil Texture,Loam,Terreau
 apps/erpnext/erpnext/controllers/accounts_controller.py,Row {0}: Due Date cannot be before posting date,Ligne {0}: la date d&#39;échéance ne peut pas être antérieure à la date d&#39;envoi
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py,Quantity for Item {0} must be less than {1},Quantité de l'article {0} doit être inférieure à {1}
@@ -3634,7 +3633,6 @@
 DocType: Stock Settings,Raise Material Request when stock reaches re-order level,Créer une demande de matériel lorsque le stock atteint le niveau de réapprovisionnement
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py,Full-time,Temps Plein
 DocType: Payroll Entry,Employees,Employés
-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: Question,Single Correct Answer,Réponse correcte unique
 DocType: Employee,Contact Details,Coordonnées
 DocType: C-Form,Received Date,Date de Réception
@@ -4265,6 +4263,7 @@
 DocType: Pricing Rule,Price or Product Discount,Prix ou remise de produit
 apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.py,For row {0}: Enter planned qty,Pour la ligne {0}: entrez la quantité planifiée
 DocType: Account,Income Account,Compte de Produits
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Customer &gt; Customer Group &gt; Territory,Client&gt; Groupe de clients&gt; Territoire
 DocType: Payment Request,Amount in customer's currency,Montant dans la devise du client
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js,Delivery,Livraison
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.py,Assigning Structures...,Assignation des structures...
@@ -4314,7 +4313,6 @@
 DocType: HR Settings,Check Vacancies On Job Offer Creation,Vérifier les offres d&#39;emploi lors de la création d&#39;une offre d&#39;emploi
 apps/erpnext/erpnext/utilities/user_progress.py,Go to Letterheads,Aller aux en-têtes de lettre
 DocType: Subscription,Cancel At End Of Period,Annuler à la fin de la période
-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/hr/doctype/employee_promotion/employee_promotion.js,Property already added,Propriété déjà ajoutée
 DocType: Item Supplier,Item Supplier,Fournisseur de l'Article
 apps/erpnext/erpnext/public/js/controllers/transaction.js,Please enter Item Code to get batch no,Veuillez entrer le Code d'Article pour obtenir n° de lot
@@ -4611,6 +4609,7 @@
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.js,Warning: Material Requested Qty is less than Minimum Order Qty,Attention : La Quantité de Matériel Commandé est inférieure à la Qté Minimum de Commande
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py,Account {0} is frozen,Le compte {0} est gelé
 DocType: Quiz Question,Quiz Question,Quiz Question
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Supplier &gt; Supplier Type,Fournisseur&gt; Type de fournisseur
 DocType: Company,Legal Entity / Subsidiary with a separate Chart of Accounts belonging to the Organization.,Entité Juridique / Filiale avec un Plan de Comptes différent appartenant à l'Organisation.
 DocType: Payment Request,Mute Email,Email Silencieux
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py,"Food, Beverage & Tobacco","Alimentation, Boissons et Tabac"
@@ -5121,7 +5120,6 @@
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py,Delivery warehouse required for stock item {0},Entrepôt de Livraison requis pour article du stock {0}
 DocType: Packing Slip,The gross weight of the package. Usually net weight + packaging material weight. (for print),Le poids brut du colis. Habituellement poids net + poids du matériau d'emballage. (Pour l'impression)
 DocType: Assessment Plan,Program,Programme
-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: Accounts Settings,Users with this role are allowed to set frozen accounts and create / modify accounting entries against frozen accounts,Les utilisateurs ayant ce rôle sont autorisés à définir les comptes gelés et à créer / modifier des écritures comptables sur des comptes gelés
 ,Project Billing Summary,Récapitulatif de facturation du projet
 DocType: Vital Signs,Cuts,Coupures
@@ -5370,6 +5368,7 @@
 apps/erpnext/erpnext/quality_management/doctype/quality_review/quality_review_list.js,No Action,Pas d&#39;action
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js,Valuation type charges can not marked as Inclusive,Frais de type valorisation ne peuvent pas être marqués comme inclus
 DocType: POS Profile,Update Stock,Mettre à Jour le Stock
+apps/erpnext/erpnext/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/stock/doctype/packing_slip/packing_slip.js,Different UOM for items will lead to incorrect (Total) Net Weight value. Make sure that Net Weight of each item is in the same UOM.,Différentes UDM pour les articles conduira à un Poids Net (Total) incorrect . Assurez-vous que le Poids Net de chaque article a la même unité de mesure .
 DocType: Certification Application,Payment Details,Détails de paiement
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py,BOM Rate,Taux LDM
@@ -5473,6 +5472,8 @@
 apps/erpnext/erpnext/accounts/doctype/monthly_distribution/monthly_distribution.py,Percentage Allocation should be equal to 100%,Pourcentage d'Allocation doit être égale à 100 %
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js,Please select Posting Date before selecting Party,Veuillez sélectionner la Date de Comptabilisation avant de sélectionner le Tiers
 apps/erpnext/erpnext/config/accounting.py,Payment Terms based on conditions,Conditions de paiement basées sur des conditions
+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: Program Enrollment,School House,Maison de l'École
 DocType: Serial No,Out of AMC,Sur AMC
 DocType: Opportunity,Opportunity Amount,Montant de l&#39;opportunité
@@ -5674,6 +5675,7 @@
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py,Order/Quot %,Commande / Devis %
 apps/erpnext/erpnext/config/healthcare.py,Record Patient Vitals,Enregistrer les Signes Vitaux du Patient
 DocType: Fee Schedule,Institution,Institution
+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}
 DocType: Asset,Partially Depreciated,Partiellement Déprécié
 DocType: Issue,Opening Time,Horaire d'Ouverture
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py,From and To dates required,Les date Du et Au sont requises
@@ -5890,6 +5892,7 @@
 DocType: Quality Procedure Process,Link existing Quality Procedure.,Lier la procédure qualité existante.
 apps/erpnext/erpnext/config/hr.py,Loans,Les prêts
 DocType: Healthcare Service Unit,Healthcare Service Unit,Service de soins de santé
+,Customer-wise Item Price,Prix de l&#39;article par client
 apps/erpnext/erpnext/public/js/financial_statements.js,Cash Flow Statement,États des Flux de Trésorerie
 apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.py,No material request created,Aucune demande de matériel créée
 apps/erpnext/erpnext/hr/doctype/loan_application/loan_application.py,Loan Amount cannot exceed Maximum Loan Amount of {0},Le Montant du prêt ne peut pas dépasser le Montant Maximal du Prêt de {0}
@@ -6151,6 +6154,7 @@
 apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py,Opening Value,Valeur d'Ouverture
 DocType: Salary Component,Formula,Formule
 apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py,Serial #,Série #
+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: Material Request Plan Item,Required Quantity,Quantité requise
 DocType: Lab Test Template,Lab Test Template,Modèle de test de laboratoire
 apps/erpnext/erpnext/accounts/doctype/accounting_period/accounting_period.py,Accounting Period overlaps with {0},La période comptable chevauche avec {0}
@@ -6400,7 +6404,6 @@
 DocType: Request for Quotation Item,Project Name,Nom du Projet
 apps/erpnext/erpnext/regional/italy/utils.py,Please set the Customer Address,Veuillez définir l&#39;adresse du client
 DocType: Customer,Mention if non-standard receivable account,Mentionner si le compte débiteur n'est pas standard
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Customer &gt; Customer Group &gt; Territory,Client&gt; Groupe de clients&gt; Territoire
 DocType: Bank,Plaid Access Token,Jeton d&#39;accès plaid
 apps/erpnext/erpnext/hr/doctype/employee_benefit_application/employee_benefit_application.py,Please add the remaining benefits {0} to any of the existing component,Veuillez ajouter les prestations restantes {0} à l'un des composants existants
 DocType: Journal Entry Account,If Income or Expense,Si Produits ou Charges
@@ -6663,8 +6666,6 @@
 apps/erpnext/erpnext/buying/utils.py,Please enter quantity for Item {0},Veuillez entrer une quantité pour l'article {0}
 DocType: Quality Procedure,Processes,Les processus
 DocType: Shift Type,First Check-in and Last Check-out,Premier enregistrement et dernier départ
-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/regional/report/hsn_wise_summary_of_outward_supplies/hsn_wise_summary_of_outward_supplies.py,Total Taxable Amount,Montant total imposable
 DocType: Employee External Work History,Employee External Work History,Antécédents Professionnels de l'Employé
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.py,Job card {0} created,Job card {0} créée
@@ -6700,6 +6701,7 @@
 apps/erpnext/erpnext/accounts/doctype/payment_terms_template/payment_terms_template.py,Combined invoice portion must equal 100%,La portion combinée de la facture doit être égale à 100%
 DocType: Item Default,Default Expense Account,Compte de Charges par Défaut
 DocType: GST Account,CGST Account,Compte CGST
+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/education/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py,Student Email ID,ID Email de l'Étudiant
 DocType: Employee,Notice (days),Préavis (jours)
 DocType: POS Closing Voucher Invoices,POS Closing Voucher Invoices,Factures du bon de clôture du PDV
@@ -7338,6 +7340,7 @@
 DocType: Maintenance Visit,Maintenance Date,Date de l'Entretien
 DocType: Purchase Invoice Item,Rejected Serial No,N° de Série Rejeté
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py,Year start date or end date is overlapping with {0}. To avoid please set company,Année de début ou de fin chevauche avec {0}. Pour l'éviter veuillez définir la société
+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/selling/doctype/customer/customer.py,Please mention the Lead Name in Lead {0},Veuillez mentionner le nom du Prospect dans le Prospect {0}
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py,Start date should be less than end date for Item {0},La date de début doit être antérieure à la date de fin pour l'Article {0}
 DocType: Shift Type,Auto Attendance Settings,Paramètres de présence automatique
diff --git a/erpnext/translations/gu.csv b/erpnext/translations/gu.csv
index dc090b9..46f0dc6 100644
--- a/erpnext/translations/gu.csv
+++ b/erpnext/translations/gu.csv
@@ -165,7 +165,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py,Accountant,એકાઉન્ટન્ટ
 apps/erpnext/erpnext/stock/report/item_price_stock/item_price_stock.py,Selling Price List,વેચાણ કિંમત યાદી
 DocType: Patient,Tobacco Current Use,તમાકુ વર્તમાન ઉપયોગ
-apps/erpnext/erpnext/stock/report/item_price_stock/item_price_stock.py,Selling Rate,વેચાણ દર
+apps/erpnext/erpnext/selling/report/customer_wise_item_price/customer_wise_item_price.py,Selling Rate,વેચાણ દર
 apps/erpnext/erpnext/erpnext_integrations/doctype/plaid_settings/plaid_settings.js,Please save your document before adding a new account,નવું એકાઉન્ટ ઉમેરતા પહેલા કૃપા કરીને તમારા દસ્તાવેજને સાચવો
 DocType: Cost Center,Stock User,સ્ટોક વપરાશકર્તા
 DocType: Soil Analysis,(Ca+Mg)/K,(Ca + Mg) / K
@@ -201,7 +201,6 @@
 DocType: Packed Item,Parent Detail docname,પિતૃ વિગતવાર docname
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py,"Reference: {0}, Item Code: {1} and Customer: {2}","સંદર્ભ: {0}, આઇટમ કોડ: {1} અને ગ્રાહક: {2}"
 apps/erpnext/erpnext/accounts/report/consolidated_financial_statement/consolidated_financial_statement.py,{0} {1} is not present in the parent company,{0} {1} મૂળ કંપનીમાં હાજર નથી
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Supplier &gt; Supplier Type,સપ્લાયર&gt; સપ્લાયર પ્રકાર
 apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py,Trial Period End Date Cannot be before Trial Period Start Date,ટ્રાયલ પીરિયડ સમાપ્તિ તારીખ ટ્રાયલ પીરિયડ પ્રારંભ તારીખ પહેલાં ન હોઈ શકે
 apps/erpnext/erpnext/utilities/user_progress.py,Kg,કિલો ગ્રામ
 DocType: Tax Withholding Category,Tax Withholding Category,ટેક્સ રોકવાની કેટેગરી
@@ -313,6 +312,7 @@
 DocType: Quality Procedure Table,Responsible Individual,જવાબદાર વ્યક્તિગત
 DocType: Naming Series,Prefix,પૂર્વગ
 apps/erpnext/erpnext/hr/notification/training_scheduled/training_scheduled.html,Event Location,ઇવેન્ટ સ્થાન
+apps/erpnext/erpnext/selling/report/customer_wise_item_price/customer_wise_item_price.py,Available Stock,ઉપલબ્ધ સ્ટોક
 DocType: Asset Settings,Asset Settings,અસેટ સેટિંગ્સ
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py,Consumable,ઉપભોજ્ય
 DocType: Student,B-,બી
@@ -345,6 +345,7 @@
 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 \
 				Serial No.",સીરીયલ નંબર દ્વારા ડિલિવરીની ખાતરી કરી શકાતી નથી કારણ કે \ Item {0} સાથે \ Serial No
+apps/erpnext/erpnext/education/doctype/instructor/instructor.py,Please setup Instructor Naming System in Education &gt; Education Settings,કૃપા કરીને શિક્ષણ&gt; શિક્ષણ સેટિંગ્સમાં પ્રશિક્ષક નામકરણ સિસ્ટમ સેટ કરો
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py,At least one mode of payment is required for POS invoice.,ચુકવણી ઓછામાં ઓછો એક મોડ POS ભરતિયું માટે જરૂરી છે.
 DocType: Bank Statement Transaction Invoice Item,Bank Statement Transaction Invoice Item,બેંક સ્ટેટમેન્ટ ટ્રાન્ઝેક્શન ઇન્વોઇસ આઇટમ
 DocType: Salary Detail,Tax on flexible benefit,લવચીક લાભ પર કર
@@ -1634,7 +1635,6 @@
 DocType: Item Barcode,Item Barcode,વસ્તુ બારકોડ
 DocType: Delivery Trip,In Transit,પરિવહનમાં
 DocType: Woocommerce Settings,Endpoints,એન્ડપોઇન્ટ્સ
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Item Code &gt; Item Group &gt; Brand,આઇટમ કોડ&gt; આઇટમ જૂથ&gt; બ્રાન્ડ
 DocType: Shopping Cart Settings,Show Configure Button,રૂપરેખાંકિત બટન બતાવો
 DocType: Quality Inspection Reading,Reading 6,6 વાંચન
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js,Cannot {0} {1} {2} without any negative outstanding invoice,નથી {0} {1} {2} વગર કોઈપણ નકારાત્મક બાકી ભરતિયું કરી શકો છો
@@ -2175,6 +2175,7 @@
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js,Item 2,આઇટમ 2
 DocType: Pricing Rule,Validate Applied Rule,લાગુ કરાયેલ નિયમ માન્ય કરો
 DocType: QuickBooks Migrator,Authorization Endpoint,અધિકૃતતા સમાપ્તિબિંદુ
+DocType: Employee Onboarding,Notify users by email,વપરાશકર્તાઓને ઇમેઇલ દ્વારા સૂચિત કરો
 DocType: Travel Request,International,આંતરરાષ્ટ્રીય
 DocType: Training Event,Training Event,તાલીમ ઘટના
 DocType: Item,Auto re-order,ઓટો ફરી ઓર્ડર
@@ -2775,7 +2776,6 @@
 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,સમાન નામની ગ્રાહક પહેલેથી હાજર છે
-DocType: Contract,Inactive,નિષ્ક્રિય
 apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.js,This will submit Salary Slips and create accrual Journal Entry. Do you want to proceed?,આ પગાર સ્લિપ રજૂ કરશે અને એક્ઝ્ર્યુબલ જર્નલ એન્ટ્રી બનાવશે. શું તમે આગળ વધવા માંગો છો?
 DocType: Purchase Invoice,Total Net Weight,કુલ નેટ વજન
 DocType: Purchase Order,Order Confirmation No,ઑર્ડર પુષ્ટિકરણ નંબર
@@ -3047,7 +3047,6 @@
 apps/erpnext/erpnext/accounts/party.py,Billing currency must be equal to either default company's currency or party account currency,બિલિંગ ચલણ કાં તો ડિફોલ્ટ કંપનીના ચલણ અથવા પક્ષ એકાઉન્ટ ચલણની સમાન હોવા જોઈએ
 DocType: Packing Slip,Indicates that the package is a part of this delivery (Only Draft),પેકેજ આ બોલ (ફક્ત ડ્રાફ્ટ) ના એક ભાગ છે કે જે સૂચવે
 apps/erpnext/erpnext/accounts/report/customer_ledger_summary/customer_ledger_summary.py,Closing Balance,બંધ બેલેન્સ
-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: Soil Texture,Loam,લોમ
 apps/erpnext/erpnext/controllers/accounts_controller.py,Row {0}: Due Date cannot be before posting date,રો {0}: તારીખ પોસ્ટ તારીખ પહેલાં ન હોઈ શકે
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py,Quantity for Item {0} must be less than {1},વસ્તુ માટે જથ્થો {0} કરતાં ઓછી હોવી જોઈએ {1}
@@ -3565,7 +3564,6 @@
 DocType: Stock Settings,Raise Material Request when stock reaches re-order level,સ્ટોક ફરીથી ક્રમમાં સ્તર સુધી પહોંચે છે ત્યારે સામગ્રી વિનંતી વધારો
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py,Full-time,આખો સમય
 DocType: Payroll Entry,Employees,કર્મચારીઓની
-apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py,Please setup numbering series for Attendance via Setup &gt; Numbering Series,કૃપા કરીને સેટઅપ&gt; નંબરિંગ સિરીઝ દ્વારા હાજરી માટે નંબરિંગ શ્રેણી સેટ કરો
 DocType: Question,Single Correct Answer,એક જ સાચો જવાબ
 DocType: Employee,Contact Details,સંપર્ક વિગતો
 DocType: C-Form,Received Date,પ્રાપ્ત તારીખ
@@ -4171,6 +4169,7 @@
 DocType: Pricing Rule,Price or Product Discount,કિંમત અથવા ઉત્પાદન ડિસ્કાઉન્ટ
 apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.py,For row {0}: Enter planned qty,{0} પંક્તિ માટે: નિયુક્ત કરેલું કક્ષ દાખલ કરો
 DocType: Account,Income Account,આવક એકાઉન્ટ
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Customer &gt; Customer Group &gt; Territory,ગ્રાહક&gt; ગ્રાહક જૂથ&gt; ક્ષેત્ર
 DocType: Payment Request,Amount in customer's currency,ગ્રાહકોના ચલણ માં જથ્થો
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js,Delivery,ડ લવર
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.py,Assigning Structures...,સ્ટ્રક્ચર્સ સોંપી રહ્યું છે ...
@@ -4219,7 +4218,6 @@
 DocType: HR Settings,Check Vacancies On Job Offer Creation,જોબ erફર સર્જન પર ખાલી જગ્યાઓ તપાસો
 apps/erpnext/erpnext/utilities/user_progress.py,Go to Letterheads,લેટરહેડ્સ પર જાઓ
 DocType: Subscription,Cancel At End Of Period,પીરિયડ અંતે અંતે રદ કરો
-apps/erpnext/erpnext/education/doctype/instructor/instructor.py,Please setup Instructor Naming System in Education &gt; Education Settings,કૃપા કરીને શિક્ષણ&gt; શિક્ષણ સેટિંગ્સમાં પ્રશિક્ષક નામકરણ સિસ્ટમ સેટ કરો
 apps/erpnext/erpnext/hr/doctype/employee_promotion/employee_promotion.js,Property already added,સંપત્તિ પહેલાથી જ ઉમેરી છે
 DocType: Item Supplier,Item Supplier,વસ્તુ પુરવઠોકર્તા
 apps/erpnext/erpnext/public/js/controllers/transaction.js,Please enter Item Code to get batch no,બેચ કોઈ વિચાર વસ્તુ કોડ દાખલ કરો
@@ -4502,6 +4500,7 @@
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.js,Warning: Material Requested Qty is less than Minimum Order Qty,ચેતવણી: Qty વિનંતી સામગ્રી ન્યુનત્તમ ઓર્ડર Qty કરતાં ઓછી છે
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py,Account {0} is frozen,એકાઉન્ટ {0} સ્થિર છે
 DocType: Quiz Question,Quiz Question,ક્વિઝ પ્રશ્ન
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Supplier &gt; Supplier Type,સપ્લાયર&gt; સપ્લાયર પ્રકાર
 DocType: Company,Legal Entity / Subsidiary with a separate Chart of Accounts belonging to the Organization.,સંસ્થા સાથે જોડાયેલા એકાઉન્ટ્સ એક અલગ ચાર્ટ સાથે કાનૂની એન્ટિટી / સબસિડીયરી.
 DocType: Payment Request,Mute Email,મ્યૂટ કરો ઇમેઇલ
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py,"Food, Beverage & Tobacco","ફૂડ, પીણું અને તમાકુ"
@@ -5008,7 +5007,6 @@
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py,Delivery warehouse required for stock item {0},ડ લવર વેરહાઉસ સ્ટોક વસ્તુ માટે જરૂરી {0}
 DocType: Packing Slip,The gross weight of the package. Usually net weight + packaging material weight. (for print),પેકેજ ગ્રોસ વજન. સામાન્ય રીતે નેટ વજન + પેકેજિંગ સામગ્રી વજન. (પ્રિન્ટ માટે)
 DocType: Assessment Plan,Program,કાર્યક્રમ
-apps/erpnext/erpnext/hr/doctype/employee/employee.py,Please setup Employee Naming System in Human Resource &gt; HR Settings,કૃપા કરીને માનવ સંસાધન&gt; એચઆર સેટિંગ્સમાં કર્મચારી નામકરણ સિસ્ટમ સેટ કરો
 DocType: Accounts Settings,Users with this role are allowed to set frozen accounts and create / modify accounting entries against frozen accounts,આ ભૂમિકા સાથેના વપરાશકર્તાઓ સ્થિર એકાઉન્ટ્સ સામે હિસાબી પ્રવેશો સ્થિર એકાઉન્ટ્સ સેટ અને બનાવવા / સુધારવા માટે માન્ય છે
 ,Project Billing Summary,પ્રોજેક્ટ બિલિંગ સારાંશ
 DocType: Vital Signs,Cuts,કટ્સ
@@ -5353,6 +5351,8 @@
 apps/erpnext/erpnext/accounts/doctype/monthly_distribution/monthly_distribution.py,Percentage Allocation should be equal to 100%,ટકાવારી ફાળવણી 100% સમાન હોવું જોઈએ
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js,Please select Posting Date before selecting Party,કૃપા કરીને પાર્ટી પસંદ કર્યા પહેલાં પોસ્ટ તારીખ સિલેક્ટ કરો
 apps/erpnext/erpnext/config/accounting.py,Payment Terms based on conditions,શરતો પર આધારિત ચુકવણીની શરતો
+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: Program Enrollment,School House,શાળા હાઉસ
 DocType: Serial No,Out of AMC,એએમસીના આઉટ
 DocType: Opportunity,Opportunity Amount,તકનીક રકમ
@@ -5553,6 +5553,7 @@
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py,Order/Quot %,ઓર્ડર / quot%
 apps/erpnext/erpnext/config/healthcare.py,Record Patient Vitals,રેકોર્ડ પેશન્ટ Vitals
 DocType: Fee Schedule,Institution,સંસ્થા
+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: Asset,Partially Depreciated,આંશિક ઘટાડો
 DocType: Issue,Opening Time,ઉદઘાટન સમય
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py,From and To dates required,પ્રતિ અને જરૂરી તારીખો
@@ -5766,6 +5767,7 @@
 DocType: Quality Procedure Process,Link existing Quality Procedure.,હાલની ગુણવત્તા પ્રક્રિયાને લિંક કરો.
 apps/erpnext/erpnext/config/hr.py,Loans,લોન
 DocType: Healthcare Service Unit,Healthcare Service Unit,હેલ્થકેર સેવા એકમ
+,Customer-wise Item Price,ગ્રાહક મુજબની વસ્તુ કિંમત
 apps/erpnext/erpnext/public/js/financial_statements.js,Cash Flow Statement,કેશ ફ્લો સ્ટેટમેન્ટ
 apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.py,No material request created,કોઈ સામગ્રી વિનંતી બનાવવામાં નથી
 apps/erpnext/erpnext/hr/doctype/loan_application/loan_application.py,Loan Amount cannot exceed Maximum Loan Amount of {0},લોન રકમ મહત્તમ લોન રકમ કરતાં વધી શકે છે {0}
@@ -6024,6 +6026,7 @@
 apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py,Opening Value,ખુલી ભાવ
 DocType: Salary Component,Formula,ફોર્મ્યુલા
 apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py,Serial #,સીરીયલ #
+apps/erpnext/erpnext/hr/doctype/employee/employee.py,Please setup Employee Naming System in Human Resource &gt; HR Settings,કૃપા કરીને માનવ સંસાધન&gt; એચઆર સેટિંગ્સમાં કર્મચારી નામકરણ સિસ્ટમ સેટ કરો
 DocType: Material Request Plan Item,Required Quantity,જરૂરી માત્રા
 DocType: Lab Test Template,Lab Test Template,લેબ ટેસ્ટ ઢાંચો
 apps/erpnext/erpnext/setup/doctype/company/company.py,Sales Account,સેલ્સ એકાઉન્ટ
@@ -6269,7 +6272,6 @@
 DocType: Request for Quotation Item,Project Name,પ્રોજેક્ટ નામ
 apps/erpnext/erpnext/regional/italy/utils.py,Please set the Customer Address,કૃપા કરીને ગ્રાહક સરનામું સેટ કરો
 DocType: Customer,Mention if non-standard receivable account,ઉલ્લેખ બિન પ્રમાણભૂત મળવાપાત્ર એકાઉન્ટ તો
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Customer &gt; Customer Group &gt; Territory,ગ્રાહક&gt; ગ્રાહક જૂથ&gt; ક્ષેત્ર
 DocType: Bank,Plaid Access Token,પ્લેઇડ એક્સેસ ટોકન
 apps/erpnext/erpnext/hr/doctype/employee_benefit_application/employee_benefit_application.py,Please add the remaining benefits {0} to any of the existing component,કૃપા કરીને બાકીના લાભો {0} કોઈપણ હાલના ઘટકમાં ઉમેરો
 DocType: Journal Entry Account,If Income or Expense,આવક અથવા ખર્ચ તો
@@ -6528,8 +6530,6 @@
 apps/erpnext/erpnext/buying/utils.py,Please enter quantity for Item {0},વસ્તુ માટે જથ્થો દાખલ કરો {0}
 DocType: Quality Procedure,Processes,પ્રક્રિયાઓ
 DocType: Shift Type,First Check-in and Last Check-out,પ્રથમ ચેક-ઇન અને છેલ્લું ચેક-આઉટ
-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/regional/report/hsn_wise_summary_of_outward_supplies/hsn_wise_summary_of_outward_supplies.py,Total Taxable Amount,કુલ કરપાત્ર રકમ
 DocType: Employee External Work History,Employee External Work History,કર્મચારીનું બાહ્ય કામ ઇતિહાસ
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.py,Job card {0} created,જોબ કાર્ડ {0} બનાવી
@@ -6565,6 +6565,7 @@
 apps/erpnext/erpnext/accounts/doctype/payment_terms_template/payment_terms_template.py,Combined invoice portion must equal 100%,સંયુક્ત ભરતાનો હિસ્સો 100% જેટલો જ હોવો જોઈએ
 DocType: Item Default,Default Expense Account,મૂળભૂત ખર્ચ એકાઉન્ટ
 DocType: GST Account,CGST Account,CGST એકાઉન્ટ
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Item Code &gt; Item Group &gt; Brand,આઇટમ કોડ&gt; આઇટમ જૂથ&gt; બ્રાન્ડ
 apps/erpnext/erpnext/education/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py,Student Email ID,વિદ્યાર્થી ઇમેઇલ ને
 DocType: Employee,Notice (days),સૂચના (દિવસ)
 DocType: POS Closing Voucher Invoices,POS Closing Voucher Invoices,POS બંધ વાઉચર ઇનવૉઇસેસ
@@ -7196,6 +7197,7 @@
 DocType: Maintenance Visit,Maintenance Date,જાળવણી તારીખ
 DocType: Purchase Invoice Item,Rejected Serial No,નકારેલું સીરીયલ કોઈ
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py,Year start date or end date is overlapping with {0}. To avoid please set company,વર્ષ શરૂ તારીખ અથવા અંતિમ તારીખ {0} સાથે ઓવરલેપિંગ છે. ટાળવા માટે કંપની સુયોજિત કરો
+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/selling/doctype/customer/customer.py,Please mention the Lead Name in Lead {0},લીડ નામમાં લીડ નામનો ઉલ્લેખ કરો {0}
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py,Start date should be less than end date for Item {0},વસ્તુ માટે અંતિમ તારીખ કરતાં ઓછી હોવી જોઈએ તારીખ શરૂ {0}
 DocType: Shift Type,Auto Attendance Settings,Autoટો હાજરી સેટિંગ્સ
diff --git a/erpnext/translations/hi.csv b/erpnext/translations/hi.csv
index 6ff898e..b4dfcff 100644
--- a/erpnext/translations/hi.csv
+++ b/erpnext/translations/hi.csv
@@ -166,7 +166,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py,Accountant,मुनीम
 apps/erpnext/erpnext/stock/report/item_price_stock/item_price_stock.py,Selling Price List,मूल्य सूची बेचना
 DocType: Patient,Tobacco Current Use,तंबाकू वर्तमान उपयोग
-apps/erpnext/erpnext/stock/report/item_price_stock/item_price_stock.py,Selling Rate,बिक्री दर
+apps/erpnext/erpnext/selling/report/customer_wise_item_price/customer_wise_item_price.py,Selling Rate,बिक्री दर
 apps/erpnext/erpnext/erpnext_integrations/doctype/plaid_settings/plaid_settings.js,Please save your document before adding a new account,नया खाता जोड़ने से पहले कृपया अपना दस्तावेज़ सहेजें
 DocType: Cost Center,Stock User,शेयर उपयोगकर्ता
 DocType: Soil Analysis,(Ca+Mg)/K,(सीए मिलीग्राम +) / कश्मीर
@@ -203,7 +203,6 @@
 DocType: Packed Item,Parent Detail docname,माता - पिता विस्तार docname
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py,"Reference: {0}, Item Code: {1} and Customer: {2}","संदर्भ: {0}, मद कोड: {1} और ग्राहक: {2}"
 apps/erpnext/erpnext/accounts/report/consolidated_financial_statement/consolidated_financial_statement.py,{0} {1} is not present in the parent company,{0} {1} मूल कंपनी में मौजूद नहीं है
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Supplier &gt; Supplier Type,आपूर्तिकर्ता&gt; आपूर्तिकर्ता प्रकार
 apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py,Trial Period End Date Cannot be before Trial Period Start Date,परीक्षण अवधि समाप्ति तिथि परीक्षण अवधि प्रारंभ तिथि से पहले नहीं हो सकती है
 apps/erpnext/erpnext/utilities/user_progress.py,Kg,किलो
 DocType: Tax Withholding Category,Tax Withholding Category,कर रोकथाम श्रेणी
@@ -317,6 +316,7 @@
 DocType: Quality Procedure Table,Responsible Individual,जिम्मेदार व्यक्ति
 DocType: Naming Series,Prefix,उपसर्ग
 apps/erpnext/erpnext/hr/notification/training_scheduled/training_scheduled.html,Event Location,घटना स्थान
+apps/erpnext/erpnext/selling/report/customer_wise_item_price/customer_wise_item_price.py,Available Stock,मौजूदा भंडार
 DocType: Asset Settings,Asset Settings,संपत्ति सेटिंग्स
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py,Consumable,उपभोज्य
 DocType: Student,B-,बी
@@ -349,6 +349,7 @@
 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 \
 				Serial No.",सीरियल नंबर द्वारा डिलीवरी सुनिश्चित नहीं कर सकता क्योंकि \ Item {0} को \ Serial No. द्वारा डिलीवरी सुनिश्चित किए बिना और बिना जोड़ा गया है।
+apps/erpnext/erpnext/education/doctype/instructor/instructor.py,Please setup Instructor Naming System in Education &gt; Education Settings,कृपया शिक्षा&gt; शिक्षा सेटिंग्स में इंस्ट्रक्टर नामकरण प्रणाली सेटअप करें
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py,At least one mode of payment is required for POS invoice.,भुगतान के कम से कम एक मोड पीओएस चालान के लिए आवश्यक है।
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py,Batch no is required for batched item {0},बैच आइटम {0} के लिए बैच की आवश्यकता नहीं है
 DocType: Bank Statement Transaction Invoice Item,Bank Statement Transaction Invoice Item,बैंक स्टेटमेंट लेनदेन चालान आइटम
@@ -871,7 +872,6 @@
 DocType: Supplier Scorecard Standing,Notify Other,अन्य को सूचित करें
 DocType: Vital Signs,Blood Pressure (systolic),रक्तचाप (सिस्टोलिक)
 DocType: Item Price,Valid Upto,विधिमान्य
-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: Training Event,Workshop,कार्यशाला
 DocType: Supplier Scorecard Scoring Standing,Warn Purchase Orders,खरीद आदेश को चेतावनी दें
 apps/erpnext/erpnext/utilities/user_progress.py,List a few of your customers. They could be organizations or individuals.,अपने ग्राहकों के कुछ सूची . वे संगठनों या व्यक्तियों हो सकता है.
@@ -1043,6 +1043,8 @@
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py,Note: Total allocated leaves {0} shouldn't be less than already approved leaves {1} for the period,नोट: कुल आवंटित पत्ते {0} पहले ही मंजूरी दे दी पत्तियों से कम नहीं होना चाहिए {1} अवधि के लिए
 DocType: Stock Settings,Set Qty in Transactions based on Serial No Input,सीरियल नो इनपुट के आधार पर लेनदेन में मात्रा निर्धारित करें
 ,Total Stock Summary,कुल स्टॉक सारांश
+apps/erpnext/erpnext/hr/doctype/staffing_plan/staffing_plan.py,"You can only plan for upto {0} vacancies and budget {1} \
+				for {2} as per staffing plan {3} for parent company {4}.",आप केवल मूल कंपनी {4} के लिए {0} रिक्तियों और बजट {1} के लिए {2} के लिए स्टाफिंग प्लान {3} के अनुसार योजना बना सकते हैं।
 DocType: Announcement,Posted By,द्वारा प्रकाशित किया गया था
 apps/erpnext/erpnext/controllers/stock_controller.py,Quality Inspection required for Item {0} to submit,प्रस्तुत करने के लिए आइटम {0} के लिए गुणवत्ता निरीक्षण आवश्यक है
 DocType: Item,Delivered by Supplier (Drop Ship),प्रदायक द्वारा वितरित (ड्रॉप जहाज)
@@ -1672,7 +1674,6 @@
 DocType: Item Barcode,Item Barcode,आइटम बारकोड
 DocType: Delivery Trip,In Transit,रास्ते में
 DocType: Woocommerce Settings,Endpoints,endpoints
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Item Code &gt; Item Group &gt; Brand,आइटम कोड&gt; आइटम समूह&gt; ब्रांड
 DocType: Shopping Cart Settings,Show Configure Button,कॉन्फ़िगर बटन दिखाएं
 DocType: Quality Inspection Reading,Reading 6,6 पढ़ना
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js,Cannot {0} {1} {2} without any negative outstanding invoice,नहीं {0} {1} {2} के बिना किसी भी नकारात्मक बकाया चालान कर सकते हैं
@@ -2032,6 +2033,7 @@
 DocType: Cheque Print Template,Payer Settings,भुगतानकर्ता सेटिंग
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js,No pending Material Requests found to link for the given items.,दिए गए आइटमों के लिए लिंक करने के लिए कोई लंबित सामग्री अनुरोध नहीं मिला।
 apps/erpnext/erpnext/public/js/utils/party.js,Select company first,पहले कंपनी का चयन करें
+apps/erpnext/erpnext/accounts/general_ledger.py,Account: <b>{0}</b> is capital Work in progress and can not be updated by Journal Entry,खाता: <b>{0}</b> पूंजी कार्य प्रगति पर है और जर्नल एंट्री द्वारा अद्यतन नहीं किया जा सकता है
 apps/erpnext/erpnext/education/doctype/quiz/quiz.py,Compare List function takes on list arguments,सूची तर्कों पर सूची फ़ंक्शन की तुलना करें
 DocType: Item Attribute Value,"This will be appended to the Item Code of the variant. For example, if your abbreviation is ""SM"", and the item code is ""T-SHIRT"", the item code of the variant will be ""T-SHIRT-SM""","इस प्रकार के आइटम कोड के साथ संलग्न किया जाएगा। अपने संक्षिप्त नाम ""एसएम"", और अगर उदाहरण के लिए, मद कोड ""टी शर्ट"", ""टी-शर्ट एस.एम."" हो जाएगा संस्करण के मद कोड है"
 DocType: Salary Slip,Net Pay (in words) will be visible once you save the Salary Slip.,एक बार जब आप को वेतन पर्ची सहेजे शुद्ध वेतन (शब्दों) में दिखाई जाएगी।
@@ -2216,6 +2218,7 @@
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js,Item 2,आइटम 2
 DocType: Pricing Rule,Validate Applied Rule,मान्य नियम
 DocType: QuickBooks Migrator,Authorization Endpoint,प्रमाणीकरण एंडपॉइंट
+DocType: Employee Onboarding,Notify users by email,उपयोगकर्ताओं को ईमेल द्वारा सूचित करें
 DocType: Travel Request,International,अंतरराष्ट्रीय
 DocType: Training Event,Training Event,प्रशिक्षण घटना
 DocType: Item,Auto re-order,ऑटो पुनः आदेश
@@ -2827,7 +2830,6 @@
 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,एक ही नाम वाला ग्राहक पहले से मौजूद है
-DocType: Contract,Inactive,निष्क्रिय
 apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.js,This will submit Salary Slips and create accrual Journal Entry. Do you want to proceed?,यह वेतन स्लिप्स जमा कर देगा और एआरआरआर जर्नल एंट्री बनायेगा। क्या आप आगे बढ़ना चाहते हैं?
 DocType: Purchase Invoice,Total Net Weight,कुल वजन
 DocType: Purchase Order,Order Confirmation No,आदेश की पुष्टि नहीं
@@ -3104,7 +3106,6 @@
 apps/erpnext/erpnext/accounts/party.py,Billing currency must be equal to either default company's currency or party account currency,बिलिंग मुद्रा या तो डिफ़ॉल्ट कंपनी की मुद्रा या पक्ष खाता मुद्रा के बराबर होनी चाहिए
 DocType: Packing Slip,Indicates that the package is a part of this delivery (Only Draft),पैकेज इस वितरण का एक हिस्सा है कि संकेत करता है (केवल मसौदा)
 apps/erpnext/erpnext/accounts/report/customer_ledger_summary/customer_ledger_summary.py,Closing Balance,समाप्ति के समय बकाया
-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: Soil Texture,Loam,चिकनी बलुई मिट्टी
 apps/erpnext/erpnext/controllers/accounts_controller.py,Row {0}: Due Date cannot be before posting date,पंक्ति {0}: तिथि पोस्ट करने से पहले तिथि नहीं हो सकती
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py,Quantity for Item {0} must be less than {1},मात्रा मद के लिए {0} से कम होना चाहिए {1}
@@ -3628,7 +3629,6 @@
 DocType: Stock Settings,Raise Material Request when stock reaches re-order level,सामग्री अनुरोध उठाएँ जब शेयर पुनः आदेश के स्तर तक पहुँच
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py,Full-time,पूर्णकालिक
 DocType: Payroll Entry,Employees,कर्मचारियों
-apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py,Please setup numbering series for Attendance via Setup &gt; Numbering Series,कृपया सेटअप&gt; नंबरिंग श्रृंखला के माध्यम से उपस्थिति के लिए क्रमांकन श्रृंखला की स्थापना करें
 DocType: Question,Single Correct Answer,एकल सही उत्तर
 DocType: Employee,Contact Details,जानकारी के लिए संपर्क
 DocType: C-Form,Received Date,प्राप्त तिथि
@@ -4259,6 +4259,7 @@
 DocType: Pricing Rule,Price or Product Discount,मूल्य या उत्पाद छूट
 apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.py,For row {0}: Enter planned qty,पंक्ति {0} के लिए: नियोजित मात्रा दर्ज करें
 DocType: Account,Income Account,आय खाता
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Customer &gt; Customer Group &gt; Territory,ग्राहक&gt; ग्राहक समूह&gt; क्षेत्र
 DocType: Payment Request,Amount in customer's currency,ग्राहक की मुद्रा में राशि
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js,Delivery,वितरण
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.py,Assigning Structures...,संरचनाएं असाइन करना ...
@@ -4308,7 +4309,6 @@
 DocType: HR Settings,Check Vacancies On Job Offer Creation,नौकरी की पेशकश निर्माण पर रिक्तियों की जाँच करें
 apps/erpnext/erpnext/utilities/user_progress.py,Go to Letterheads,Letterheads पर जाएं
 DocType: Subscription,Cancel At End Of Period,अवधि के अंत में रद्द करें
-apps/erpnext/erpnext/education/doctype/instructor/instructor.py,Please setup Instructor Naming System in Education &gt; Education Settings,कृपया शिक्षा&gt; शिक्षा सेटिंग्स में इंस्ट्रक्टर नामकरण प्रणाली सेटअप करें
 apps/erpnext/erpnext/hr/doctype/employee_promotion/employee_promotion.js,Property already added,संपत्ति पहले से ही जोड़ा गया है
 DocType: Item Supplier,Item Supplier,आइटम प्रदायक
 apps/erpnext/erpnext/public/js/controllers/transaction.js,Please enter Item Code to get batch no,कोई बैच पाने के मद कोड दर्ज करें
@@ -4605,6 +4605,7 @@
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.js,Warning: Material Requested Qty is less than Minimum Order Qty,चेतावनी: मात्रा अनुरोध सामग्री न्यूनतम आदेश मात्रा से कम है
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py,Account {0} is frozen,खाते {0} जमे हुए है
 DocType: Quiz Question,Quiz Question,क्विज प्रश्न
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Supplier &gt; Supplier Type,आपूर्तिकर्ता&gt; आपूर्तिकर्ता प्रकार
 DocType: Company,Legal Entity / Subsidiary with a separate Chart of Accounts belonging to the Organization.,संगठन से संबंधित खातों की एक अलग चार्ट के साथ कानूनी इकाई / सहायक।
 DocType: Payment Request,Mute Email,म्यूट ईमेल
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py,"Food, Beverage & Tobacco","खाद्य , पेय और तंबाकू"
@@ -5115,7 +5116,6 @@
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py,Delivery warehouse required for stock item {0},वितरण गोदाम स्टॉक आइटम के लिए आवश्यक {0}
 DocType: Packing Slip,The gross weight of the package. Usually net weight + packaging material weight. (for print),पैकेज के कुल वजन. आमतौर पर शुद्ध + वजन पैकेजिंग सामग्री के वजन. (प्रिंट के लिए)
 DocType: Assessment Plan,Program,कार्यक्रम
-apps/erpnext/erpnext/hr/doctype/employee/employee.py,Please setup Employee Naming System in Human Resource &gt; HR Settings,कृपया मानव संसाधन&gt; HR सेटिंग्स में कर्मचारी नामकरण प्रणाली सेटअप करें
 DocType: Accounts Settings,Users with this role are allowed to set frozen accounts and create / modify accounting entries against frozen accounts,इस भूमिका के साथ उपयोक्ता जमे हुए खातों के खिलाफ लेखांकन प्रविष्टियों को संशोधित / जमे हुए खातों सेट और बनाने के लिए अनुमति दी जाती है
 ,Project Billing Summary,प्रोजेक्ट बिलिंग सारांश
 DocType: Vital Signs,Cuts,कटौती
@@ -5364,6 +5364,7 @@
 apps/erpnext/erpnext/quality_management/doctype/quality_review/quality_review_list.js,No Action,कोई कार्रवाई नहीं
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js,Valuation type charges can not marked as Inclusive,मूल्यांकन प्रकार के आरोप समावेशी के रूप में चिह्नित नहीं कर सकता
 DocType: POS Profile,Update Stock,स्टॉक अद्यतन
+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/stock/doctype/packing_slip/packing_slip.js,Different UOM for items will lead to incorrect (Total) Net Weight value. Make sure that Net Weight of each item is in the same UOM.,मदों के लिए अलग UOM गलत ( कुल ) नेट वजन मूल्य को बढ़ावा मिलेगा. प्रत्येक आइटम का शुद्ध वजन ही UOM में है कि सुनिश्चित करें.
 DocType: Certification Application,Payment Details,भुगतान विवरण
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py,BOM Rate,बीओएम दर
@@ -5467,6 +5468,8 @@
 apps/erpnext/erpnext/accounts/doctype/monthly_distribution/monthly_distribution.py,Percentage Allocation should be equal to 100%,प्रतिशत आवंटन 100 % के बराबर होना चाहिए
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js,Please select Posting Date before selecting Party,कृपया पार्टी के चयन से पहले पोस्ट दिनांक का चयन
 apps/erpnext/erpnext/config/accounting.py,Payment Terms based on conditions,शर्तों के आधार पर भुगतान की शर्तें
+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: Program Enrollment,School House,स्कूल हाउस
 DocType: Serial No,Out of AMC,एएमसी के बाहर
 DocType: Opportunity,Opportunity Amount,अवसर राशि
@@ -5668,6 +5671,7 @@
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py,Order/Quot %,आदेश / दाएं%
 apps/erpnext/erpnext/config/healthcare.py,Record Patient Vitals,रिकॉर्ड रोगी Vitals
 DocType: Fee Schedule,Institution,संस्था
+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: Asset,Partially Depreciated,आंशिक रूप से घिस
 DocType: Issue,Opening Time,समय खुलने की
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py,From and To dates required,दिनांक से और
@@ -5883,6 +5887,7 @@
 DocType: Quality Procedure Process,Link existing Quality Procedure.,लिंक मौजूदा गुणवत्ता प्रक्रिया।
 apps/erpnext/erpnext/config/hr.py,Loans,ऋण
 DocType: Healthcare Service Unit,Healthcare Service Unit,हेल्थकेयर सेवा इकाई
+,Customer-wise Item Price,ग्राहक-वार मद मूल्य
 apps/erpnext/erpnext/public/js/financial_statements.js,Cash Flow Statement,नकदी प्रवाह विवरण
 apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.py,No material request created,कोई भौतिक अनुरोध नहीं बनाया गया
 apps/erpnext/erpnext/hr/doctype/loan_application/loan_application.py,Loan Amount cannot exceed Maximum Loan Amount of {0},ऋण राशि का अधिकतम ऋण राशि से अधिक नहीं हो सकता है {0}
@@ -6144,6 +6149,7 @@
 apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py,Opening Value,उद्घाटन मूल्य
 DocType: Salary Component,Formula,सूत्र
 apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py,Serial #,सीरियल #
+apps/erpnext/erpnext/hr/doctype/employee/employee.py,Please setup Employee Naming System in Human Resource &gt; HR Settings,कृपया मानव संसाधन&gt; HR सेटिंग्स में कर्मचारी नामकरण प्रणाली सेटअप करें
 DocType: Material Request Plan Item,Required Quantity,आवश्यक मात्रा
 DocType: Lab Test Template,Lab Test Template,लैब टेस्ट टेम्पलेट
 apps/erpnext/erpnext/accounts/doctype/accounting_period/accounting_period.py,Accounting Period overlaps with {0},लेखांकन अवधि {0} के साथ ओवरलैप होती है
@@ -6394,7 +6400,6 @@
 DocType: Request for Quotation Item,Project Name,इस परियोजना का नाम
 apps/erpnext/erpnext/regional/italy/utils.py,Please set the Customer Address,कृपया ग्राहक का पता सेट करें
 DocType: Customer,Mention if non-standard receivable account,"मेंशन अमानक प्राप्य खाते है, तो"
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Customer &gt; Customer Group &gt; Territory,ग्राहक&gt; ग्राहक समूह&gt; क्षेत्र
 DocType: Bank,Plaid Access Token,प्लेड एक्सेस टोकन
 apps/erpnext/erpnext/hr/doctype/employee_benefit_application/employee_benefit_application.py,Please add the remaining benefits {0} to any of the existing component,किसी भी मौजूदा घटक में शेष लाभ {0} जोड़ें
 DocType: Journal Entry Account,If Income or Expense,यदि आय या व्यय
@@ -6657,8 +6662,6 @@
 apps/erpnext/erpnext/buying/utils.py,Please enter quantity for Item {0},आइटम के लिए मात्रा दर्ज करें {0}
 DocType: Quality Procedure,Processes,प्रक्रियाओं
 DocType: Shift Type,First Check-in and Last Check-out,पहला चेक-इन और अंतिम चेक-आउट
-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/regional/report/hsn_wise_summary_of_outward_supplies/hsn_wise_summary_of_outward_supplies.py,Total Taxable Amount,कुल कर योग्य राशि
 DocType: Employee External Work History,Employee External Work History,कर्मचारी बाहरी काम इतिहास
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.py,Job card {0} created,जॉब कार्ड {0} बनाया गया
@@ -6694,6 +6697,7 @@
 apps/erpnext/erpnext/accounts/doctype/payment_terms_template/payment_terms_template.py,Combined invoice portion must equal 100%,संयुक्त चालान भाग 100% के बराबर होना चाहिए
 DocType: Item Default,Default Expense Account,डिफ़ॉल्ट व्यय खाते
 DocType: GST Account,CGST Account,सीजीएसटी खाता
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Item Code &gt; Item Group &gt; Brand,आइटम कोड&gt; आइटम समूह&gt; ब्रांड
 apps/erpnext/erpnext/education/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py,Student Email ID,छात्र ईमेल आईडी
 DocType: Employee,Notice (days),सूचना (दिन)
 DocType: POS Closing Voucher Invoices,POS Closing Voucher Invoices,पीओएस बंद वाउचर चालान
@@ -7331,6 +7335,7 @@
 DocType: Maintenance Visit,Maintenance Date,रखरखाव तिथि
 DocType: Purchase Invoice Item,Rejected Serial No,अस्वीकृत धारावाहिक नहीं
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py,Year start date or end date is overlapping with {0}. To avoid please set company,साल शुरू की तारीख या अंत की तारीख {0} के साथ अतिव्यापी है। से बचने के लिए कंपनी सेट करें
+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/selling/doctype/customer/customer.py,Please mention the Lead Name in Lead {0},लीड में लीड नाम का उल्लेख करें {0}
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py,Start date should be less than end date for Item {0},प्रारंभ तिथि मद के लिए समाप्ति तिथि से कम होना चाहिए {0}
 DocType: Shift Type,Auto Attendance Settings,ऑटो उपस्थिति सेटिंग्स
diff --git a/erpnext/translations/hr.csv b/erpnext/translations/hr.csv
index 91eed7c..4fcaa40 100644
--- a/erpnext/translations/hr.csv
+++ b/erpnext/translations/hr.csv
@@ -168,7 +168,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py,Accountant,Knjigovođa
 apps/erpnext/erpnext/stock/report/item_price_stock/item_price_stock.py,Selling Price List,Cjenik prodaje
 DocType: Patient,Tobacco Current Use,Duhanska struja
-apps/erpnext/erpnext/stock/report/item_price_stock/item_price_stock.py,Selling Rate,Stopa prodaje
+apps/erpnext/erpnext/selling/report/customer_wise_item_price/customer_wise_item_price.py,Selling Rate,Stopa prodaje
 apps/erpnext/erpnext/erpnext_integrations/doctype/plaid_settings/plaid_settings.js,Please save your document before adding a new account,Spremite svoj dokument prije dodavanja novog računa
 DocType: Cost Center,Stock User,Stock Korisnik
 DocType: Soil Analysis,(Ca+Mg)/K,(+ Ca Mg) / K
@@ -205,7 +205,6 @@
 DocType: Packed Item,Parent Detail docname,Nadređeni detalj docname
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py,"Reference: {0}, Item Code: {1} and Customer: {2}","Referenca: {0}, šifra stavke: {1} i klijent: {2}"
 apps/erpnext/erpnext/accounts/report/consolidated_financial_statement/consolidated_financial_statement.py,{0} {1} is not present in the parent company,{0} {1} nije prisutno u matičnoj tvrtki
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Supplier &gt; Supplier Type,Dobavljač&gt; vrsta dobavljača
 apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py,Trial Period End Date Cannot be before Trial Period Start Date,Datum završetka probnog razdoblja Ne može biti prije datuma početka probnog razdoblja
 apps/erpnext/erpnext/utilities/user_progress.py,Kg,kg
 DocType: Tax Withholding Category,Tax Withholding Category,Kategorija zadržavanja poreza
@@ -319,6 +318,7 @@
 DocType: Quality Procedure Table,Responsible Individual,Odgovorni pojedinac
 DocType: Naming Series,Prefix,Prefiks
 apps/erpnext/erpnext/hr/notification/training_scheduled/training_scheduled.html,Event Location,Lokacija događaja
+apps/erpnext/erpnext/selling/report/customer_wise_item_price/customer_wise_item_price.py,Available Stock,Dostupne zalihe
 DocType: Asset Settings,Asset Settings,Postavke imovine
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py,Consumable,potrošni
 DocType: Student,B-,B-
@@ -351,6 +351,7 @@
 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 \
 				Serial No.",Ne može se osigurati isporuka prema serijskoj broju kao što je \ Stavka {0} dodana sa i bez osiguranja isporuke od strane \ Serial No.
+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/accounts/doctype/sales_invoice/sales_invoice.py,At least one mode of payment is required for POS invoice.,potreban je najmanje jedan način plaćanja za POS računa.
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py,Batch no is required for batched item {0},Za serijsku stavku nije potreban broj serije {0}
 DocType: Bank Statement Transaction Invoice Item,Bank Statement Transaction Invoice Item,Stavka transakcijske fakture bankovne izjave
@@ -874,7 +875,6 @@
 DocType: Vital Signs,Blood Pressure (systolic),Krvni tlak (sistolički)
 apps/erpnext/erpnext/controllers/buying_controller.py,{0} {1} is {2},{0} {1} je {2}
 DocType: Item Price,Valid Upto,Vrijedi Upto
-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: Training Event,Workshop,Radionica
 DocType: Supplier Scorecard Scoring Standing,Warn Purchase Orders,Upozorite narudžbenice
 apps/erpnext/erpnext/utilities/user_progress.py,List a few of your customers. They could be organizations or individuals.,Navedite nekoliko svojih kupaca. Oni mogu biti tvrtke ili fizičke osobe.
@@ -1677,7 +1677,6 @@
 DocType: Item Barcode,Item Barcode,Barkod proizvoda
 DocType: Delivery Trip,In Transit,U tranzitu
 DocType: Woocommerce Settings,Endpoints,Krajnje točke
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Item Code &gt; Item Group &gt; Brand,Kod artikla&gt; Grupa artikala&gt; Marka
 DocType: Shopping Cart Settings,Show Configure Button,Prikaži gumb Konfiguriraj
 DocType: Quality Inspection Reading,Reading 6,Čitanje 6
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js,Cannot {0} {1} {2} without any negative outstanding invoice,Ne mogu {0} {1} {2} bez ikakvih negativnih izvanredan fakture
@@ -2037,6 +2036,7 @@
 DocType: Cheque Print Template,Payer Settings,Postavke Payer
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js,No pending Material Requests found to link for the given items.,Nisu pronađeni materijalni zahtjevi na čekanju za povezivanje za određene stavke.
 apps/erpnext/erpnext/public/js/utils/party.js,Select company first,Najprije odaberite tvrtku
+apps/erpnext/erpnext/accounts/general_ledger.py,Account: <b>{0}</b> is capital Work in progress and can not be updated by Journal Entry,Račun: <b>{0}</b> je kapital U tijeku je rad i ne može ga ažurirati Entry Journal
 apps/erpnext/erpnext/education/doctype/quiz/quiz.py,Compare List function takes on list arguments,Funkcija Usporedi popis preuzima argumente liste
 DocType: Item Attribute Value,"This will be appended to the Item Code of the variant. For example, if your abbreviation is ""SM"", and the item code is ""T-SHIRT"", the item code of the variant will be ""T-SHIRT-SM""","To će biti dodan u šifra varijante. Na primjer, ako je vaš naziv je ""SM"", a točka kod ""T-shirt"", stavka kod varijante će biti ""T-SHIRT-SM"""
 DocType: Salary Slip,Net Pay (in words) will be visible once you save the Salary Slip.,Neto plaća (riječima) će biti vidljiva nakon što spremite klizne plaće.
@@ -2221,6 +2221,7 @@
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js,Item 2,Stavka 2
 DocType: Pricing Rule,Validate Applied Rule,Potvrdite primijenjeno pravilo
 DocType: QuickBooks Migrator,Authorization Endpoint,Endpoint autorizacije
+DocType: Employee Onboarding,Notify users by email,Obavijestite korisnike e-poštom
 DocType: Travel Request,International,međunarodna
 DocType: Training Event,Training Event,Događaj za obuku
 DocType: Item,Auto re-order,Automatski reorganiziraj
@@ -2832,7 +2833,6 @@
 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
-DocType: Contract,Inactive,neaktivan
 apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.js,This will submit Salary Slips and create accrual Journal Entry. Do you want to proceed?,To će poslati Plaće Slips i stvoriti obračunski dnevnik unos. Želiš li nastaviti?
 DocType: Purchase Invoice,Total Net Weight,Ukupna neto težina
 DocType: Purchase Order,Order Confirmation No,Potvrda narudžbe br
@@ -3108,7 +3108,6 @@
 apps/erpnext/erpnext/accounts/party.py,Billing currency must be equal to either default company's currency or party account currency,Valuta naplate mora biti jednaka valutnoj valuti ili valuti stranke računa tvrtke
 DocType: Packing Slip,Indicates that the package is a part of this delivery (Only Draft),Ukazuje da je paket je dio ove isporuke (samo nacrti)
 apps/erpnext/erpnext/accounts/report/customer_ledger_summary/customer_ledger_summary.py,Closing Balance,Završna ravnoteža
-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}
 DocType: Soil Texture,Loam,Ilovača
 apps/erpnext/erpnext/controllers/accounts_controller.py,Row {0}: Due Date cannot be before posting date,Redak {0}: Datum dospijeća ne može biti prije objavljivanja datuma
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py,Quantity for Item {0} must be less than {1},Količina za proizvod {0} mora biti manja od {1}
@@ -3632,7 +3631,6 @@
 DocType: Stock Settings,Raise Material Request when stock reaches re-order level,Podignite Materijal Zahtjev kad dionica dosegne ponovno poredak razinu
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py,Full-time,Puno radno vrijeme
 DocType: Payroll Entry,Employees,zaposlenici
-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: Question,Single Correct Answer,Jedan točan odgovor
 DocType: Employee,Contact Details,Kontakt podaci
 DocType: C-Form,Received Date,Datum pozicija
@@ -4262,6 +4260,7 @@
 DocType: Pricing Rule,Price or Product Discount,Popust na cijenu ili proizvod
 apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.py,For row {0}: Enter planned qty,Za redak {0}: unesite planirani iznos
 DocType: Account,Income Account,Račun prihoda
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Customer &gt; Customer Group &gt; Territory,Kupac&gt; Grupa kupaca&gt; Teritorij
 DocType: Payment Request,Amount in customer's currency,Iznos u valuti kupca
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js,Delivery,Isporuka
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.py,Assigning Structures...,Dodjeljivanje struktura ...
@@ -4311,7 +4310,6 @@
 DocType: HR Settings,Check Vacancies On Job Offer Creation,Provjerite slobodna radna mjesta na izradi ponude posla
 apps/erpnext/erpnext/utilities/user_progress.py,Go to Letterheads,Idi na zaglavlje
 DocType: Subscription,Cancel At End Of Period,Odustani na kraju razdoblja
-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/hr/doctype/employee_promotion/employee_promotion.js,Property already added,Već je dodano svojstvo
 DocType: Item Supplier,Item Supplier,Dobavljač proizvoda
 apps/erpnext/erpnext/public/js/controllers/transaction.js,Please enter Item Code to get batch no,Unesite kod Predmeta da se hrpa nema
@@ -4608,6 +4606,7 @@
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.js,Warning: Material Requested Qty is less than Minimum Order Qty,Upozorenje : Materijal Tražena količina manja nego minimalna narudžba kol
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py,Account {0} is frozen,Račun {0} je zamrznut
 DocType: Quiz Question,Quiz Question,Pitanje za kviz
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Supplier &gt; Supplier Type,Dobavljač&gt; vrsta dobavljača
 DocType: Company,Legal Entity / Subsidiary with a separate Chart of Accounts belonging to the Organization.,Pravna cjelina / Podružnica s odvojenim kontnim planom pripada Organizaciji.
 DocType: Payment Request,Mute Email,Mute e
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py,"Food, Beverage & Tobacco","Hrana , piće i duhan"
@@ -5118,7 +5117,6 @@
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py,Delivery warehouse required for stock item {0},Isporuka skladište potrebno za dionicama stavku {0}
 DocType: Packing Slip,The gross weight of the package. Usually net weight + packaging material weight. (for print),Bruto težina paketa. Obično neto težina + ambalaža težina. (Za tisak)
 DocType: Assessment Plan,Program,Program
-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: Accounts Settings,Users with this role are allowed to set frozen accounts and create / modify accounting entries against frozen accounts,Korisnici s ovom ulogom smiju postaviti zamrznute račune i izradu / izmjenu računovodstvenih unosa protiv zamrznutih računa
 ,Project Billing Summary,Sažetak naplate projekta
 DocType: Vital Signs,Cuts,rezovi
@@ -5367,6 +5365,7 @@
 apps/erpnext/erpnext/quality_management/doctype/quality_review/quality_review_list.js,No Action,Nema akcije
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js,Valuation type charges can not marked as Inclusive,Troškovi tipa Vrednovanje se ne može označiti kao Inclusive
 DocType: POS Profile,Update Stock,Ažuriraj zalihe
+apps/erpnext/erpnext/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/stock/doctype/packing_slip/packing_slip.js,Different UOM for items will lead to incorrect (Total) Net Weight value. Make sure that Net Weight of each item is in the same UOM.,Različite mjerne jedinice proizvoda će dovesti do ukupne pogrešne neto težine. Budite sigurni da je neto težina svakog proizvoda u istoj mjernoj jedinici.
 DocType: Certification Application,Payment Details,Pojedinosti o plaćanju
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py,BOM Rate,BOM stopa
@@ -5470,6 +5469,8 @@
 apps/erpnext/erpnext/accounts/doctype/monthly_distribution/monthly_distribution.py,Percentage Allocation should be equal to 100%,Postotak izdvajanja mora biti 100 %
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js,Please select Posting Date before selecting Party,Odaberite datum knjiženja prije odabira stranku
 apps/erpnext/erpnext/config/accounting.py,Payment Terms based on conditions,Uvjeti plaćanja na temelju uvjeta
+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: Program Enrollment,School House,Škola Kuća
 DocType: Serial No,Out of AMC,Od AMC
 DocType: Opportunity,Opportunity Amount,Iznos prilika
@@ -5671,6 +5672,7 @@
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py,Order/Quot %,Redoslijed / kvota%
 apps/erpnext/erpnext/config/healthcare.py,Record Patient Vitals,Snimite pacijente Vitals
 DocType: Fee Schedule,Institution,Institucija
+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}
 DocType: Asset,Partially Depreciated,djelomično amortiziraju
 DocType: Issue,Opening Time,Radno vrijeme
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py,From and To dates required,Od i Do datuma zahtijevanih
@@ -5887,6 +5889,7 @@
 DocType: Quality Procedure Process,Link existing Quality Procedure.,Povežite postojeći postupak kvalitete.
 apps/erpnext/erpnext/config/hr.py,Loans,krediti
 DocType: Healthcare Service Unit,Healthcare Service Unit,Jedinica za zdravstvenu zaštitu
+,Customer-wise Item Price,Kupcima prilagođena cijena
 apps/erpnext/erpnext/public/js/financial_statements.js,Cash Flow Statement,Izvještaj o novčanom tijeku
 apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.py,No material request created,Nije stvoren materijalni zahtjev
 apps/erpnext/erpnext/hr/doctype/loan_application/loan_application.py,Loan Amount cannot exceed Maximum Loan Amount of {0},Iznos kredita ne može biti veći od maksimalnog iznosa zajma {0}
@@ -6148,6 +6151,7 @@
 apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py,Opening Value,Otvaranje vrijednost
 DocType: Salary Component,Formula,Formula
 apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py,Serial #,Serijski #
+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: Material Request Plan Item,Required Quantity,Potrebna količina
 DocType: Lab Test Template,Lab Test Template,Predložak testa laboratorija
 apps/erpnext/erpnext/accounts/doctype/accounting_period/accounting_period.py,Accounting Period overlaps with {0},Računovodstveno razdoblje se preklapa s {0}
@@ -6398,7 +6402,6 @@
 DocType: Request for Quotation Item,Project Name,Naziv projekta
 apps/erpnext/erpnext/regional/italy/utils.py,Please set the Customer Address,Molimo postavite korisničku adresu
 DocType: Customer,Mention if non-standard receivable account,Spomenuti ako nestandardni potraživanja račun
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Customer &gt; Customer Group &gt; Territory,Kupac&gt; Grupa kupaca&gt; Teritorij
 DocType: Bank,Plaid Access Token,Plaid Access Token
 apps/erpnext/erpnext/hr/doctype/employee_benefit_application/employee_benefit_application.py,Please add the remaining benefits {0} to any of the existing component,Dodajte preostale pogodnosti {0} na bilo koju postojeću komponentu
 DocType: Journal Entry Account,If Income or Expense,Ako prihoda i rashoda
@@ -6661,8 +6664,6 @@
 apps/erpnext/erpnext/buying/utils.py,Please enter quantity for Item {0},Molimo unesite količinu za točku {0}
 DocType: Quality Procedure,Processes,procesi
 DocType: Shift Type,First Check-in and Last Check-out,Prva prijava i posljednja odjava
-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/regional/report/hsn_wise_summary_of_outward_supplies/hsn_wise_summary_of_outward_supplies.py,Total Taxable Amount,Ukupni iznos oporezive
 DocType: Employee External Work History,Employee External Work History,Zaposlenik Vanjski Rad Povijest
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.py,Job card {0} created,Izrađena je kartica za posao {0}
@@ -6698,6 +6699,7 @@
 apps/erpnext/erpnext/accounts/doctype/payment_terms_template/payment_terms_template.py,Combined invoice portion must equal 100%,Udio kombiniranog računa mora biti jednak 100%
 DocType: Item Default,Default Expense Account,Zadani račun rashoda
 DocType: GST Account,CGST Account,CGST račun
+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/education/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py,Student Email ID,Student ID e-pošte
 DocType: Employee,Notice (days),Obavijest (dani)
 DocType: POS Closing Voucher Invoices,POS Closing Voucher Invoices,POS fakture zatvaranja bonova za POS
@@ -7336,6 +7338,7 @@
 DocType: Maintenance Visit,Maintenance Date,Datum održavanje
 DocType: Purchase Invoice Item,Rejected Serial No,Odbijen Serijski br
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py,Year start date or end date is overlapping with {0}. To avoid please set company,Godina datum početka ili završetka je preklapanje s {0}. Da bi se izbjegla postavite tvrtku
+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/selling/doctype/customer/customer.py,Please mention the Lead Name in Lead {0},Navedite Lead Name u Lead {0}
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py,Start date should be less than end date for Item {0},Početak bi trebao biti manji od krajnjeg datuma za točke {0}
 DocType: Shift Type,Auto Attendance Settings,Postavke automatske posjećenosti
diff --git a/erpnext/translations/hu.csv b/erpnext/translations/hu.csv
index f6f1e74..079d3db 100644
--- a/erpnext/translations/hu.csv
+++ b/erpnext/translations/hu.csv
@@ -168,7 +168,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py,Accountant,Könyvelő
 apps/erpnext/erpnext/stock/report/item_price_stock/item_price_stock.py,Selling Price List,Értékesítési ár-lista
 DocType: Patient,Tobacco Current Use,Dohányzás jelenlegi felhasználása
-apps/erpnext/erpnext/stock/report/item_price_stock/item_price_stock.py,Selling Rate,Értékesítési ár
+apps/erpnext/erpnext/selling/report/customer_wise_item_price/customer_wise_item_price.py,Selling Rate,Értékesítési ár
 apps/erpnext/erpnext/erpnext_integrations/doctype/plaid_settings/plaid_settings.js,Please save your document before adding a new account,"Kérjük, mentse el a dokumentumot, mielőtt új fiókot hozzáadna"
 DocType: Cost Center,Stock User,Készlet Felhasználó
 DocType: Soil Analysis,(Ca+Mg)/K,(Ca + Mg)/K
@@ -205,7 +205,6 @@
 DocType: Packed Item,Parent Detail docname,Fő  docname részletek
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py,"Reference: {0}, Item Code: {1} and Customer: {2}","Referencia: {0}, pont kód: {1} és az ügyfél: {2}"
 apps/erpnext/erpnext/accounts/report/consolidated_financial_statement/consolidated_financial_statement.py,{0} {1} is not present in the parent company,{0} {1} nincs jelen ebben az anyavállalatban
-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/accounts/doctype/subscription/subscription.py,Trial Period End Date Cannot be before Trial Period Start Date,A próbaidőszak befejezési dátuma nem lehet a próbaidőszak kezdete előtti
 apps/erpnext/erpnext/utilities/user_progress.py,Kg,Kg
 DocType: Tax Withholding Category,Tax Withholding Category,Adó-visszatartási kategória
@@ -319,6 +318,7 @@
 DocType: Quality Procedure Table,Responsible Individual,Felelős személy
 DocType: Naming Series,Prefix,Előtag
 apps/erpnext/erpnext/hr/notification/training_scheduled/training_scheduled.html,Event Location,Esemény helyszíne
+apps/erpnext/erpnext/selling/report/customer_wise_item_price/customer_wise_item_price.py,Available Stock,Elérhető készlet
 DocType: Asset Settings,Asset Settings,Vagyonieszköz beállítások
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py,Consumable,Fogyóeszközök
 DocType: Student,B-,B-
@@ -351,6 +351,7 @@
 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 \
 				Serial No.","Nem lehet biztosítani a szállítást szériaszámként, mivel a \ item {0} van hozzáadva és anélkül,"
+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/accounts/doctype/sales_invoice/sales_invoice.py,At least one mode of payment is required for POS invoice.,Legalább egy fizetési mód szükséges POS számlára.
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py,Batch no is required for batched item {0},A (z) {0} tételhez tétel nem szükséges
 DocType: Bank Statement Transaction Invoice Item,Bank Statement Transaction Invoice Item,Banki kivonat Tranzakciós számla tétel
@@ -874,7 +875,6 @@
 DocType: Vital Signs,Blood Pressure (systolic),Vérnyomás (szisztolés)
 apps/erpnext/erpnext/controllers/buying_controller.py,{0} {1} is {2},{0} {1} a {2}
 DocType: Item Price,Valid Upto,Érvényes eddig:
-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: Training Event,Workshop,Műhely
 DocType: Supplier Scorecard Scoring Standing,Warn Purchase Orders,Vevői rendelések figyelmeztetése
 apps/erpnext/erpnext/utilities/user_progress.py,List a few of your customers. They could be organizations or individuals.,Felsorol egy pár vevőt. Ők lehetnek szervezetek vagy magánszemélyek.
@@ -1073,6 +1073,7 @@
 apps/erpnext/erpnext/education/doctype/fee_schedule/fee_schedule.js,Total Outstanding: {0},Összes kinntlevő: {0}
 DocType: Sales Invoice Timesheet,Sales Invoice Timesheet,Kimenő értékesítési számlák Munkaidő jelenléti ív nyilvántartója
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py,Reference No & Reference Date is required for {0},Hivatkozási szám és Referencia dátuma szükséges {0}
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py,Serial no(s) required for serialized item {0},A (z) {0} soros tételhez sorozatszám szükséges
 DocType: Payroll Entry,Select Payment Account to make Bank Entry,"Válasszon Fizetési számlát, banki tétel bejegyzéshez"
 apps/erpnext/erpnext/config/accounting.py,Opening and Closing,Nyitás és bezárás
 DocType: Hotel Settings,Default Invoice Naming Series,Alapértelmezett számlaelnevezési sorozatok
@@ -1657,7 +1658,6 @@
 DocType: Item Barcode,Item Barcode,Elem vonalkódja
 DocType: Delivery Trip,In Transit,Szállítás alatt
 DocType: Woocommerce Settings,Endpoints,Végpontok
-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
 DocType: Shopping Cart Settings,Show Configure Button,A Konfigurálás gomb megjelenítése
 DocType: Quality Inspection Reading,Reading 6,Olvasás 6
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js,Cannot {0} {1} {2} without any negative outstanding invoice,Nem lehet a {0} {1} {2} bármely negatív fennmaradó számla nélkül
@@ -2017,6 +2017,7 @@
 DocType: Cheque Print Template,Payer Settings,Fizetői beállítások
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js,No pending Material Requests found to link for the given items.,"Nincsenek függőben lévő anyag kérelmek, amelyek az adott tételekhez kapcsolódnak."
 apps/erpnext/erpnext/public/js/utils/party.js,Select company first,Először válassza ki a vállalkozást
+apps/erpnext/erpnext/accounts/general_ledger.py,Account: <b>{0}</b> is capital Work in progress and can not be updated by Journal Entry,"Fiók: A (z) <b>{0}</b> tőke folyamatban van. Folyamatban van, és a Naplóbejegyzés nem frissítheti"
 apps/erpnext/erpnext/education/doctype/quiz/quiz.py,Compare List function takes on list arguments,A Lista összehasonlítása funkció felveszi a lista argumentumait
 DocType: Item Attribute Value,"This will be appended to the Item Code of the variant. For example, if your abbreviation is ""SM"", and the item code is ""T-SHIRT"", the item code of the variant will be ""T-SHIRT-SM""","Ez lesz hozzáfűzve a termék egy varióciájához. Például, ha a rövidítés ""SM"", és a tételkód ""T-shirt"", a tétel kód variánsa ez lesz ""SM feliratú póló"""
 DocType: Salary Slip,Net Pay (in words) will be visible once you save the Salary Slip.,"Nettó fizetés (szavakkal) lesz látható, ha mentette a Bérpapírt."
@@ -2201,6 +2202,7 @@
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js,Item 2,2. tétel
 DocType: Pricing Rule,Validate Applied Rule,Az alkalmazott szabály érvényesítése
 DocType: QuickBooks Migrator,Authorization Endpoint,Engedélyezési végpont
+DocType: Employee Onboarding,Notify users by email,Értesítse a felhasználókat e-mailben
 DocType: Travel Request,International,Nemzetközi
 DocType: Training Event,Training Event,Képzési Esemény
 DocType: Item,Auto re-order,Auto újra-rendelés
@@ -2812,7 +2814,6 @@
 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ó
-DocType: Contract,Inactive,Inaktív
 apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.js,This will submit Salary Slips and create accrual Journal Entry. Do you want to proceed?,Ez Bérpapírt küld és létrehoz egy aktuális naplóbejegyzést. Akarod folytatni?
 DocType: Purchase Invoice,Total Net Weight,Teljes nettó súly
 DocType: Purchase Order,Order Confirmation No,Megrendelés visszaigazolás száma
@@ -3090,7 +3091,6 @@
 apps/erpnext/erpnext/accounts/party.py,Billing currency must be equal to either default company's currency or party account currency,A számlázási pénznemnek meg kell egyeznie az alapértelmezett vállalkozás pénzneméval vagy a másik fél pénznemével
 DocType: Packing Slip,Indicates that the package is a part of this delivery (Only Draft),"Azt jelzi, hogy a csomag egy része ennek a szállításnak (Csak tervezet)"
 apps/erpnext/erpnext/accounts/report/customer_ledger_summary/customer_ledger_summary.py,Closing Balance,Záróegyenleg
-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}
 DocType: Soil Texture,Loam,Termőtalaj
 apps/erpnext/erpnext/controllers/accounts_controller.py,Row {0}: Due Date cannot be before posting date,{0} sor: Az esedékesség dátuma nem lehet a dátum közzététele előtti
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py,Quantity for Item {0} must be less than {1},"Mennyiségnek erre a tételre {0} kisebbnek kell lennie, mint {1}"
@@ -3612,7 +3612,6 @@
 DocType: Stock Settings,Raise Material Request when stock reaches re-order level,"Keletkezzen Anyag igény, ha a raktárállomány eléri az újrarendelés szintjét"
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py,Full-time,Teljes munkaidőben
 DocType: Payroll Entry,Employees,Alkalmazottak
-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: Question,Single Correct Answer,Egyetlen helyes válasz
 DocType: Employee,Contact Details,Kapcsolattartó részletei
 DocType: C-Form,Received Date,Beérkezés dátuma
@@ -4223,6 +4222,7 @@
 DocType: Pricing Rule,Price or Product Discount,Ár vagy termék kedvezmény
 apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.py,For row {0}: Enter planned qty,A(z) {0} sorhoz: Írja be a tervezett mennyiséget
 DocType: Account,Income Account,Jövedelem számla
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Customer &gt; Customer Group &gt; Territory,Vevő&gt; Vevőcsoport&gt; Terület
 DocType: Payment Request,Amount in customer's currency,Összeg ügyfél valutájában
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js,Delivery,Szállítás
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.py,Assigning Structures...,Hozzárendelési szerkezetek...
@@ -4272,7 +4272,6 @@
 DocType: HR Settings,Check Vacancies On Job Offer Creation,Ellenőrizze az állásajánlatok létrehozásának megüresedését
 apps/erpnext/erpnext/utilities/user_progress.py,Go to Letterheads,Menjen a Fejlécekhez
 DocType: Subscription,Cancel At End Of Period,Törlés a periódus végén
-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/hr/doctype/employee_promotion/employee_promotion.js,Property already added,Már hozzáadott tulajdonság
 DocType: Item Supplier,Item Supplier,Tétel Beszállító
 apps/erpnext/erpnext/public/js/controllers/transaction.js,Please enter Item Code to get batch no,"Kérjük, adja meg a tételkódot a köteg szám megadásához"
@@ -4521,6 +4520,7 @@
 apps/erpnext/erpnext/education/doctype/assessment_plan/assessment_plan.py,You have already assessed for the assessment criteria {}.,Már értékelte ezekkel az értékelési kritériumokkal: {}.
 DocType: Vehicle Service,Engine Oil,Motorolaj
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js,Work Orders Created: {0},Létrehozott munka rendelések : {0}
+apps/erpnext/erpnext/crm/doctype/email_campaign/email_campaign.py,Please set an email id for the Lead {0},"Kérjük, állítson be egy e-mail azonosítót a vezető számára {0}"
 DocType: Sales Invoice,Sales Team1,Értékesítő csoport1
 apps/erpnext/erpnext/assets/doctype/asset/asset.py,Item {0} does not exist,"Tétel: {0}, nem létezik"
 DocType: Sales Invoice,Customer Address,Vevő címe
@@ -4556,6 +4556,7 @@
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.js,Warning: Material Requested Qty is less than Minimum Order Qty,"Figyelmeztetés: Anyag Igénylés mennyisége kevesebb, mint Minimális rendelhető menny"
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py,Account {0} is frozen,A {0} számla zárolt
 DocType: Quiz Question,Quiz Question,Kvízkérdés
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Supplier &gt; Supplier Type,Szállító&gt; Beszállító típusa
 DocType: Company,Legal Entity / Subsidiary with a separate Chart of Accounts belonging to the Organization.,Jogi alany / leányvállalat a Szervezethez tartozó külön számlatükörrel
 DocType: Payment Request,Mute Email,E-mail elnémítás
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py,"Food, Beverage & Tobacco","Élelmiszerek, italok és dohány"
@@ -5066,7 +5067,6 @@
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py,Delivery warehouse required for stock item {0},Szállítási raktár szükséges erre az tételre: {0}
 DocType: Packing Slip,The gross weight of the package. Usually net weight + packaging material weight. (for print),A csomag bruttó tömege. Általában a nettó tömeg + csomagolóanyag súlya. (nyomtatáshoz)
 DocType: Assessment Plan,Program,Program
-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: Accounts Settings,Users with this role are allowed to set frozen accounts and create / modify accounting entries against frozen accounts,"A felhasználók ezzel a Beosztással engedélyt kapnak, hogy zároljanak számlákat és létrehozzanek / módosítsanak könyvelési tételeket a zárolt számlákon"
 ,Project Billing Summary,A projekt számlázásának összefoglalása
 DocType: Vital Signs,Cuts,Bércsökkentések
@@ -5315,6 +5315,7 @@
 apps/erpnext/erpnext/quality_management/doctype/quality_review/quality_review_list.js,No Action,Nincs művelet
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js,Valuation type charges can not marked as Inclusive,Készletérték típusú költségeket nem lehet megjelölni értékbe beszámíthatónak
 DocType: POS Profile,Update Stock,Készlet frissítése
+apps/erpnext/erpnext/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/stock/doctype/packing_slip/packing_slip.js,Different UOM for items will lead to incorrect (Total) Net Weight value. Make sure that Net Weight of each item is in the same UOM.,"Különböző mértékegység a tételekhez, helytelen (Összes) Nettó súly értékhez vezet. Győződjön meg arról, hogy az egyes tételek nettó tömege ugyanabban a mértékegységben van."
 DocType: Certification Application,Payment Details,Fizetés részletei
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py,BOM Rate,Anyagjegyzék Díjszabási ár
@@ -5418,6 +5419,8 @@
 apps/erpnext/erpnext/accounts/doctype/monthly_distribution/monthly_distribution.py,Percentage Allocation should be equal to 100%,Százalékos megoszlás egyenlőnek kell lennie a 100%-al
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js,Please select Posting Date before selecting Party,"Kérjük, válasszon könyvelési dátumot az Ügyfél kiválasztása előtt"
 apps/erpnext/erpnext/config/accounting.py,Payment Terms based on conditions,Fizetési feltételek a feltételek alapján
+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: Program Enrollment,School House,Iskola épület
 DocType: Serial No,Out of AMC,ÉKSz időn túl
 DocType: Opportunity,Opportunity Amount,Lehetőség összege
@@ -5619,6 +5622,7 @@
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py,Order/Quot %,Rendelés / menny %
 apps/erpnext/erpnext/config/healthcare.py,Record Patient Vitals,Betegek életjeleinek rögzítése
 DocType: Fee Schedule,Institution,Intézmény
+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}
 DocType: Asset,Partially Depreciated,Részben leértékelődött
 DocType: Issue,Opening Time,Kezdési idő
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py,From and To dates required,Ettől és eddig időpontok megadása
@@ -5835,6 +5839,7 @@
 DocType: Quality Procedure Process,Link existing Quality Procedure.,Kapcsolja össze a meglévő minőségi eljárást.
 apps/erpnext/erpnext/config/hr.py,Loans,Kölcsönök
 DocType: Healthcare Service Unit,Healthcare Service Unit,Egészségügyi Szolgálat
+,Customer-wise Item Price,Ügyfélszemélyes ár
 apps/erpnext/erpnext/public/js/financial_statements.js,Cash Flow Statement,Pénzforgalmi kimutatás
 apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.py,No material request created,Nincs létrehozva anyag igény kérés
 apps/erpnext/erpnext/hr/doctype/loan_application/loan_application.py,Loan Amount cannot exceed Maximum Loan Amount of {0},Hitel összege nem haladhatja meg a maximális kölcsön összegét {0}
@@ -6096,6 +6101,7 @@
 apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py,Opening Value,Nyitó érték
 DocType: Salary Component,Formula,Képlet
 apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py,Serial #,Szériasz #
+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: Material Request Plan Item,Required Quantity,Szükséges mennyiség
 DocType: Lab Test Template,Lab Test Template,Labor teszt sablon
 apps/erpnext/erpnext/accounts/doctype/accounting_period/accounting_period.py,Accounting Period overlaps with {0},A számviteli időszak átfedésben van a (z) {0} -gal
@@ -6344,7 +6350,6 @@
 DocType: Request for Quotation Item,Project Name,Projekt téma neve
 apps/erpnext/erpnext/regional/italy/utils.py,Please set the Customer Address,"Kérjük, állítsa be az ügyfél címét"
 DocType: Customer,Mention if non-standard receivable account,"Megemlít, ha nem szabványos bevételi számla"
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Customer &gt; Customer Group &gt; Territory,Vevő&gt; Vevőcsoport&gt; Terület
 DocType: Bank,Plaid Access Token,Plaid Access Token
 apps/erpnext/erpnext/hr/doctype/employee_benefit_application/employee_benefit_application.py,Please add the remaining benefits {0} to any of the existing component,Adja hozzá a fennmaradó előnyöket {0} a már létező elemekhez
 DocType: Journal Entry Account,If Income or Expense,Ha bevétel vagy kiadás
@@ -6607,8 +6612,6 @@
 apps/erpnext/erpnext/buying/utils.py,Please enter quantity for Item {0},"Kérjük, adjon meg mennyiséget erre a tételre: {0}"
 DocType: Quality Procedure,Processes,Eljárások
 DocType: Shift Type,First Check-in and Last Check-out,Első bejelentkezés és utolsó kijelentkezés
-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/regional/report/hsn_wise_summary_of_outward_supplies/hsn_wise_summary_of_outward_supplies.py,Total Taxable Amount,Összes adóköteles összeg
 DocType: Employee External Work History,Employee External Work History,Alkalmazott korábbi munkahelyei
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.py,Job card {0} created,A munkakártya {0} létrehozva
@@ -6644,6 +6647,7 @@
 apps/erpnext/erpnext/accounts/doctype/payment_terms_template/payment_terms_template.py,Combined invoice portion must equal 100%,A kombinált számlázási résznek 100% kell lenniük
 DocType: Item Default,Default Expense Account,Alapértelmezett Kiadás számla
 DocType: GST Account,CGST Account,CGST számla
+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/education/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py,Student Email ID,Tanuló e-mail azonosítója
 DocType: Employee,Notice (days),Felmondás (napokban)
 DocType: POS Closing Voucher Invoices,POS Closing Voucher Invoices,POS záró utalvány számlák
@@ -7282,6 +7286,7 @@
 DocType: Maintenance Visit,Maintenance Date,Karbantartás dátuma
 DocType: Purchase Invoice Item,Rejected Serial No,Elutasított sorozatszám
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py,Year start date or end date is overlapping with {0}. To avoid please set company,"Év kezdő vagy befejezési időpont átfedésben van evvel: {0}. Ennak elkerülése érdekében, kérjük, állítsa be a céget"
+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/selling/doctype/customer/customer.py,Please mention the Lead Name in Lead {0},"Kérjük, nevezze meg a Lehetőség nevét ebben a lehetőségben {0}"
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py,Start date should be less than end date for Item {0},"Kezdési időpontnak kisebbnek kell lennie, mint végső dátumnak erre a tétel {0}"
 DocType: Shift Type,Auto Attendance Settings,Automatikus jelenlét beállítások
diff --git a/erpnext/translations/id.csv b/erpnext/translations/id.csv
index 9e23ca6..6c72b51 100644
--- a/erpnext/translations/id.csv
+++ b/erpnext/translations/id.csv
@@ -168,7 +168,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py,Accountant,Akuntan
 apps/erpnext/erpnext/stock/report/item_price_stock/item_price_stock.py,Selling Price List,Daftar Harga Jual
 DocType: Patient,Tobacco Current Use,Penggunaan Saat Ini Tembakau
-apps/erpnext/erpnext/stock/report/item_price_stock/item_price_stock.py,Selling Rate,Tingkat penjualan
+apps/erpnext/erpnext/selling/report/customer_wise_item_price/customer_wise_item_price.py,Selling Rate,Tingkat penjualan
 apps/erpnext/erpnext/erpnext_integrations/doctype/plaid_settings/plaid_settings.js,Please save your document before adding a new account,Harap simpan dokumen Anda sebelum menambahkan akun baru
 DocType: Cost Center,Stock User,Pengguna Persediaan
 DocType: Soil Analysis,(Ca+Mg)/K,(Ca+Mg)/K
@@ -205,7 +205,6 @@
 DocType: Packed Item,Parent Detail docname,Induk Detil docname
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py,"Reference: {0}, Item Code: {1} and Customer: {2}","Referensi: {0}, Kode Item: {1} dan Pelanggan: {2}"
 apps/erpnext/erpnext/accounts/report/consolidated_financial_statement/consolidated_financial_statement.py,{0} {1} is not present in the parent company,{0} {1} tidak ada di perusahaan induk
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Supplier &gt; Supplier Type,Pemasok&gt; Jenis Pemasok
 apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py,Trial Period End Date Cannot be before Trial Period Start Date,Tanggal Akhir Periode Uji Coba Tidak boleh sebelum Tanggal Mulai Periode Uji Coba
 apps/erpnext/erpnext/utilities/user_progress.py,Kg,Kg
 DocType: Tax Withholding Category,Tax Withholding Category,Kategori Pemotongan Pajak
@@ -319,6 +318,7 @@
 DocType: Quality Procedure Table,Responsible Individual,Individu yang bertanggung jawab
 DocType: Naming Series,Prefix,Awalan
 apps/erpnext/erpnext/hr/notification/training_scheduled/training_scheduled.html,Event Location,Lokasi acara
+apps/erpnext/erpnext/selling/report/customer_wise_item_price/customer_wise_item_price.py,Available Stock,Stok tersedia
 DocType: Asset Settings,Asset Settings,Pengaturan Aset
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py,Consumable,Consumable
 DocType: Student,B-,B-
@@ -351,6 +351,7 @@
 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 \
 				Serial No.",Tidak dapat memastikan pengiriman oleh Serial No sebagai \ Item {0} ditambahkan dengan dan tanpa Pastikan Pengiriman oleh \ Serial No.
+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/accounts/doctype/sales_invoice/sales_invoice.py,At least one mode of payment is required for POS invoice.,Setidaknya satu cara pembayaran diperlukan untuk POS faktur.
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py,Batch no is required for batched item {0},Nomor batch diperlukan untuk item batch {0}
 DocType: Bank Statement Transaction Invoice Item,Bank Statement Transaction Invoice Item,Item Faktur Transaksi Pernyataan Bank
@@ -874,7 +875,6 @@
 DocType: Vital Signs,Blood Pressure (systolic),Tekanan Darah (sistolik)
 apps/erpnext/erpnext/controllers/buying_controller.py,{0} {1} is {2},{0} {1} adalah {2}
 DocType: Item Price,Valid Upto,Valid Upto
-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: Training Event,Workshop,Bengkel
 DocType: Supplier Scorecard Scoring Standing,Warn Purchase Orders,Peringatkan untuk Pesanan Pembelian
 apps/erpnext/erpnext/utilities/user_progress.py,List a few of your customers. They could be organizations or individuals.,Daftar beberapa pelanggan anda. Bisa organisasi atau individu.
@@ -1658,7 +1658,6 @@
 DocType: Item Barcode,Item Barcode,Item Barcode
 DocType: Delivery Trip,In Transit,Sedang transit
 DocType: Woocommerce Settings,Endpoints,Titik akhir
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Item Code &gt; Item Group &gt; Brand,Kode Barang&gt; Grup Barang&gt; Merek
 DocType: Shopping Cart Settings,Show Configure Button,Tampilkan Tombol Konfigurasi
 DocType: Quality Inspection Reading,Reading 6,Membaca 6
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js,Cannot {0} {1} {2} without any negative outstanding invoice,Tidak bisa {0} {1} {2} tanpa faktur yang beredar negatif
@@ -2018,6 +2017,7 @@
 DocType: Cheque Print Template,Payer Settings,Pengaturan Wajib
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js,No pending Material Requests found to link for the given items.,Tidak ada Permintaan Material yang tertunda ditemukan untuk menautkan untuk item yang diberikan.
 apps/erpnext/erpnext/public/js/utils/party.js,Select company first,Pilih perusahaan terlebih dahulu
+apps/erpnext/erpnext/accounts/general_ledger.py,Account: <b>{0}</b> is capital Work in progress and can not be updated by Journal Entry,Akun: <b>{0}</b> adalah modal sedang dalam proses dan tidak dapat diperbarui oleh Entri Jurnal
 apps/erpnext/erpnext/education/doctype/quiz/quiz.py,Compare List function takes on list arguments,Fungsi Bandingkan Daftar mengambil argumen daftar
 DocType: Item Attribute Value,"This will be appended to the Item Code of the variant. For example, if your abbreviation is ""SM"", and the item code is ""T-SHIRT"", the item code of the variant will be ""T-SHIRT-SM""","Ini akan ditambahkan ke Item Code dari varian. Sebagai contoh, jika Anda adalah singkatan ""SM"", dan kode Stok Barang adalah ""T-SHIRT"", kode item varian akan ""T-SHIRT-SM"""
 DocType: Salary Slip,Net Pay (in words) will be visible once you save the Salary Slip.,Pay Bersih (dalam kata-kata) akan terlihat setelah Anda menyimpan Slip Gaji.
@@ -2202,6 +2202,7 @@
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js,Item 2,Item 2
 DocType: Pricing Rule,Validate Applied Rule,Validasikan Aturan yang Diterapkan
 DocType: QuickBooks Migrator,Authorization Endpoint,Endpoint Otorisasi
+DocType: Employee Onboarding,Notify users by email,Beri tahu pengguna melalui email
 DocType: Travel Request,International,Internasional
 DocType: Training Event,Training Event,pelatihan Kegiatan
 DocType: Item,Auto re-order,Auto re-order
@@ -2813,7 +2814,6 @@
 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
-DocType: Contract,Inactive,Tidak aktif
 apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.js,This will submit Salary Slips and create accrual Journal Entry. Do you want to proceed?,Ini akan mengirimkan Slip Gaji dan membuat Entri Jurnal akrual. Apakah kamu ingin melanjutkan?
 DocType: Purchase Invoice,Total Net Weight,Total Berat Bersih
 DocType: Purchase Order,Order Confirmation No,Konfirmasi Pesanan No
@@ -3090,7 +3090,6 @@
 apps/erpnext/erpnext/accounts/party.py,Billing currency must be equal to either default company's currency or party account currency,Mata uang penagihan harus sama dengan mata uang perusahaan atau mata uang akun tertagih
 DocType: Packing Slip,Indicates that the package is a part of this delivery (Only Draft),Menunjukkan bahwa paket tersebut merupakan bagian dari pengiriman ini (Hanya Draft)
 apps/erpnext/erpnext/accounts/report/customer_ledger_summary/customer_ledger_summary.py,Closing Balance,Saldo akhir
-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}
 DocType: Soil Texture,Loam,Lempung
 apps/erpnext/erpnext/controllers/accounts_controller.py,Row {0}: Due Date cannot be before posting date,Baris {0}: Tanggal Jatuh Tempo tidak boleh sebelum tanggal posting
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py,Quantity for Item {0} must be less than {1},Kuantitas untuk Item {0} harus kurang dari {1}
@@ -3614,7 +3613,6 @@
 DocType: Stock Settings,Raise Material Request when stock reaches re-order level,Munculkan Permintaan Material ketika persediaan mencapai tingkat pesan ulang
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py,Full-time,Full-time
 DocType: Payroll Entry,Employees,Para karyawan
-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: Question,Single Correct Answer,Jawaban Benar Tunggal
 DocType: Employee,Contact Details,Kontak Detail
 DocType: C-Form,Received Date,Diterima Tanggal
@@ -4245,6 +4243,7 @@
 DocType: Pricing Rule,Price or Product Discount,Harga atau Diskon Produk
 apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.py,For row {0}: Enter planned qty,Untuk baris {0}: Masuki rencana qty
 DocType: Account,Income Account,Akun Penghasilan
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Customer &gt; Customer Group &gt; Territory,Pelanggan&gt; Grup Pelanggan&gt; Wilayah
 DocType: Payment Request,Amount in customer's currency,Jumlah dalam mata uang pelanggan
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js,Delivery,Pengiriman
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.py,Assigning Structures...,Menetapkan Struktur...
@@ -4294,7 +4293,6 @@
 DocType: HR Settings,Check Vacancies On Job Offer Creation,Lihat Lowongan Penciptaan Tawaran Kerja
 apps/erpnext/erpnext/utilities/user_progress.py,Go to Letterheads,Pergi ke kop surat
 DocType: Subscription,Cancel At End Of Period,Batalkan Pada Akhir Periode
-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/hr/doctype/employee_promotion/employee_promotion.js,Property already added,Properti sudah ditambahkan
 DocType: Item Supplier,Item Supplier,Item Supplier
 apps/erpnext/erpnext/public/js/controllers/transaction.js,Please enter Item Code to get batch no,Entrikan Item Code untuk mendapatkan bets tidak
@@ -4579,6 +4577,7 @@
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.js,Warning: Material Requested Qty is less than Minimum Order Qty,Peringatan: Material Diminta Qty kurang dari Minimum Order Qty
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py,Account {0} is frozen,Akun {0} dibekukan
 DocType: Quiz Question,Quiz Question,Pertanyaan Kuis
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Supplier &gt; Supplier Type,Pemasok&gt; Jenis Pemasok
 DocType: Company,Legal Entity / Subsidiary with a separate Chart of Accounts belonging to the Organization.,Badan Hukum / Anak dengan Bagan Akun terpisah milik Organisasi.
 DocType: Payment Request,Mute Email,Diamkan Surel
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py,"Food, Beverage & Tobacco","Makanan, Minuman dan Tembakau"
@@ -5089,7 +5088,6 @@
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py,Delivery warehouse required for stock item {0},Gudang pengiriman diperlukan untuk persediaan barang {0}
 DocType: Packing Slip,The gross weight of the package. Usually net weight + packaging material weight. (for print),Berat kotor paket. Berat + kemasan biasanya net berat bahan. (Untuk mencetak)
 DocType: Assessment Plan,Program,Program
-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: Accounts Settings,Users with this role are allowed to set frozen accounts and create / modify accounting entries against frozen accounts,Pengguna dengan peran ini diperbolehkan untuk mengatur account beku dan membuat / memodifikasi entri akuntansi terhadap rekening beku
 ,Project Billing Summary,Ringkasan Penagihan Proyek
 DocType: Vital Signs,Cuts,Potongan
@@ -5338,6 +5336,7 @@
 apps/erpnext/erpnext/quality_management/doctype/quality_review/quality_review_list.js,No Action,Tidak ada tindakan
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js,Valuation type charges can not marked as Inclusive,Jenis penilaian biaya tidak dapat ditandai sebagai Inklusif
 DocType: POS Profile,Update Stock,Perbarui Persediaan
+apps/erpnext/erpnext/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/stock/doctype/packing_slip/packing_slip.js,Different UOM for items will lead to incorrect (Total) Net Weight value. Make sure that Net Weight of each item is in the same UOM.,UOM berbeda akan menyebabkan kesalahan Berat Bersih (Total). Pastikan Berat Bersih untuk setiap barang memakai UOM yang sama.
 DocType: Certification Application,Payment Details,Rincian Pembayaran
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py,BOM Rate,Tingkat BOM
@@ -5441,6 +5440,8 @@
 apps/erpnext/erpnext/accounts/doctype/monthly_distribution/monthly_distribution.py,Percentage Allocation should be equal to 100%,Persentase Alokasi harus sama dengan 100%
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js,Please select Posting Date before selecting Party,Silakan pilih Posting Tanggal sebelum memilih Partai
 apps/erpnext/erpnext/config/accounting.py,Payment Terms based on conditions,Ketentuan Pembayaran berdasarkan kondisi
+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: Program Enrollment,School House,Asrama Sekolah
 DocType: Serial No,Out of AMC,Dari AMC
 DocType: Opportunity,Opportunity Amount,Jumlah Peluang
@@ -5642,6 +5643,7 @@
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py,Order/Quot %,Order / Kuot%
 apps/erpnext/erpnext/config/healthcare.py,Record Patient Vitals,Catat Pasien Vitals
 DocType: Fee Schedule,Institution,Lembaga
+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}
 DocType: Asset,Partially Depreciated,sebagian disusutkan
 DocType: Issue,Opening Time,Membuka Waktu
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py,From and To dates required,Dari dan Untuk tanggal yang Anda inginkan
@@ -5858,6 +5860,7 @@
 DocType: Quality Procedure Process,Link existing Quality Procedure.,Tautkan Prosedur Mutu yang ada.
 apps/erpnext/erpnext/config/hr.py,Loans,Pinjaman
 DocType: Healthcare Service Unit,Healthcare Service Unit,Unit Layanan Kesehatan
+,Customer-wise Item Price,Harga Barang menurut pelanggan
 apps/erpnext/erpnext/public/js/financial_statements.js,Cash Flow Statement,Laporan arus kas
 apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.py,No material request created,Tidak ada permintaan material yang dibuat
 apps/erpnext/erpnext/hr/doctype/loan_application/loan_application.py,Loan Amount cannot exceed Maximum Loan Amount of {0},Jumlah Pinjaman tidak dapat melebihi Jumlah pinjaman maksimum {0}
@@ -6119,6 +6122,7 @@
 apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py,Opening Value,Nilai pembukaan
 DocType: Salary Component,Formula,Rumus
 apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py,Serial #,Serial #
+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: Material Request Plan Item,Required Quantity,Kuantitas yang Diperlukan
 DocType: Lab Test Template,Lab Test Template,Lab Test Template
 apps/erpnext/erpnext/accounts/doctype/accounting_period/accounting_period.py,Accounting Period overlaps with {0},Periode Akuntansi tumpang tindih dengan {0}
@@ -6368,7 +6372,6 @@
 DocType: Request for Quotation Item,Project Name,Nama Proyek
 apps/erpnext/erpnext/regional/italy/utils.py,Please set the Customer Address,Silakan atur Alamat Pelanggan
 DocType: Customer,Mention if non-standard receivable account,Menyebutkan jika non-standar piutang
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Customer &gt; Customer Group &gt; Territory,Pelanggan&gt; Grup Pelanggan&gt; Wilayah
 DocType: Bank,Plaid Access Token,Token Akses Kotak-kotak
 apps/erpnext/erpnext/hr/doctype/employee_benefit_application/employee_benefit_application.py,Please add the remaining benefits {0} to any of the existing component,Harap tambahkan manfaat yang tersisa {0} ke salah satu komponen yang ada
 DocType: Journal Entry Account,If Income or Expense,Jika Penghasilan atau Beban
@@ -6631,8 +6634,6 @@
 apps/erpnext/erpnext/buying/utils.py,Please enter quantity for Item {0},Mohon masukkan untuk Item {0}
 DocType: Quality Procedure,Processes,Proses
 DocType: Shift Type,First Check-in and Last Check-out,Check-in Pertama dan Check-out Terakhir
-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/regional/report/hsn_wise_summary_of_outward_supplies/hsn_wise_summary_of_outward_supplies.py,Total Taxable Amount,Jumlah Jumlah Kena Pajak
 DocType: Employee External Work History,Employee External Work History,Karyawan Eksternal Riwayat Pekerjaan
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.py,Job card {0} created,Kartu kerja {0} dibuat
@@ -6668,6 +6669,7 @@
 apps/erpnext/erpnext/accounts/doctype/payment_terms_template/payment_terms_template.py,Combined invoice portion must equal 100%,Bagian invoice gabungan harus sama dengan 100%
 DocType: Item Default,Default Expense Account,Beban standar Akun
 DocType: GST Account,CGST Account,Akun CGST
+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/education/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py,Student Email ID,ID Email Siswa
 DocType: Employee,Notice (days),Notice (hari)
 DocType: POS Closing Voucher Invoices,POS Closing Voucher Invoices,Faktur Voucher Penutupan POS
@@ -7306,6 +7308,7 @@
 DocType: Maintenance Visit,Maintenance Date,Tanggal Pemeliharaan
 DocType: Purchase Invoice Item,Rejected Serial No,Serial No Barang Ditolak
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py,Year start date or end date is overlapping with {0}. To avoid please set company,Tahun tanggal mulai atau tanggal akhir ini tumpang tindih dengan {0}. Untuk menghindari silakan atur perusahaan
+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/selling/doctype/customer/customer.py,Please mention the Lead Name in Lead {0},Harap sebutkan Nama Prospek di Prospek {0}
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py,Start date should be less than end date for Item {0},Tanggal mulai harus kurang dari tanggal akhir untuk Item {0}
 DocType: Shift Type,Auto Attendance Settings,Pengaturan Kehadiran Otomatis
diff --git a/erpnext/translations/is.csv b/erpnext/translations/is.csv
index e336098..351a857 100644
--- a/erpnext/translations/is.csv
+++ b/erpnext/translations/is.csv
@@ -168,7 +168,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py,Accountant,endurskoðandi
 apps/erpnext/erpnext/stock/report/item_price_stock/item_price_stock.py,Selling Price List,Selja verðskrá
 DocType: Patient,Tobacco Current Use,Núverandi notkun tóbaks
-apps/erpnext/erpnext/stock/report/item_price_stock/item_price_stock.py,Selling Rate,Sala hlutfall
+apps/erpnext/erpnext/selling/report/customer_wise_item_price/customer_wise_item_price.py,Selling Rate,Sala hlutfall
 apps/erpnext/erpnext/erpnext_integrations/doctype/plaid_settings/plaid_settings.js,Please save your document before adding a new account,Vinsamlegast vistaðu skjalið áður en þú bætir við nýjum reikningi
 DocType: Cost Center,Stock User,Stock User
 DocType: Soil Analysis,(Ca+Mg)/K,(Ca + Mg) / K
@@ -205,7 +205,6 @@
 DocType: Packed Item,Parent Detail docname,Parent Detail DOCNAME
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py,"Reference: {0}, Item Code: {1} and Customer: {2}","Tilvísun: {0}, Liður: {1} og Viðskiptavinur: {2}"
 apps/erpnext/erpnext/accounts/report/consolidated_financial_statement/consolidated_financial_statement.py,{0} {1} is not present in the parent company,{0} {1} er ekki til staðar í móðurfélaginu
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Supplier &gt; Supplier Type,Birgir&gt; Gerð birgis
 apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py,Trial Period End Date Cannot be before Trial Period Start Date,Prófunartímabil Lokadagur getur ekki verið fyrir upphafsdag Prófunartímabils
 apps/erpnext/erpnext/utilities/user_progress.py,Kg,kg
 DocType: Tax Withholding Category,Tax Withholding Category,Skatthlutfall Flokkur
@@ -319,6 +318,7 @@
 DocType: Quality Procedure Table,Responsible Individual,Ábyrgur einstaklingur
 DocType: Naming Series,Prefix,forskeyti
 apps/erpnext/erpnext/hr/notification/training_scheduled/training_scheduled.html,Event Location,Staðsetning viðburðar
+apps/erpnext/erpnext/selling/report/customer_wise_item_price/customer_wise_item_price.py,Available Stock,Laus lager
 DocType: Asset Settings,Asset Settings,Eignastillingar
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py,Consumable,einnota
 DocType: Student,B-,B-
@@ -351,6 +351,7 @@
 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 \
 				Serial No.",Ekki er hægt að tryggja afhendingu með raðnúmeri þar sem \ Item {0} er bætt með og án þess að tryggja afhendingu með \ raðnúmeri
+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/accounts/doctype/sales_invoice/sales_invoice.py,At least one mode of payment is required for POS invoice.,Að minnsta kosti einn háttur af greiðslu er krafist fyrir POS reikningi.
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py,Batch no is required for batched item {0},Lotu nr er krafist fyrir hluti sem er hluti {0}
 DocType: Bank Statement Transaction Invoice Item,Bank Statement Transaction Invoice Item,Bank Yfirlit Viðskiptareikning Atriði
@@ -874,7 +875,6 @@
 DocType: Vital Signs,Blood Pressure (systolic),Blóðþrýstingur (slagbilsþrýstingur)
 apps/erpnext/erpnext/controllers/buying_controller.py,{0} {1} is {2},{0} {1} er {2}
 DocType: Item Price,Valid Upto,gildir uppí
-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: Training Event,Workshop,Workshop
 DocType: Supplier Scorecard Scoring Standing,Warn Purchase Orders,Varið innkaupapantanir
 apps/erpnext/erpnext/utilities/user_progress.py,List a few of your customers. They could be organizations or individuals.,Listi nokkrar af viðskiptavinum þínum. Þeir gætu verið stofnanir eða einstaklingar.
@@ -1658,7 +1658,6 @@
 DocType: Item Barcode,Item Barcode,Liður Strikamerki
 DocType: Delivery Trip,In Transit,Í flutningi
 DocType: Woocommerce Settings,Endpoints,Endapunktar
-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
 DocType: Shopping Cart Settings,Show Configure Button,Sýna stillingarhnapp
 DocType: Quality Inspection Reading,Reading 6,lestur 6
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js,Cannot {0} {1} {2} without any negative outstanding invoice,Get ekki {0} {1} {2} án neikvætt framúrskarandi Reikningar
@@ -2018,6 +2017,7 @@
 DocType: Cheque Print Template,Payer Settings,greiðandi Stillingar
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js,No pending Material Requests found to link for the given items.,Engar biðröð Efnisbeiðnir fannst að tengjast fyrir tiltekna hluti.
 apps/erpnext/erpnext/public/js/utils/party.js,Select company first,Veldu fyrirtæki fyrst
+apps/erpnext/erpnext/accounts/general_ledger.py,Account: <b>{0}</b> is capital Work in progress and can not be updated by Journal Entry,Reikningur: <b>{0}</b> er höfuðborg Vinna í vinnslu og ekki er hægt að uppfæra hana með færslu dagbókar
 apps/erpnext/erpnext/education/doctype/quiz/quiz.py,Compare List function takes on list arguments,Aðgerð bera saman lista tekur á rökrökum
 DocType: Item Attribute Value,"This will be appended to the Item Code of the variant. For example, if your abbreviation is ""SM"", and the item code is ""T-SHIRT"", the item code of the variant will be ""T-SHIRT-SM""","Þetta verður bætt við Item Code afbrigði. Til dæmis, ef skammstöfun er &quot;SM&quot;, og hluturinn kóða er &quot;T-bolur&quot;, hluturinn kóðann um afbrigði verður &quot;T-bolur-SM&quot;"
 DocType: Salary Slip,Net Pay (in words) will be visible once you save the Salary Slip.,Net Borga (í orðum) verður sýnileg þegar þú hefur vistað Laun Slip.
@@ -2202,6 +2202,7 @@
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js,Item 2,Liður 2
 DocType: Pricing Rule,Validate Applied Rule,Staðfesta beitt reglu
 DocType: QuickBooks Migrator,Authorization Endpoint,Endapunktur leyfis
+DocType: Employee Onboarding,Notify users by email,Láttu notendur vita með tölvupósti
 DocType: Travel Request,International,International
 DocType: Training Event,Training Event,Þjálfun Event
 DocType: Item,Auto re-order,Auto endurraða
@@ -2812,7 +2813,6 @@
 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
-DocType: Contract,Inactive,Óvirkt
 apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.js,This will submit Salary Slips and create accrual Journal Entry. Do you want to proceed?,Þetta mun leggja inn launakostnað og búa til dagbókarfærslu. Viltu halda áfram?
 DocType: Purchase Invoice,Total Net Weight,Samtals nettóþyngd
 DocType: Purchase Order,Order Confirmation No,Panta staðfestingar nr
@@ -3089,7 +3089,6 @@
 apps/erpnext/erpnext/accounts/party.py,Billing currency must be equal to either default company's currency or party account currency,Innheimtargjald verður að vera jafnt gjaldmiðli gjaldmiðils eða félagsreiknings gjaldmiðils
 DocType: Packing Slip,Indicates that the package is a part of this delivery (Only Draft),Gefur til kynna að pakki er hluti af þessari fæðingu (Only Draft)
 apps/erpnext/erpnext/accounts/report/customer_ledger_summary/customer_ledger_summary.py,Closing Balance,Lokajafnvægi
-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}
 DocType: Soil Texture,Loam,Loam
 apps/erpnext/erpnext/controllers/accounts_controller.py,Row {0}: Due Date cannot be before posting date,Row {0}: Gjalddagi má ekki vera fyrir útgáfudegi
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py,Quantity for Item {0} must be less than {1},Magn í lið {0} verður að vera minna en {1}
@@ -3612,7 +3611,6 @@
 DocType: Stock Settings,Raise Material Request when stock reaches re-order level,Hækka Material Beiðni þegar birgðir nær aftur röð stigi
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py,Full-time,Fullt
 DocType: Payroll Entry,Employees,starfsmenn
-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: Question,Single Correct Answer,Eitt rétt svar
 DocType: Employee,Contact Details,Tengiliðaupplýsingar
 DocType: C-Form,Received Date,fékk Date
@@ -4223,6 +4221,7 @@
 DocType: Pricing Rule,Price or Product Discount,Verð eða vöruafsláttur
 apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.py,For row {0}: Enter planned qty,Fyrir röð {0}: Sláðu inn skipulagt magn
 DocType: Account,Income Account,tekjur Reikningur
+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: Payment Request,Amount in customer's currency,Upphæð í mynt viðskiptavinarins
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js,Delivery,Afhending
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.py,Assigning Structures...,Úthlutar mannvirkjum ...
@@ -4272,7 +4271,6 @@
 DocType: HR Settings,Check Vacancies On Job Offer Creation,Athugaðu laus störf við sköpun atvinnutilboða
 apps/erpnext/erpnext/utilities/user_progress.py,Go to Letterheads,Farðu í Letterheads
 DocType: Subscription,Cancel At End Of Period,Hætta við lok tímabils
-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; Menntun
 apps/erpnext/erpnext/hr/doctype/employee_promotion/employee_promotion.js,Property already added,Eign er þegar bætt við
 DocType: Item Supplier,Item Supplier,Liður Birgir
 apps/erpnext/erpnext/public/js/controllers/transaction.js,Please enter Item Code to get batch no,Vinsamlegast sláðu Item Code til að fá lotu nr
@@ -4557,6 +4555,7 @@
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.js,Warning: Material Requested Qty is less than Minimum Order Qty,Viðvörun: Efni Umbeðin Magn er minna en Minimum Order Magn
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py,Account {0} is frozen,Reikningur {0} er frosinn
 DocType: Quiz Question,Quiz Question,Spurningakeppni
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Supplier &gt; Supplier Type,Birgir&gt; Gerð birgis
 DocType: Company,Legal Entity / Subsidiary with a separate Chart of Accounts belonging to the Organization.,Lögaðili / Dótturfélag með sérstakri Mynd af reikninga tilheyra stofnuninni.
 DocType: Payment Request,Mute Email,Mute Email
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py,"Food, Beverage & Tobacco","Matur, drykkir og Tobacco"
@@ -5067,7 +5066,6 @@
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py,Delivery warehouse required for stock item {0},Afhending vöruhús krafist fyrir hlutabréfum lið {0}
 DocType: Packing Slip,The gross weight of the package. Usually net weight + packaging material weight. (for print),Framlegð þyngd pakkans. Venjulega nettóþyngd + umbúðir þyngd. (Til prentunar)
 DocType: Assessment Plan,Program,program
-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: Accounts Settings,Users with this role are allowed to set frozen accounts and create / modify accounting entries against frozen accounts,Notendur með þetta hlutverk er leyft að setja á frysta reikninga og búa til / breyta bókhaldsfærslum gegn frysta reikninga
 ,Project Billing Summary,Yfirlit verkefnisgreiningar
 DocType: Vital Signs,Cuts,Skurður
@@ -5316,6 +5314,7 @@
 apps/erpnext/erpnext/quality_management/doctype/quality_review/quality_review_list.js,No Action,Engin aðgerð
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js,Valuation type charges can not marked as Inclusive,Verðmat gerð gjöld geta ekki merkt sem Inclusive
 DocType: POS Profile,Update Stock,Uppfæra Stock
+apps/erpnext/erpnext/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/stock/doctype/packing_slip/packing_slip.js,Different UOM for items will lead to incorrect (Total) Net Weight value. Make sure that Net Weight of each item is in the same UOM.,Mismunandi UOM að atriðum mun leiða til rangrar (alls) nettóþyngd gildi. Gakktu úr skugga um að nettóþyngd hvern hlut er í sama UOM.
 DocType: Certification Application,Payment Details,Greiðsluupplýsingar
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py,BOM Rate,BOM Rate
@@ -5419,6 +5418,8 @@
 apps/erpnext/erpnext/accounts/doctype/monthly_distribution/monthly_distribution.py,Percentage Allocation should be equal to 100%,Hlutfall Úthlutun skal vera jafnt og 100%
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js,Please select Posting Date before selecting Party,Vinsamlegast veldu dagsetningu birtingar áður en þú velur Party
 apps/erpnext/erpnext/config/accounting.py,Payment Terms based on conditions,Greiðsluskilmálar byggjast á skilyrðum
+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 eyða starfsmanninum <a href=""#Form/Employee/{0}"">{0}</a> \ til að hætta við þetta skjal"
 DocType: Program Enrollment,School House,School House
 DocType: Serial No,Out of AMC,Út af AMC
 DocType: Opportunity,Opportunity Amount,Tækifærsla
@@ -5620,6 +5621,7 @@
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py,Order/Quot %,Order / Quot%
 apps/erpnext/erpnext/config/healthcare.py,Record Patient Vitals,Skráðu sjúklinga vitaleika
 DocType: Fee Schedule,Institution,stofnun
+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}
 DocType: Asset,Partially Depreciated,hluta afskrifaðar
 DocType: Issue,Opening Time,opnun Time
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py,From and To dates required,Frá og Til dagsetningar krafist
@@ -5836,6 +5838,7 @@
 DocType: Quality Procedure Process,Link existing Quality Procedure.,Tengdu núverandi gæðaferli.
 apps/erpnext/erpnext/config/hr.py,Loans,Lán
 DocType: Healthcare Service Unit,Healthcare Service Unit,Heilbrigðisþjónustudeild
+,Customer-wise Item Price,Viðskiptavænt vöruhlutur
 apps/erpnext/erpnext/public/js/financial_statements.js,Cash Flow Statement,Sjóðstreymi
 apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.py,No material request created,Engin efnisbeiðni búin til
 apps/erpnext/erpnext/hr/doctype/loan_application/loan_application.py,Loan Amount cannot exceed Maximum Loan Amount of {0},Lánið upphæð mega vera Hámarkslán af {0}
@@ -6097,6 +6100,7 @@
 apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py,Opening Value,opnun Value
 DocType: Salary Component,Formula,Formula
 apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py,Serial #,Serial #
+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: Material Request Plan Item,Required Quantity,Nauðsynlegt magn
 DocType: Lab Test Template,Lab Test Template,Lab Test Sniðmát
 apps/erpnext/erpnext/accounts/doctype/accounting_period/accounting_period.py,Accounting Period overlaps with {0},Reikningstímabil skarast við {0}
@@ -6346,7 +6350,6 @@
 DocType: Request for Quotation Item,Project Name,nafn verkefnis
 apps/erpnext/erpnext/regional/italy/utils.py,Please set the Customer Address,Vinsamlegast stilltu heimilisfang viðskiptavinarins
 DocType: Customer,Mention if non-standard receivable account,Umtal ef non-staðall nái reikning
-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: Bank,Plaid Access Token,Tákn með aðgangi að tákni
 apps/erpnext/erpnext/hr/doctype/employee_benefit_application/employee_benefit_application.py,Please add the remaining benefits {0} to any of the existing component,Vinsamlegast bættu við eftirtalin kostir {0} við einhvern af núverandi hluti
 DocType: Journal Entry Account,If Income or Expense,Ef tekjur eða gjöld
@@ -6609,8 +6612,6 @@
 apps/erpnext/erpnext/buying/utils.py,Please enter quantity for Item {0},Vinsamlegast sláðu inn magn fyrir lið {0}
 DocType: Quality Procedure,Processes,Ferli
 DocType: Shift Type,First Check-in and Last Check-out,Fyrsta innritun og síðast útritun
-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/regional/report/hsn_wise_summary_of_outward_supplies/hsn_wise_summary_of_outward_supplies.py,Total Taxable Amount,Heildarskattskyld fjárhæð
 DocType: Employee External Work History,Employee External Work History,Starfsmaður Ytri Vinna Saga
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.py,Job card {0} created,Atvinna kort {0} búið til
@@ -6646,6 +6647,7 @@
 apps/erpnext/erpnext/accounts/doctype/payment_terms_template/payment_terms_template.py,Combined invoice portion must equal 100%,Sameinað reikningshluti verður jafn 100%
 DocType: Item Default,Default Expense Account,Sjálfgefið kostnað reiknings
 DocType: GST Account,CGST Account,CGST reikningur
+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/education/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py,Student Email ID,Student Email ID
 DocType: Employee,Notice (days),Tilkynning (dagar)
 DocType: POS Closing Voucher Invoices,POS Closing Voucher Invoices,POS Loka Voucher Reikningar
@@ -7284,6 +7286,7 @@
 DocType: Maintenance Visit,Maintenance Date,viðhald Dagsetning
 DocType: Purchase Invoice Item,Rejected Serial No,Hafnað Serial Nei
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py,Year start date or end date is overlapping with {0}. To avoid please set company,Ár Upphafsdagur eða lokadagsetning er skörun við {0}. Til að forðast skaltu stilla fyrirtæki
+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/selling/doctype/customer/customer.py,Please mention the Lead Name in Lead {0},Vinsamlegast nefnt Lead Name í Lead {0}
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py,Start date should be less than end date for Item {0},Upphafsdagur ætti að vera minna en lokadagsetningu fyrir lið {0}
 DocType: Shift Type,Auto Attendance Settings,Stillingar sjálfvirkrar mætingar
diff --git a/erpnext/translations/it.csv b/erpnext/translations/it.csv
index 70c5758..36f19b2 100644
--- a/erpnext/translations/it.csv
+++ b/erpnext/translations/it.csv
@@ -168,7 +168,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py,Accountant,Ragioniere
 apps/erpnext/erpnext/stock/report/item_price_stock/item_price_stock.py,Selling Price List,Listino prezzi di vendita
 DocType: Patient,Tobacco Current Use,Uso corrente di tabacco
-apps/erpnext/erpnext/stock/report/item_price_stock/item_price_stock.py,Selling Rate,Tasso di vendita
+apps/erpnext/erpnext/selling/report/customer_wise_item_price/customer_wise_item_price.py,Selling Rate,Tasso di vendita
 apps/erpnext/erpnext/erpnext_integrations/doctype/plaid_settings/plaid_settings.js,Please save your document before adding a new account,Salva il documento prima di aggiungere un nuovo account
 DocType: Cost Center,Stock User,Utente Giacenze
 DocType: Soil Analysis,(Ca+Mg)/K,(Ca+Mg)/K
@@ -205,7 +205,6 @@
 DocType: Packed Item,Parent Detail docname,Dettaglio docname padre
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py,"Reference: {0}, Item Code: {1} and Customer: {2}","Riferimento: {0}, codice dell&#39;articolo: {1} e cliente: {2}"
 apps/erpnext/erpnext/accounts/report/consolidated_financial_statement/consolidated_financial_statement.py,{0} {1} is not present in the parent company,{0} {1} non è presente nella società madre
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Supplier &gt; Supplier Type,Fornitore&gt; Tipo di fornitore
 apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py,Trial Period End Date Cannot be before Trial Period Start Date,Data di fine del periodo di prova Non può essere precedente alla Data di inizio del periodo di prova
 apps/erpnext/erpnext/utilities/user_progress.py,Kg,Kg
 DocType: Tax Withholding Category,Tax Withholding Category,Categoria ritenuta fiscale
@@ -319,6 +318,7 @@
 DocType: Quality Procedure Table,Responsible Individual,Responsabile Individuo
 DocType: Naming Series,Prefix,Prefisso
 apps/erpnext/erpnext/hr/notification/training_scheduled/training_scheduled.html,Event Location,Posizione dell&#39;evento
+apps/erpnext/erpnext/selling/report/customer_wise_item_price/customer_wise_item_price.py,Available Stock,Stock disponibile
 DocType: Asset Settings,Asset Settings,Impostazioni delle risorse
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py,Consumable,Consumabile
 DocType: Student,B-,B-
@@ -351,6 +351,7 @@
 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 \
 				Serial No.",Impossibile garantire la consegna in base al numero di serie con l&#39;aggiunta di \ item {0} con e senza la consegna garantita da \ numero di serie.
+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/accounts/doctype/sales_invoice/sales_invoice.py,At least one mode of payment is required for POS invoice.,è richiesta almeno una modalità di pagamento per POS fattura.
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py,Batch no is required for batched item {0},Il numero di lotto non è richiesto per l&#39;articolo in batch {0}
 DocType: Bank Statement Transaction Invoice Item,Bank Statement Transaction Invoice Item,Elemento fattura transazione conto bancario
@@ -874,7 +875,6 @@
 DocType: Vital Signs,Blood Pressure (systolic),Pressione sanguigna (sistolica)
 apps/erpnext/erpnext/controllers/buying_controller.py,{0} {1} is {2},{0} {1} è {2}
 DocType: Item Price,Valid Upto,Valido Fino a
-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: Training Event,Workshop,Laboratorio
 DocType: Supplier Scorecard Scoring Standing,Warn Purchase Orders,Avvisa gli ordini di acquisto
 apps/erpnext/erpnext/utilities/user_progress.py,List a few of your customers. They could be organizations or individuals.,Elencare alcuni dei vostri clienti . Potrebbero essere organizzazioni o individui .
@@ -1677,7 +1677,6 @@
 DocType: Item Barcode,Item Barcode,Barcode articolo
 DocType: Delivery Trip,In Transit,In transito
 DocType: Woocommerce Settings,Endpoints,endpoint
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Item Code &gt; Item Group &gt; Brand,Codice articolo&gt; Gruppo articoli&gt; Marchio
 DocType: Shopping Cart Settings,Show Configure Button,Mostra pulsante Configura
 DocType: Quality Inspection Reading,Reading 6,Lettura 6
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js,Cannot {0} {1} {2} without any negative outstanding invoice,Impossibile {0} {1} {2} senza alcuna fattura in sospeso negativo
@@ -2037,6 +2036,7 @@
 DocType: Cheque Print Template,Payer Settings,Impostazioni Pagatore
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js,No pending Material Requests found to link for the given items.,Nessuna richiesta materiale in sospeso trovata per il collegamento per gli elementi specificati.
 apps/erpnext/erpnext/public/js/utils/party.js,Select company first,Seleziona prima la società
+apps/erpnext/erpnext/accounts/general_ledger.py,Account: <b>{0}</b> is capital Work in progress and can not be updated by Journal Entry,Conto: <b>{0}</b> è capitale Lavori in corso e non può essere aggiornato dalla registrazione prima nota
 apps/erpnext/erpnext/education/doctype/quiz/quiz.py,Compare List function takes on list arguments,La funzione Confronta elenco accetta argomenti dell&#39;elenco
 DocType: Item Attribute Value,"This will be appended to the Item Code of the variant. For example, if your abbreviation is ""SM"", and the item code is ""T-SHIRT"", the item code of the variant will be ""T-SHIRT-SM""","Questo sarà aggiunto al codice articolo della variante. Ad esempio, se la sigla è ""SM"", e il codice articolo è ""T-SHIRT"", il codice articolo della variante sarà ""T-SHIRT-SM"""
 DocType: Salary Slip,Net Pay (in words) will be visible once you save the Salary Slip.,Paga Netta (in lettere) sarà visibile una volta che si salva la busta paga.
@@ -2221,6 +2221,7 @@
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js,Item 2,Articolo 2
 DocType: Pricing Rule,Validate Applied Rule,Convalida regola applicata
 DocType: QuickBooks Migrator,Authorization Endpoint,Endpoint di autorizzazione
+DocType: Employee Onboarding,Notify users by email,Notifica agli utenti via e-mail
 DocType: Travel Request,International,Internazionale
 DocType: Training Event,Training Event,Evento di formazione
 DocType: Item,Auto re-order,Auto riordino
@@ -2832,7 +2833,6 @@
 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
-DocType: Contract,Inactive,Inattivo
 apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.js,This will submit Salary Slips and create accrual Journal Entry. Do you want to proceed?,Questo invierà Salary Slips e creerà la registrazione ufficiale. Vuoi procedere?
 DocType: Purchase Invoice,Total Net Weight,Peso netto totale
 DocType: Purchase Order,Order Confirmation No,Conferma d&#39;ordine no
@@ -3109,7 +3109,6 @@
 apps/erpnext/erpnext/accounts/party.py,Billing currency must be equal to either default company's currency or party account currency,La valuta di fatturazione deve essere uguale alla valuta della società predefinita o alla valuta dell&#39;account del partito
 DocType: Packing Slip,Indicates that the package is a part of this delivery (Only Draft),Indica che il pacchetto è una parte di questa consegna (solo Bozza)
 apps/erpnext/erpnext/accounts/report/customer_ledger_summary/customer_ledger_summary.py,Closing Balance,Saldo di chiusura
-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}
 DocType: Soil Texture,Loam,terra grassa
 apps/erpnext/erpnext/controllers/accounts_controller.py,Row {0}: Due Date cannot be before posting date,Riga {0}: la data di scadenza non può essere precedente alla data di pubblicazione
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py,Quantity for Item {0} must be less than {1},Quantità per la voce {0} deve essere inferiore a {1}
@@ -3633,7 +3632,6 @@
 DocType: Stock Settings,Raise Material Request when stock reaches re-order level,Crea un Richiesta Materiale quando la scorta raggiunge il livello di riordino
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py,Full-time,Tempo pieno
 DocType: Payroll Entry,Employees,I dipendenti
-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: Question,Single Correct Answer,Risposta corretta singola
 DocType: Employee,Contact Details,Dettagli Contatto
 DocType: C-Form,Received Date,Data Received
@@ -4264,6 +4262,7 @@
 DocType: Pricing Rule,Price or Product Discount,Prezzo o sconto sul prodotto
 apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.py,For row {0}: Enter planned qty,Per la riga {0}: inserisci qtà pianificata
 DocType: Account,Income Account,Conto Proventi
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Customer &gt; Customer Group &gt; Territory,Cliente&gt; Gruppo di clienti&gt; Territorio
 DocType: Payment Request,Amount in customer's currency,Importo nella valuta del cliente
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js,Delivery,Consegna
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.py,Assigning Structures...,Assegnazione strutture...
@@ -4313,7 +4312,6 @@
 DocType: HR Settings,Check Vacancies On Job Offer Creation,Controlla i posti vacanti sulla creazione di offerte di lavoro
 apps/erpnext/erpnext/utilities/user_progress.py,Go to Letterheads,Vai a carta intestata
 DocType: Subscription,Cancel At End Of Period,Annulla alla fine del periodo
-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/hr/doctype/employee_promotion/employee_promotion.js,Property already added,Proprietà già aggiunta
 DocType: Item Supplier,Item Supplier,Articolo Fornitore
 apps/erpnext/erpnext/public/js/controllers/transaction.js,Please enter Item Code to get batch no,Inserisci il codice Item per ottenere lotto non
@@ -4610,6 +4608,7 @@
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.js,Warning: Material Requested Qty is less than Minimum Order Qty,Attenzione : Materiale Qty richiesto è inferiore minima quantità
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py,Account {0} is frozen,Il Conto {0} è congelato
 DocType: Quiz Question,Quiz Question,Quiz
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Supplier &gt; Supplier Type,Fornitore&gt; Tipo di fornitore
 DocType: Company,Legal Entity / Subsidiary with a separate Chart of Accounts belonging to the Organization.,Entità Legale / Controllata con un grafico separato di conti appartenenti all'organizzazione.
 DocType: Payment Request,Mute Email,Email muta
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py,"Food, Beverage & Tobacco","Prodotti alimentari , bevande e tabacco"
@@ -5120,7 +5119,6 @@
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py,Delivery warehouse required for stock item {0},Magazzino di consegna richiesto per l'articolo {0}
 DocType: Packing Slip,The gross weight of the package. Usually net weight + packaging material weight. (for print),Il peso lordo del pacchetto. Di solito peso netto + peso materiale di imballaggio. (Per la stampa)
 DocType: Assessment Plan,Program,Programma
-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: Accounts Settings,Users with this role are allowed to set frozen accounts and create / modify accounting entries against frozen accounts,Gli utenti con questo ruolo sono autorizzati a impostare conti congelati e creare / modificare le voci contabili nei confronti di conti congelati
 ,Project Billing Summary,Riepilogo fatturazione progetto
 DocType: Vital Signs,Cuts,tagli
@@ -5369,6 +5367,7 @@
 apps/erpnext/erpnext/quality_management/doctype/quality_review/quality_review_list.js,No Action,Nessuna azione
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js,Valuation type charges can not marked as Inclusive,Spese tipo di valutazione non possono contrassegnata come Inclusive
 DocType: POS Profile,Update Stock,Aggiornare Giacenza
+apps/erpnext/erpnext/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/stock/doctype/packing_slip/packing_slip.js,Different UOM for items will lead to incorrect (Total) Net Weight value. Make sure that Net Weight of each item is in the same UOM.,"Una diversa Unità di Misura degli articoli darà come risultato un Peso Netto (Totale) non corretto.
 Assicurarsi che il peso netto di ogni articolo sia nella stessa Unità di Misura."
 DocType: Certification Application,Payment Details,Dettagli del pagamento
@@ -5473,6 +5472,8 @@
 apps/erpnext/erpnext/accounts/doctype/monthly_distribution/monthly_distribution.py,Percentage Allocation should be equal to 100%,Percentuale di ripartizione dovrebbe essere pari al 100 %
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js,Please select Posting Date before selecting Party,Si prega di selezionare la data di registrazione prima di selezionare il Partner
 apps/erpnext/erpnext/config/accounting.py,Payment Terms based on conditions,Termini di pagamento in base alle condizioni
+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: Program Enrollment,School House,school House
 DocType: Serial No,Out of AMC,Fuori di AMC
 DocType: Opportunity,Opportunity Amount,Importo opportunità
@@ -5674,6 +5675,7 @@
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py,Order/Quot %,Ordine / Quota%
 apps/erpnext/erpnext/config/healthcare.py,Record Patient Vitals,Registra i pazienti pazienti
 DocType: Fee Schedule,Institution,Istituzione
+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}
 DocType: Asset,Partially Depreciated,parzialmente ammortizzato
 DocType: Issue,Opening Time,Tempo di apertura
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py,From and To dates required,Data Inizio e Fine sono obbligatorie
@@ -5890,6 +5892,7 @@
 DocType: Quality Procedure Process,Link existing Quality Procedure.,Collegare la procedura di qualità esistente.
 apps/erpnext/erpnext/config/hr.py,Loans,prestiti
 DocType: Healthcare Service Unit,Healthcare Service Unit,Unità di assistenza sanitaria
+,Customer-wise Item Price,Prezzo dell&#39;articolo dal punto di vista del cliente
 apps/erpnext/erpnext/public/js/financial_statements.js,Cash Flow Statement,Rendiconto finanziario
 apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.py,No material request created,Nessuna richiesta materiale creata
 apps/erpnext/erpnext/hr/doctype/loan_application/loan_application.py,Loan Amount cannot exceed Maximum Loan Amount of {0},Importo del prestito non può superare il massimo importo del prestito {0}
@@ -6151,6 +6154,7 @@
 apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py,Opening Value,Valore di apertura
 DocType: Salary Component,Formula,Formula
 apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py,Serial #,Serial #
+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: Material Request Plan Item,Required Quantity,Quantità richiesta
 DocType: Lab Test Template,Lab Test Template,Modello di prova del laboratorio
 apps/erpnext/erpnext/accounts/doctype/accounting_period/accounting_period.py,Accounting Period overlaps with {0},Il periodo contabile si sovrappone a {0}
@@ -6400,7 +6404,6 @@
 DocType: Request for Quotation Item,Project Name,Nome del progetto
 apps/erpnext/erpnext/regional/italy/utils.py,Please set the Customer Address,Si prega di impostare l&#39;indirizzo del cliente
 DocType: Customer,Mention if non-standard receivable account,Menzione se conto credito non standard
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Customer &gt; Customer Group &gt; Territory,Cliente&gt; Gruppo di clienti&gt; Territorio
 DocType: Bank,Plaid Access Token,Token di accesso al plaid
 apps/erpnext/erpnext/hr/doctype/employee_benefit_application/employee_benefit_application.py,Please add the remaining benefits {0} to any of the existing component,Si prega di aggiungere i restanti benefici {0} a qualsiasi componente esistente
 DocType: Journal Entry Account,If Income or Expense,Se proventi od oneri
@@ -6663,8 +6666,6 @@
 apps/erpnext/erpnext/buying/utils.py,Please enter quantity for Item {0},Inserite la quantità per articolo {0}
 DocType: Quality Procedure,Processes,Processi
 DocType: Shift Type,First Check-in and Last Check-out,Primo check-in e ultimo check-out
-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/regional/report/hsn_wise_summary_of_outward_supplies/hsn_wise_summary_of_outward_supplies.py,Total Taxable Amount,Importo totale imponibile
 DocType: Employee External Work History,Employee External Work History,Storia lavorativa esterna del Dipendente
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.py,Job card {0} created,Job card {0} creato
@@ -6700,6 +6701,7 @@
 apps/erpnext/erpnext/accounts/doctype/payment_terms_template/payment_terms_template.py,Combined invoice portion must equal 100%,La parte della fattura combinata deve essere uguale al 100%
 DocType: Item Default,Default Expense Account,Conto spese predefinito
 DocType: GST Account,CGST Account,Conto CGST
+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/education/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py,Student Email ID,Student Email ID
 DocType: Employee,Notice (days),Avviso ( giorni )
 DocType: POS Closing Voucher Invoices,POS Closing Voucher Invoices,Fatture di chiusura del voucher POS
@@ -7338,6 +7340,7 @@
 DocType: Maintenance Visit,Maintenance Date,Data di manutenzione
 DocType: Purchase Invoice Item,Rejected Serial No,Rifiutato Serial No
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py,Year start date or end date is overlapping with {0}. To avoid please set company,La data di inizio o di fine Anno si sovrappone con {0}. Per risolvere questo problema impostare l'Azienda
+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/selling/doctype/customer/customer.py,Please mention the Lead Name in Lead {0},Si prega di citare il Lead Name in Lead {0}
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py,Start date should be less than end date for Item {0},Data di inizio dovrebbe essere inferiore a quella di fine per la voce {0}
 DocType: Shift Type,Auto Attendance Settings,Impostazioni di presenza automatica
diff --git a/erpnext/translations/ja.csv b/erpnext/translations/ja.csv
index bcb05f7..0125b13 100644
--- a/erpnext/translations/ja.csv
+++ b/erpnext/translations/ja.csv
@@ -168,7 +168,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py,Accountant,会計士
 apps/erpnext/erpnext/stock/report/item_price_stock/item_price_stock.py,Selling Price List,販売価格リスト
 DocType: Patient,Tobacco Current Use,たばこの現在の使用
-apps/erpnext/erpnext/stock/report/item_price_stock/item_price_stock.py,Selling Rate,販売価格
+apps/erpnext/erpnext/selling/report/customer_wise_item_price/customer_wise_item_price.py,Selling Rate,販売価格
 apps/erpnext/erpnext/erpnext_integrations/doctype/plaid_settings/plaid_settings.js,Please save your document before adding a new account,新しいアカウントを追加する前に文書を保存してください
 DocType: Cost Center,Stock User,在庫ユーザー
 DocType: Soil Analysis,(Ca+Mg)/K,（Ca + Mg）/ K
@@ -205,7 +205,6 @@
 DocType: Packed Item,Parent Detail docname,親詳細文書名
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py,"Reference: {0}, Item Code: {1} and Customer: {2}",参照：{0}・アイテムコード：{1}・顧客：{2}
 apps/erpnext/erpnext/accounts/report/consolidated_financial_statement/consolidated_financial_statement.py,{0} {1} is not present in the parent company,{0} {1}は親会社に存在しません
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Supplier &gt; Supplier Type,サプライヤー&gt;サプライヤーの種類
 apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py,Trial Period End Date Cannot be before Trial Period Start Date,試用期間終了日試用期間開始日前にすることはできません。
 apps/erpnext/erpnext/utilities/user_progress.py,Kg,kg
 DocType: Tax Withholding Category,Tax Withholding Category,税の源泉徴収カテゴリ
@@ -319,6 +318,7 @@
 DocType: Quality Procedure Table,Responsible Individual,担当者
 DocType: Naming Series,Prefix,接頭辞
 apps/erpnext/erpnext/hr/notification/training_scheduled/training_scheduled.html,Event Location,イベントの場所
+apps/erpnext/erpnext/selling/report/customer_wise_item_price/customer_wise_item_price.py,Available Stock,利用可能在庫
 DocType: Asset Settings,Asset Settings,資産の設定
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py,Consumable,消耗品
 DocType: Student,B-,B-
@@ -351,6 +351,7 @@
 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 \
 				Serial No.",\ Item {0}が\ Serial番号で配送保証ありとなしで追加されるため、Serial Noによる配送を保証できません
+apps/erpnext/erpnext/education/doctype/instructor/instructor.py,Please setup Instructor Naming System in Education &gt; Education Settings,教育&gt;教育の設定でインストラクターの命名システムを設定してください
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py,At least one mode of payment is required for POS invoice.,支払いの少なくとも1モードはPOS請求書に必要とされます。
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py,Batch no is required for batched item {0},バッチアイテム{0}にはバッチ番号は必要ありません
 DocType: Bank Statement Transaction Invoice Item,Bank Statement Transaction Invoice Item,銀行報告書トランザクション請求書明細
@@ -875,7 +876,6 @@
 DocType: Vital Signs,Blood Pressure (systolic),血圧（上）
 apps/erpnext/erpnext/controllers/buying_controller.py,{0} {1} is {2},{0} {1}は{2}です
 DocType: Item Price,Valid Upto,有効（〜まで）
-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: Training Event,Workshop,ワークショップ
 DocType: Supplier Scorecard Scoring Standing,Warn Purchase Orders,発注を警告する
 apps/erpnext/erpnext/utilities/user_progress.py,List a few of your customers. They could be organizations or individuals.,あなたの顧客の一部を一覧表示します。彼らは、組織や個人である可能性があります。
@@ -1685,7 +1685,6 @@
 DocType: Item Barcode,Item Barcode,アイテムのバーコード
 DocType: Delivery Trip,In Transit,輸送中
 DocType: Woocommerce Settings,Endpoints,エンドポイント
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Item Code &gt; Item Group &gt; Brand,商品コード&gt;商品グループ&gt;ブランド
 DocType: Shopping Cart Settings,Show Configure Button,設定ボタンを表示
 DocType: Quality Inspection Reading,Reading 6,報告要素6
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js,Cannot {0} {1} {2} without any negative outstanding invoice,することができません{0} {1} {2}任意の負の優れたインボイスなし
@@ -2045,6 +2044,7 @@
 DocType: Cheque Print Template,Payer Settings,支払人の設定
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js,No pending Material Requests found to link for the given items.,指定されたアイテムにリンクする保留中のマテリアルリクエストは見つかりませんでした。
 apps/erpnext/erpnext/public/js/utils/party.js,Select company first,最初に会社を選択
+apps/erpnext/erpnext/accounts/general_ledger.py,Account: <b>{0}</b> is capital Work in progress and can not be updated by Journal Entry,アカウント： <b>{0}</b>は進行中の資本であり、仕訳入力では更新できません
 apps/erpnext/erpnext/education/doctype/quiz/quiz.py,Compare List function takes on list arguments,リスト比較機能はリスト引数を取ります
 DocType: Item Attribute Value,"This will be appended to the Item Code of the variant. For example, if your abbreviation is ""SM"", and the item code is ""T-SHIRT"", the item code of the variant will be ""T-SHIRT-SM""",これはバリエーションのアイテムコードに追加されます。あなたの略称が「SM」であり、アイテムコードが「T-SHIRT」である場合は、バリエーションのアイテムコードは、「T-SHIRT-SM」になります
 DocType: Salary Slip,Net Pay (in words) will be visible once you save the Salary Slip.,給与伝票を保存すると給与が表示されます。
@@ -2229,6 +2229,7 @@
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js,Item 2,アイテム2
 DocType: Pricing Rule,Validate Applied Rule,適用ルールを検証
 DocType: QuickBooks Migrator,Authorization Endpoint,承認エンドポイント
+DocType: Employee Onboarding,Notify users by email,メールでユーザーに通知する
 DocType: Travel Request,International,国際
 DocType: Training Event,Training Event,研修イベント
 DocType: Item,Auto re-order,自動再注文
@@ -2841,7 +2842,6 @@
 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,同名の顧客が既に存在します
-DocType: Contract,Inactive,非アクティブ
 apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.js,This will submit Salary Slips and create accrual Journal Entry. Do you want to proceed?,これにより、給与伝票が提出され、見越ジャーナルエントリが作成されます。続行しますか？
 DocType: Purchase Invoice,Total Net Weight,総正味重量
 DocType: Purchase Order,Order Confirmation No,注文確認番号
@@ -3119,7 +3119,6 @@
 apps/erpnext/erpnext/accounts/party.py,Billing currency must be equal to either default company's currency or party account currency,請求先通貨は、デフォルトの会社の通貨または勘定通貨のいずれかと同じでなければなりません
 DocType: Packing Slip,Indicates that the package is a part of this delivery (Only Draft),この納品の一部であることを梱包に示します（「下書き」のみ）
 apps/erpnext/erpnext/accounts/report/customer_ledger_summary/customer_ledger_summary.py,Closing Balance,決算残高
-apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.py,UOM Conversion factor ({0} -&gt; {1}) not found for item: {2},品目{2}の単位変換係数（{0}  - &gt; {1}）が見つかりません
 DocType: Soil Texture,Loam,壌土
 apps/erpnext/erpnext/controllers/accounts_controller.py,Row {0}: Due Date cannot be before posting date,行{0}：期日は転記前にすることはできません
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py,Quantity for Item {0} must be less than {1},アイテム{0}の数量は{1}より小さくなければなりません
@@ -3642,7 +3641,6 @@
 DocType: Stock Settings,Raise Material Request when stock reaches re-order level,在庫が再注文レベルに達したときに原材料要求を挙げる
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py,Full-time,フルタイム
 DocType: Payroll Entry,Employees,従業員
-apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py,Please setup numbering series for Attendance via Setup &gt; Numbering Series,[設定]&gt; [採番シリーズ]で出席用の採番シリーズを設定してください。
 DocType: Question,Single Correct Answer,単一の正解
 DocType: Employee,Contact Details,連絡先の詳細
 DocType: C-Form,Received Date,受信日
@@ -4279,6 +4277,7 @@
 DocType: Pricing Rule,Price or Product Discount,価格または製品割引
 apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.py,For row {0}: Enter planned qty,行{0}の場合：計画数量を入力してください
 DocType: Account,Income Account,収益勘定
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Customer &gt; Customer Group &gt; Territory,顧客&gt;顧客グループ&gt;テリトリー
 DocType: Payment Request,Amount in customer's currency,顧客通貨での金額
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js,Delivery,配送
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.py,Assigning Structures...,構造を割り当てています...
@@ -4328,7 +4327,6 @@
 DocType: HR Settings,Check Vacancies On Job Offer Creation,求人の作成時に空室をチェックする
 apps/erpnext/erpnext/utilities/user_progress.py,Go to Letterheads,レターヘッドに移動
 DocType: Subscription,Cancel At End Of Period,期間の終了時にキャンセルする
-apps/erpnext/erpnext/education/doctype/instructor/instructor.py,Please setup Instructor Naming System in Education &gt; Education Settings,[教育]&gt; [教育設定]で講師命名システムを設定してください。
 apps/erpnext/erpnext/hr/doctype/employee_promotion/employee_promotion.js,Property already added,プロパティが既に追加されている
 DocType: Item Supplier,Item Supplier,アイテムサプライヤー
 apps/erpnext/erpnext/public/js/controllers/transaction.js,Please enter Item Code to get batch no,バッチ番号を取得するためにアイテムコードを入力をしてください
@@ -4624,6 +4622,7 @@
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.js,Warning: Material Requested Qty is less than Minimum Order Qty,警告：資材要求数が最小注文数を下回っています。
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py,Account {0} is frozen,アカウント{0}は凍結されています
 DocType: Quiz Question,Quiz Question,クイズの質問
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Supplier &gt; Supplier Type,サプライヤ&gt;サプライヤタイプ
 DocType: Company,Legal Entity / Subsidiary with a separate Chart of Accounts belonging to the Organization.,組織内で別々の勘定科目を持つ法人／子会社
 DocType: Payment Request,Mute Email,メールをミュートする
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py,"Food, Beverage & Tobacco",食品、飲料＆タバコ
@@ -5134,7 +5133,6 @@
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py,Delivery warehouse required for stock item {0},在庫アイテム{0}には配送倉庫が必要です
 DocType: Packing Slip,The gross weight of the package. Usually net weight + packaging material weight. (for print),梱包の総重量は通常、正味重量＋梱包材重量です （印刷用）
 DocType: Assessment Plan,Program,教育課程
-apps/erpnext/erpnext/hr/doctype/employee/employee.py,Please setup Employee Naming System in Human Resource &gt; HR Settings,人事管理&gt;人事管理設定で従業員命名システムを設定してください。
 DocType: Accounts Settings,Users with this role are allowed to set frozen accounts and create / modify accounting entries against frozen accounts,この役割を持つユーザーは、口座の凍結と、凍結口座に対しての会計エントリーの作成/修正が許可されています
 ,Project Billing Summary,プロジェクト請求の概要
 DocType: Vital Signs,Cuts,カット
@@ -5383,6 +5381,7 @@
 apps/erpnext/erpnext/quality_management/doctype/quality_review/quality_review_list.js,No Action,何もしない
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js,Valuation type charges can not marked as Inclusive,評価タイプの請求は「包括的」にマークすることはえきません
 DocType: POS Profile,Update Stock,在庫更新
+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/stock/doctype/packing_slip/packing_slip.js,Different UOM for items will lead to incorrect (Total) Net Weight value. Make sure that Net Weight of each item is in the same UOM.,アイテムごとに数量単位が異なると、（合計）正味重量値が正しくなりません。各アイテムの正味重量が同じ単位になっていることを確認してください。
 DocType: Certification Application,Payment Details,支払詳細
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py,BOM Rate,部品表通貨レート
@@ -5486,6 +5485,8 @@
 apps/erpnext/erpnext/accounts/doctype/monthly_distribution/monthly_distribution.py,Percentage Allocation should be equal to 100%,割合の割り当ては100パーセントに等しくなければなりません
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js,Please select Posting Date before selecting Party,当事者を選択する前に転記日付を選択してください
 apps/erpnext/erpnext/config/accounting.py,Payment Terms based on conditions,条件に基づく支払条件
+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: Program Enrollment,School House,スクールハウス
 DocType: Serial No,Out of AMC,年間保守契約外
 DocType: Opportunity,Opportunity Amount,機会費用
@@ -5687,6 +5688,7 @@
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py,Order/Quot %,注文/クォート％
 apps/erpnext/erpnext/config/healthcare.py,Record Patient Vitals,患者のバイタルを記録する
 DocType: Fee Schedule,Institution,機関
+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: Asset,Partially Depreciated,部分的に減価償却
 DocType: Issue,Opening Time,「時間」を開く
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py,From and To dates required,期間日付が必要です
@@ -5903,6 +5905,7 @@
 DocType: Quality Procedure Process,Link existing Quality Procedure.,既存の品質管理手順をリンクする。
 apps/erpnext/erpnext/config/hr.py,Loans,ローン
 DocType: Healthcare Service Unit,Healthcare Service Unit,ヘルスケアサービスユニット
+,Customer-wise Item Price,顧客ごとのアイテム価格
 apps/erpnext/erpnext/public/js/financial_statements.js,Cash Flow Statement,キャッシュフロー計算書
 apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.py,No material request created,重要なリクエストは作成されません
 apps/erpnext/erpnext/hr/doctype/loan_application/loan_application.py,Loan Amount cannot exceed Maximum Loan Amount of {0},融資額は、{0}の最大融資額を超えることはできません。
@@ -6164,6 +6167,7 @@
 apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py,Opening Value,始値
 DocType: Salary Component,Formula,式
 apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py,Serial #,シリアル番号
+apps/erpnext/erpnext/hr/doctype/employee/employee.py,Please setup Employee Naming System in Human Resource &gt; HR Settings,人事管理&gt; HR設定で従業員命名システムを設定してください
 DocType: Material Request Plan Item,Required Quantity,必要数量
 DocType: Lab Test Template,Lab Test Template,ラボテストテンプレート
 apps/erpnext/erpnext/accounts/doctype/accounting_period/accounting_period.py,Accounting Period overlaps with {0},会計期間が{0}と重複しています
@@ -6413,7 +6417,6 @@
 DocType: Request for Quotation Item,Project Name,プロジェクト名
 apps/erpnext/erpnext/regional/italy/utils.py,Please set the Customer Address,カスタマーアドレスを設定してください
 DocType: Customer,Mention if non-standard receivable account,非標準の売掛金の場合に記載
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Customer &gt; Customer Group &gt; Territory,顧客&gt;顧客グループ&gt;地域
 DocType: Bank,Plaid Access Token,格子縞のアクセストークン
 apps/erpnext/erpnext/hr/doctype/employee_benefit_application/employee_benefit_application.py,Please add the remaining benefits {0} to any of the existing component,残りのメリット{0}を既存のコンポーネントに追加してください
 DocType: Journal Entry Account,If Income or Expense,収益または費用の場合
@@ -6675,8 +6678,6 @@
 apps/erpnext/erpnext/buying/utils.py,Please enter quantity for Item {0},アイテム{0}の数量を入力してください
 DocType: Quality Procedure,Processes,プロセス
 DocType: Shift Type,First Check-in and Last Check-out,最初のチェックインと最後のチェックアウト
-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/regional/report/hsn_wise_summary_of_outward_supplies/hsn_wise_summary_of_outward_supplies.py,Total Taxable Amount,総課税額
 DocType: Employee External Work History,Employee External Work History,従業員の職歴
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.py,Job card {0} created,ジョブカード{0}が作成されました
@@ -6712,6 +6713,7 @@
 apps/erpnext/erpnext/accounts/doctype/payment_terms_template/payment_terms_template.py,Combined invoice portion must equal 100%,結合された請求書部分は100％
 DocType: Item Default,Default Expense Account,デフォルト経費
 DocType: GST Account,CGST Account,CGSTアカウント
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Item Code &gt; Item Group &gt; Brand,商品コード&gt;商品グループ&gt;ブランド
 apps/erpnext/erpnext/education/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py,Student Email ID,生徒メールID
 DocType: Employee,Notice (days),お知らせ（日）
 DocType: POS Closing Voucher Invoices,POS Closing Voucher Invoices,POSクローズバウチャー請求書
@@ -7350,6 +7352,7 @@
 DocType: Maintenance Visit,Maintenance Date,保守日
 DocType: Purchase Invoice Item,Rejected Serial No,拒否されたシリアル番号
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py,Year start date or end date is overlapping with {0}. To avoid please set company,年の開始日や終了日が{0}と重なっています。回避のため会社を設定してください
+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/selling/doctype/customer/customer.py,Please mention the Lead Name in Lead {0},リード名{0}に記載してください
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py,Start date should be less than end date for Item {0},アイテム{0}の開始日は終了日より前でなければなりません
 DocType: Shift Type,Auto Attendance Settings,自動出席設定
diff --git a/erpnext/translations/km.csv b/erpnext/translations/km.csv
index 25f0717..28101fd 100644
--- a/erpnext/translations/km.csv
+++ b/erpnext/translations/km.csv
@@ -167,7 +167,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py,Accountant,គណនេយ្យករ
 apps/erpnext/erpnext/stock/report/item_price_stock/item_price_stock.py,Selling Price List,លក់បញ្ជីតំលៃ
 DocType: Patient,Tobacco Current Use,ការប្រើប្រាស់ថ្នាំជក់បច្ចុប្បន្ន
-apps/erpnext/erpnext/stock/report/item_price_stock/item_price_stock.py,Selling Rate,អត្រាលក់
+apps/erpnext/erpnext/selling/report/customer_wise_item_price/customer_wise_item_price.py,Selling Rate,អត្រាលក់
 apps/erpnext/erpnext/erpnext_integrations/doctype/plaid_settings/plaid_settings.js,Please save your document before adding a new account,សូមរក្សាទុកឯកសាររបស់អ្នកមុនពេលបន្ថែមគណនីថ្មី។
 DocType: Cost Center,Stock User,អ្នកប្រើប្រាស់ភាគហ៊ុន
 DocType: Soil Analysis,(Ca+Mg)/K,(Ca + Mg) / K
@@ -204,7 +204,6 @@
 DocType: Packed Item,Parent Detail docname,ពត៌មានលំអិតរបស់ឪពុកម្តាយ docname
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py,"Reference: {0}, Item Code: {1} and Customer: {2}","ឯកសារយោង: {0}, លេខកូដធាតុ: {1} និងអតិថិជន: {2}"
 apps/erpnext/erpnext/accounts/report/consolidated_financial_statement/consolidated_financial_statement.py,{0} {1} is not present in the parent company,{0} {1} មិនមានវត្តមាននៅក្នុងក្រុមហ៊ុនមេ
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Supplier &gt; Supplier Type,អ្នកផ្គត់ផ្គង់&gt; ប្រភេទអ្នកផ្គត់ផ្គង់។
 apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py,Trial Period End Date Cannot be before Trial Period Start Date,កាលបរិច្ឆេទបញ្ចប់នៃសវនាការមិនអាចនៅមុនថ្ងៃជំនុំជម្រះបានទេ
 apps/erpnext/erpnext/utilities/user_progress.py,Kg,គីឡូក្រាម
 DocType: Tax Withholding Category,Tax Withholding Category,ប្រភេទពន្ធកាត់ពន្ធ
@@ -317,6 +316,7 @@
 DocType: Quality Procedure Table,Responsible Individual,បុគ្គលទទួលខុសត្រូវ។
 DocType: Naming Series,Prefix,បុព្វបទ
 apps/erpnext/erpnext/hr/notification/training_scheduled/training_scheduled.html,Event Location,ទីតាំងព្រឹត្តិការណ៍
+apps/erpnext/erpnext/selling/report/customer_wise_item_price/customer_wise_item_price.py,Available Stock,មានស្តុក។
 DocType: Asset Settings,Asset Settings,ការកំណត់ធនធាន
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py,Consumable,ប្រើប្រាស់
 DocType: Student,B-,B-
@@ -349,6 +349,7 @@
 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 \
 				Serial No.",មិនអាចធានាថាការដឹកជញ្ជូនតាមលេខស៊េរីជាធាតុ \ {0} ត្រូវបានបន្ថែមនិងគ្មានការធានាការដឹកជញ្ជូនដោយ \ លេខស៊េរី។
+apps/erpnext/erpnext/education/doctype/instructor/instructor.py,Please setup Instructor Naming System in Education &gt; Education Settings,សូមតំឡើងប្រព័ន្ធដាក់ឈ្មោះគ្រូនៅក្នុងការអប់រំ&gt; ការកំណត់ការអប់រំ។
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py,At least one mode of payment is required for POS invoice.,របៀបយ៉ាងហោចណាស់មួយនៃការទូទាត់ត្រូវបានទាមទារសម្រាប់វិក័យប័ត្រម៉ាស៊ីនឆូតកាត។
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py,Batch no is required for batched item {0},បាច់មិនត្រូវបានទាមទារសម្រាប់វត្ថុដែលត្រូវបានគេបោះបង់ចោល {0}
 DocType: Bank Statement Transaction Invoice Item,Bank Statement Transaction Invoice Item,របាយការណ៍គណនីធនាគារ
@@ -869,7 +870,6 @@
 DocType: Supplier Scorecard Standing,Notify Other,ជូនដំណឹងផ្សេងទៀត
 DocType: Vital Signs,Blood Pressure (systolic),សម្ពាធឈាម (ស៊ីស្តូលិក)
 DocType: Item Price,Valid Upto,រីករាយជាមួយនឹងមានសុពលភាព
-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: Training Event,Workshop,សិក្ខាសាលា
 DocType: Supplier Scorecard Scoring Standing,Warn Purchase Orders,ព្រមានការបញ្ជាទិញ
 apps/erpnext/erpnext/utilities/user_progress.py,List a few of your customers. They could be organizations or individuals.,រាយមួយចំនួននៃអតិថិជនរបស់អ្នក។ ពួកគេអាចត្រូវបានអង្គការឬបុគ្គល។
@@ -1650,7 +1650,6 @@
 DocType: Item Barcode,Item Barcode,កូដផលិតផលធាតុ
 DocType: Delivery Trip,In Transit,នៅក្នុងដំណើរឆ្លងកាត់។
 DocType: Woocommerce Settings,Endpoints,ចំណុចបញ្ចប់
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Item Code &gt; Item Group &gt; Brand,លេខកូដរបស់ក្រុម&gt; ក្រុមក្រុម&gt; ម៉ាក។
 DocType: Shopping Cart Settings,Show Configure Button,បង្ហាញប៊ូតុងកំណត់រចនាសម្ព័ន្ធ។
 DocType: Quality Inspection Reading,Reading 6,ការអាន 6
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js,Cannot {0} {1} {2} without any negative outstanding invoice,មិនអាច {0} {1} {2} ដោយគ្មានវិក័យប័ត្រឆ្នើមអវិជ្ជមាន
@@ -2194,6 +2193,7 @@
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js,Item 2,ធាតុ 2
 DocType: Pricing Rule,Validate Applied Rule,ធ្វើឱ្យច្បាប់អនុវត្តបានត្រឹមត្រូវ។
 DocType: QuickBooks Migrator,Authorization Endpoint,ចំណុចនៃការអនុញ្ញាត
+DocType: Employee Onboarding,Notify users by email,ជូនដំណឹងដល់អ្នកប្រើប្រាស់តាមរយៈអ៊ីមែល។
 DocType: Travel Request,International,អន្តរជាតិ
 DocType: Training Event,Training Event,ព្រឹត្តិការណ៍បណ្តុះបណ្តាល
 DocType: Item,Auto re-order,ការបញ្ជាទិញជាថ្មីម្តងទៀតដោយស្វ័យប្រវត្តិ
@@ -2801,7 +2801,6 @@
 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,អតិថិជនដែលមានឈ្មោះដូចគ្នាមានរួចហើយ
-DocType: Contract,Inactive,អសកម្ម
 apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.js,This will submit Salary Slips and create accrual Journal Entry. Do you want to proceed?,នេះនឹងបង្ហាញប្រាក់បៀវត្សរ៍និងបង្កើតប្រាក់ចំណូលចូលក្នុង Journal Entry ។ តើអ្នកចង់បន្តទេ?
 DocType: Purchase Invoice,Total Net Weight,សរុបទំងន់សុទ្ធ
 DocType: Purchase Order,Order Confirmation No,ការបញ្ជាក់ពីលំដាប់លេខ
@@ -3593,7 +3592,6 @@
 DocType: Stock Settings,Raise Material Request when stock reaches re-order level,ចូរលើកសំណើសុំនៅពេលដែលភាគហ៊ុនសម្ភារៈឈានដល់កម្រិតបញ្ជាទិញឡើងវិញ
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py,Full-time,ពេញម៉ោង
 DocType: Payroll Entry,Employees,និយោជិត
-apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py,Please setup numbering series for Attendance via Setup &gt; Numbering Series,សូមរៀបចំស៊េរីលេខរៀងសម្រាប់ការចូលរួមតាមរយៈតំឡើង&gt; លេខរៀង។
 DocType: Question,Single Correct Answer,ចម្លើយត្រឹមត្រូវតែមួយ។
 DocType: Employee,Contact Details,ពត៌មានទំនាក់ទំនង
 DocType: C-Form,Received Date,កាលបរិច្ឆេទទទួលបាន
@@ -4200,6 +4198,7 @@
 DocType: Pricing Rule,Price or Product Discount,ការបញ្ចុះតំលៃឬផលិតផល។
 apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.py,For row {0}: Enter planned qty,សម្រាប់ជួរដេក {0}: បញ្ចូល Qty ដែលបានគ្រោងទុក
 DocType: Account,Income Account,គណនីប្រាក់ចំណូល
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Customer &gt; Customer Group &gt; Territory,អតិថិជន&gt; ក្រុមអតិថិជន&gt; ទឹកដី។
 DocType: Payment Request,Amount in customer's currency,ចំនួនទឹកប្រាក់របស់អតិថិជនជារូបិយប័ណ្ណ
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js,Delivery,ការដឹកជញ្ជូន
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.py,Assigning Structures...,ការផ្តល់រចនាសម្ព័ន្ធ ...
@@ -4249,7 +4248,6 @@
 DocType: HR Settings,Check Vacancies On Job Offer Creation,ពិនិត្យមើលភាពទំនេរលើការបង្កើតការផ្តល់ជូនការងារ។
 apps/erpnext/erpnext/utilities/user_progress.py,Go to Letterheads,ទៅកាន់ក្បាលអក្សរ
 DocType: Subscription,Cancel At End Of Period,បោះបង់នៅចុងបញ្ចប់នៃរយៈពេល
-apps/erpnext/erpnext/education/doctype/instructor/instructor.py,Please setup Instructor Naming System in Education &gt; Education Settings,សូមតំឡើងប្រព័ន្ធដាក់ឈ្មោះគ្រូនៅក្នុងការអប់រំ&gt; ការកំណត់ការអប់រំ។
 apps/erpnext/erpnext/hr/doctype/employee_promotion/employee_promotion.js,Property already added,អចលនទ្រព្យបានបន្ថែមរួចហើយ
 DocType: Item Supplier,Item Supplier,ផ្គត់ផ្គង់ធាតុ
 apps/erpnext/erpnext/public/js/controllers/transaction.js,Please enter Item Code to get batch no,សូមបញ្ចូលលេខកូដធាតុដើម្បីទទួលបាច់នោះទេ
@@ -4533,6 +4531,7 @@
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.js,Warning: Material Requested Qty is less than Minimum Order Qty,ព្រមាន: សម្ភារៈដែលបានស្នើ Qty គឺតិចជាងអប្បបរមាលំដាប់ Qty
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py,Account {0} is frozen,គណនី {0} គឺការកក
 DocType: Quiz Question,Quiz Question,សំណួរសំណួរ។
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Supplier &gt; Supplier Type,អ្នកផ្គត់ផ្គង់&gt; ប្រភេទអ្នកផ្គត់ផ្គង់។
 DocType: Company,Legal Entity / Subsidiary with a separate Chart of Accounts belonging to the Organization.,ផ្នែកច្បាប់អង្គភាព / តារាងរួមផ្សំជាមួយនឹងគណនីដាច់ដោយឡែកមួយដែលជាកម្មសិទ្ធិរបស់អង្គការនេះ។
 DocType: Payment Request,Mute Email,ស្ងាត់អ៊ីម៉ែល
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py,"Food, Beverage & Tobacco","អាហារ, ភេសជ្ជៈនិងថ្នាំជក់"
@@ -5041,7 +5040,6 @@
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py,Delivery warehouse required for stock item {0},ឃ្លាំងដឹកជញ្ជូនចាំបាច់សម្រាប់មុខទំនិញក្នុងស្ដុក {0}
 DocType: Packing Slip,The gross weight of the package. Usually net weight + packaging material weight. (for print),ទំងន់សរុបនៃកញ្ចប់។ ជាធម្មតាមានទម្ងន់សុទ្ធ + + ការវេចខ្ចប់មានទម្ងន់សម្ភារៈ។ (សម្រាប់ការបោះពុម្ព)
 DocType: Assessment Plan,Program,កម្មវិធី
-apps/erpnext/erpnext/hr/doctype/employee/employee.py,Please setup Employee Naming System in Human Resource &gt; HR Settings,សូមរៀបចំប្រព័ន្ធដាក់ឈ្មោះបុគ្គលិកនៅក្នុងធនធានមនុស្ស&gt; ធនធានមនុស្ស។
 DocType: Accounts Settings,Users with this role are allowed to set frozen accounts and create / modify accounting entries against frozen accounts,អ្នកប្រើដែលមានតួនាទីនេះត្រូវបានអនុញ្ញាតឱ្យកំណត់គណនីរបស់ទឹកកកនិងបង្កើត / កែប្រែធាតុគណនេយ្យប្រឆាំងនឹងគណនីជាទឹកកក
 ,Project Billing Summary,សង្ខេបវិក្កយបត្រគម្រោង។
 DocType: Vital Signs,Cuts,កាត់
@@ -5291,6 +5289,7 @@
 apps/erpnext/erpnext/quality_management/doctype/quality_review/quality_review_list.js,No Action,គ្មានសកម្មភាព
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js,Valuation type charges can not marked as Inclusive,ការចោទប្រកាន់មិនអាចវាយតម្លៃប្រភេទសម្គាល់ថាជាការរួមបញ្ចូល
 DocType: POS Profile,Update Stock,ធ្វើឱ្យទាន់សម័យហ៊ុន
+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/stock/doctype/packing_slip/packing_slip.js,Different UOM for items will lead to incorrect (Total) Net Weight value. Make sure that Net Weight of each item is in the same UOM.,UOM ផ្សេងគ្នាសម្រាប់ធាតុនឹងនាំឱ្យមានមិនត្រឹមត្រូវ (សរុប) តម្លៃទម្ងន់សុទ្ធ។ សូមប្រាកដថាទម្ងន់សុទ្ធនៃធាតុគ្នាគឺនៅ UOM ដូចគ្នា។
 DocType: Certification Application,Payment Details,សេចក្ដីលម្អិតការបង់ប្រាក់
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py,BOM Rate,អត្រា Bom
@@ -5395,6 +5394,8 @@
 apps/erpnext/erpnext/accounts/doctype/monthly_distribution/monthly_distribution.py,Percentage Allocation should be equal to 100%,ការបែងចែកគួរតែស្មើជាភាគរយទៅ 100%
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js,Please select Posting Date before selecting Party,សូមជ្រើសរើសកាលបរិច្ឆេទមុនការជ្រើសគណបក្ស
 apps/erpnext/erpnext/config/accounting.py,Payment Terms based on conditions,ល័ក្ខខ័ណ្ឌនៃការទូទាត់ផ្អែកលើល័ក្ខខ័ណ្ឌ។
+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: Program Enrollment,School House,សាលាផ្ទះ
 DocType: Serial No,Out of AMC,ចេញពីមជ្ឈមណ្ឌល AMC
 DocType: Opportunity,Opportunity Amount,ចំនួនឱកាស
@@ -5817,6 +5818,7 @@
 DocType: Quality Procedure Process,Link existing Quality Procedure.,ភ្ជាប់នីតិវិធីគុណភាពដែលមានស្រាប់។
 apps/erpnext/erpnext/config/hr.py,Loans,ប្រាក់កម្ចី។
 DocType: Healthcare Service Unit,Healthcare Service Unit,អង្គភាពសេវាកម្មសុខភាព
+,Customer-wise Item Price,តម្លៃរបស់អតិថិជនដែលមានប្រាជ្ញា។
 apps/erpnext/erpnext/public/js/financial_statements.js,Cash Flow Statement,សេចក្តីថ្លែងការណ៍លំហូរសាច់ប្រាក់
 apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.py,No material request created,គ្មានការស្នើសុំសម្ភារៈបានបង្កើត
 apps/erpnext/erpnext/hr/doctype/loan_application/loan_application.py,Loan Amount cannot exceed Maximum Loan Amount of {0},ចំនួនទឹកប្រាក់កម្ចីមិនអាចលើសពីចំនួនទឹកប្រាក់កម្ចីអតិបរមានៃ {0}
@@ -6081,6 +6083,7 @@
 apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py,Opening Value,តម្លៃពិធីបើក
 DocType: Salary Component,Formula,រូបមន្ត
 apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py,Serial #,# សៀរៀល
+apps/erpnext/erpnext/hr/doctype/employee/employee.py,Please setup Employee Naming System in Human Resource &gt; HR Settings,សូមរៀបចំប្រព័ន្ធដាក់ឈ្មោះបុគ្គលិកនៅក្នុងធនធានមនុស្ស&gt; ធនធានមនុស្ស។
 DocType: Material Request Plan Item,Required Quantity,បរិមាណដែលត្រូវការ។
 DocType: Lab Test Template,Lab Test Template,គំរូតេស្តមន្ទីរពិសោធន៍
 apps/erpnext/erpnext/accounts/doctype/accounting_period/accounting_period.py,Accounting Period overlaps with {0},រយៈពេលគណនេយ្យត្រួតគ្នាជាមួយ {0}
@@ -6216,6 +6219,7 @@
 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,រទេះ
+apps/erpnext/erpnext/erpnext_integrations/doctype/plaid_settings/plaid_settings.py,Bank account {0} already exists and could not be created again,គណនីធនាគារ {0} មានរួចហើយហើយមិនអាចបង្កើតម្តងទៀតបានទេ។
 apps/erpnext/erpnext/public/js/call_popup/call_popup.js,Call Missed,ខកខានហៅ។
 DocType: Certified Consultant,GitHub ID,លេខសម្គាល់ GitHub
 DocType: Staffing Plan,Total Estimated Budget,សរុបថវិកាប៉ាន់ស្មាន
@@ -6330,7 +6334,6 @@
 DocType: Request for Quotation Item,Project Name,ឈ្មោះគម្រោង
 apps/erpnext/erpnext/regional/italy/utils.py,Please set the Customer Address,សូមកំណត់អាសយដ្ឋានអតិថិជន។
 DocType: Customer,Mention if non-standard receivable account,និយាយពីការប្រសិនបើគណនីដែលមិនមែនជាស្តង់ដាទទួល
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Customer &gt; Customer Group &gt; Territory,អតិថិជន&gt; ក្រុមអតិថិជន&gt; ទឹកដី។
 DocType: Bank,Plaid Access Token,ថូខឹនផ្លាទីនចូល។
 apps/erpnext/erpnext/hr/doctype/employee_benefit_application/employee_benefit_application.py,Please add the remaining benefits {0} to any of the existing component,សូមបន្ថែមអត្ថប្រយោជន៍ដែលនៅសល់ {0} ទៅសមាសភាគដែលមានស្រាប់
 DocType: Journal Entry Account,If Income or Expense,ប្រសិនបើមានប្រាក់ចំណូលឬការចំណាយ
@@ -6594,8 +6597,6 @@
 apps/erpnext/erpnext/buying/utils.py,Please enter quantity for Item {0},សូមបញ្ចូលបរិមាណសម្រាប់ធាតុ {0}
 DocType: Quality Procedure,Processes,ដំណើរការ។
 DocType: Shift Type,First Check-in and Last Check-out,ចូលដំបូងនិងចូលចុងក្រោយ។
-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/regional/report/hsn_wise_summary_of_outward_supplies/hsn_wise_summary_of_outward_supplies.py,Total Taxable Amount,បរិមាណពន្ធសរុប
 DocType: Employee External Work History,Employee External Work History,បុគ្គលិកខាងក្រៅប្រវត្តិការងារ
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.py,Job card {0} created,បង្កើតប័ណ្ណការងារ {0}
@@ -6632,6 +6633,7 @@
 apps/erpnext/erpnext/accounts/doctype/payment_terms_template/payment_terms_template.py,Combined invoice portion must equal 100%,ចំណែកវិក្កយបត្ររួមបញ្ចូលគ្នាត្រូវតែស្មើនឹង 100%
 DocType: Item Default,Default Expense Account,ចំណាយតាមគណនីលំនាំដើម
 DocType: GST Account,CGST Account,គណនី CGST
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Item Code &gt; Item Group &gt; Brand,លេខកូដរបស់ក្រុម&gt; ក្រុមក្រុម&gt; ម៉ាក។
 apps/erpnext/erpnext/education/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py,Student Email ID,លេខសម្គាល់អ៊ីមែលរបស់សិស្ស
 DocType: Employee,Notice (days),សេចក្តីជូនដំណឹង (ថ្ងៃ)
 DocType: POS Closing Voucher Invoices,POS Closing Voucher Invoices,វិក័យប័ត្របិទប័ណ្ណវិក្ក័យប័ត្រ
@@ -7272,6 +7274,7 @@
 DocType: Maintenance Visit,Maintenance Date,ថែទាំកាលបរិច្ឆេទ
 DocType: Purchase Invoice Item,Rejected Serial No,គ្មានសៀរៀលច្រានចោល
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py,Year start date or end date is overlapping with {0}. To avoid please set company,កាលបរិច្ឆេទចាប់ផ្ដើមកាលពីឆ្នាំឬកាលបរិច្ឆេទចុងត្រូវបានត្រួតស៊ីគ្នានឹង {0} ។ ដើម្បីជៀសវាងសូមកំណត់របស់ក្រុមហ៊ុន
+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/selling/doctype/customer/customer.py,Please mention the Lead Name in Lead {0},សូមនិយាយពីឈ្មោះនាំមុខក្នុង {0}
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py,Start date should be less than end date for Item {0},កាលបរិច្ឆេទចាប់ផ្ដើមគួរតែតិចជាងកាលបរិច្ឆេទចុងក្រោយសម្រាប់ធាតុ {0}
 DocType: Shift Type,Auto Attendance Settings,ការកំណត់ការចូលរួមដោយស្វ័យប្រវត្តិ។
diff --git a/erpnext/translations/kn.csv b/erpnext/translations/kn.csv
index c3d6841..04c0554 100644
--- a/erpnext/translations/kn.csv
+++ b/erpnext/translations/kn.csv
@@ -163,7 +163,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py,Accountant,ಅಕೌಂಟೆಂಟ್
 apps/erpnext/erpnext/stock/report/item_price_stock/item_price_stock.py,Selling Price List,ಬೆಲೆ ಪಟ್ಟಿ ಮಾರಾಟ
 DocType: Patient,Tobacco Current Use,ತಂಬಾಕು ಪ್ರಸ್ತುತ ಬಳಕೆ
-apps/erpnext/erpnext/stock/report/item_price_stock/item_price_stock.py,Selling Rate,ದರ ಮಾರಾಟ
+apps/erpnext/erpnext/selling/report/customer_wise_item_price/customer_wise_item_price.py,Selling Rate,ದರ ಮಾರಾಟ
 apps/erpnext/erpnext/erpnext_integrations/doctype/plaid_settings/plaid_settings.js,Please save your document before adding a new account,ಹೊಸ ಖಾತೆಯನ್ನು ಸೇರಿಸುವ ಮೊದಲು ದಯವಿಟ್ಟು ನಿಮ್ಮ ಡಾಕ್ಯುಮೆಂಟ್ ಅನ್ನು ಉಳಿಸಿ
 DocType: Cost Center,Stock User,ಸ್ಟಾಕ್ ಬಳಕೆದಾರ
 DocType: Soil Analysis,(Ca+Mg)/K,(Ca + Mg) / K
@@ -199,7 +199,6 @@
 DocType: Packed Item,Parent Detail docname,Docname ಪೋಷಕ ವಿವರ
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py,"Reference: {0}, Item Code: {1} and Customer: {2}","ರೆಫರೆನ್ಸ್: {0}, ಐಟಂ ಕೋಡ್: {1} ಮತ್ತು ಗ್ರಾಹಕ: {2}"
 apps/erpnext/erpnext/accounts/report/consolidated_financial_statement/consolidated_financial_statement.py,{0} {1} is not present in the parent company,{0} {1} ಪೋಷಕ ಕಂಪನಿಯಲ್ಲಿ ಇಲ್ಲ
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Supplier &gt; Supplier Type,ಸರಬರಾಜುದಾರ&gt; ಪೂರೈಕೆದಾರ ಪ್ರಕಾರ
 apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py,Trial Period End Date Cannot be before Trial Period Start Date,ಪ್ರಾಯೋಗಿಕ ಅವಧಿಯ ಅಂತ್ಯ ದಿನಾಂಕ ಟ್ರಯಲ್ ಅವಧಿಯ ಪ್ರಾರಂಭ ದಿನಾಂಕದ ಮೊದಲು ಇರುವಂತಿಲ್ಲ
 apps/erpnext/erpnext/utilities/user_progress.py,Kg,ಕೆಜಿ
 DocType: Tax Withholding Category,Tax Withholding Category,ತೆರಿಗೆ ತಡೆಹಿಡಿಯುವುದು ವರ್ಗ
@@ -311,6 +310,7 @@
 DocType: Quality Procedure Table,Responsible Individual,ಜವಾಬ್ದಾರಿಯುತ ವ್ಯಕ್ತಿ
 DocType: Naming Series,Prefix,ಮೊದಲೇ ಜೋಡಿಸು
 apps/erpnext/erpnext/hr/notification/training_scheduled/training_scheduled.html,Event Location,ಈವೆಂಟ್ ಸ್ಥಳ
+apps/erpnext/erpnext/selling/report/customer_wise_item_price/customer_wise_item_price.py,Available Stock,ಲಭ್ಯವಿರುವ ಸ್ಟಾಕ್
 DocType: Asset Settings,Asset Settings,ಸ್ವತ್ತು ಸೆಟ್ಟಿಂಗ್ಗಳು
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py,Consumable,ಉಪಭೋಗ್ಯ
 DocType: Student,B-,ಬಿ
@@ -344,6 +344,7 @@
 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 \
 				Serial No.",ಸೀರಿಯಲ್ ಮೂಲಕ ವಿತರಣೆಯನ್ನು ಖಚಿತಪಡಿಸಲು ಸಾಧ್ಯವಿಲ್ಲ \ ಐಟಂ {0} ಅನ್ನು \ ಸೀರಿಯಲ್ ನಂಬರ್ ಮೂಲಕ ಮತ್ತು ಡೆಲಿವರಿ ಮಾಡುವಿಕೆಯನ್ನು ಸೇರಿಸದೆಯೇ ಇಲ್ಲ.
+apps/erpnext/erpnext/education/doctype/instructor/instructor.py,Please setup Instructor Naming System in Education &gt; Education Settings,ಶಿಕ್ಷಣ&gt; ಶಿಕ್ಷಣ ಸೆಟ್ಟಿಂಗ್‌ಗಳಲ್ಲಿ ಬೋಧಕ ಹೆಸರಿಸುವ ವ್ಯವಸ್ಥೆಯನ್ನು ದಯವಿಟ್ಟು ಹೊಂದಿಸಿ
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py,At least one mode of payment is required for POS invoice.,ಪಾವತಿಯ ಕನಿಷ್ಟ ಒಂದು ಮಾದರಿ ಪಿಓಎಸ್ ಸರಕುಪಟ್ಟಿ ಅಗತ್ಯವಿದೆ.
 DocType: Bank Statement Transaction Invoice Item,Bank Statement Transaction Invoice Item,ಬ್ಯಾಂಕ್ ಸ್ಟೇಟ್ಮೆಂಟ್ ಟ್ರಾನ್ಸಾಕ್ಷನ್ ಇನ್ವಾಯ್ಸ್ ಐಟಂ
 DocType: Salary Detail,Tax on flexible benefit,ಹೊಂದಿಕೊಳ್ಳುವ ಲಾಭದ ಮೇಲೆ ತೆರಿಗೆ
@@ -1663,7 +1664,6 @@
 DocType: Item Barcode,Item Barcode,ಐಟಂ ಬಾರ್ಕೋಡ್
 DocType: Delivery Trip,In Transit,ಸಾಗಣೆಯಲ್ಲಿ
 DocType: Woocommerce Settings,Endpoints,ಅಂತ್ಯಬಿಂದುಗಳು
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Item Code &gt; Item Group &gt; Brand,ಐಟಂ ಕೋಡ್&gt; ಐಟಂ ಗುಂಪು&gt; ಬ್ರಾಂಡ್
 DocType: Shopping Cart Settings,Show Configure Button,ಕಾನ್ಫಿಗರ್ ಬಟನ್ ತೋರಿಸಿ
 DocType: Quality Inspection Reading,Reading 6,6 ಓದುವಿಕೆ
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js,Cannot {0} {1} {2} without any negative outstanding invoice,ಅಲ್ಲ {0} {1} {2} ಯಾವುದೇ ಋಣಾತ್ಮಕ ಮಹೋನ್ನತ ಸರಕುಪಟ್ಟಿ ಕ್ಯಾನ್
@@ -1840,6 +1840,7 @@
 apps/erpnext/erpnext/regional/india/utils.py,Transport Receipt No and Date are mandatory for your chosen Mode of Transport,ನೀವು ಆಯ್ಕೆ ಮಾಡಿದ ಸಾರಿಗೆ ವಿಧಾನಕ್ಕೆ ಸಾರಿಗೆ ರಶೀದಿ ಸಂಖ್ಯೆ ಮತ್ತು ದಿನಾಂಕ ಕಡ್ಡಾಯವಾಗಿದೆ
 apps/erpnext/erpnext/agriculture/doctype/soil_texture/soil_texture.py,Soil compositions do not add up to 100,ಮಣ್ಣಿನ ಸಂಯೋಜನೆಗಳು 100 ವರೆಗೆ ಸೇರುವುದಿಲ್ಲ
 apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js,Discount,ರಿಯಾಯಿತಿ
+apps/erpnext/erpnext/accounts/doctype/opening_invoice_creation_tool/opening_invoice_creation_tool.py,Row {0}: {1} is required to create the Opening {2} Invoices,ಆರಂಭಿಕ {2} ಇನ್‌ವಾಯ್ಸ್‌ಗಳನ್ನು ರಚಿಸಲು ಸಾಲು {0}: {1} ಅಗತ್ಯವಿದೆ
 DocType: Membership,Membership,ಸದಸ್ಯತ್ವ
 DocType: Asset,Total Number of Depreciations,Depreciations ಒಟ್ಟು ಸಂಖ್ಯೆ
 apps/erpnext/erpnext/hr/report/bank_remittance/bank_remittance.py,Debit A/C Number,ಡೆಬಿಟ್ ಎ / ಸಿ ಸಂಖ್ಯೆ
@@ -2205,6 +2206,7 @@
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js,Item 2,ಐಟಂ 2
 DocType: Pricing Rule,Validate Applied Rule,ಅನ್ವಯಿಕ ನಿಯಮವನ್ನು ಮೌಲ್ಯೀಕರಿಸಿ
 DocType: QuickBooks Migrator,Authorization Endpoint,ದೃಢೀಕರಣ ಎಂಡ್ಪೋಯಿಂಟ್
+DocType: Employee Onboarding,Notify users by email,ಇಮೇಲ್ ಮೂಲಕ ಬಳಕೆದಾರರಿಗೆ ತಿಳಿಸಿ
 DocType: Travel Request,International,ಅಂತಾರಾಷ್ಟ್ರೀಯ
 DocType: Training Event,Training Event,ತರಬೇತಿ ಈವೆಂಟ್
 DocType: Item,Auto re-order,ಆಟೋ ಪುನಃ ಸಲುವಾಗಿ
@@ -2527,6 +2529,7 @@
 apps/erpnext/erpnext/regional/report/gstr_1/gstr_1.js,Download as Json,Json ಆಗಿ ಡೌನ್‌ಲೋಡ್ ಮಾಡಿ
 DocType: Item,Sales Details,ಮಾರಾಟದ ವಿವರಗಳು
 DocType: Opportunity,With Items,ವಸ್ತುಗಳು
+apps/erpnext/erpnext/crm/doctype/email_campaign/email_campaign.py,The Campaign '{0}' already exists for the {1} '{2}',&#39;{0}&#39; ಅಭಿಯಾನವು ಈಗಾಗಲೇ {1} &#39;{2}&#39; ಗೆ ಅಸ್ತಿತ್ವದಲ್ಲಿದೆ
 DocType: Asset Maintenance,Maintenance Team,ನಿರ್ವಹಣೆ ತಂಡ
 DocType: Homepage Section,"Order in which sections should appear. 0 is first, 1 is second and so on.","ಯಾವ ವಿಭಾಗಗಳು ಗೋಚರಿಸಬೇಕೆಂದು ಆದೇಶಿಸಿ. 0 ಮೊದಲನೆಯದು, 1 ಎರಡನೆಯದು ಮತ್ತು ಹೀಗೆ."
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py,In Qty,ಸೇರಿಸಿ ಪ್ರಮಾಣ
@@ -2807,7 +2810,6 @@
 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,ಅದೇ ಹೆಸರಿನ ಗ್ರಾಹಕರು ಈಗಾಗಲೇ ಅಸ್ತಿತ್ವದಲ್ಲಿದ್ದಾರೆ
-DocType: Contract,Inactive,ನಿಷ್ಕ್ರಿಯವಾಗಿದೆ
 apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.js,This will submit Salary Slips and create accrual Journal Entry. Do you want to proceed?,ಇದು ಸಂಬಳದ ಸ್ಲಿಪ್ಗಳನ್ನು ಸಲ್ಲಿಸುತ್ತದೆ ಮತ್ತು ಸಂಚಯ ಜರ್ನಲ್ ಎಂಟ್ರಿ ಅನ್ನು ರಚಿಸುತ್ತದೆ. ನೀವು ಮುಂದುವರಿಯಲು ಬಯಸುವಿರಾ?
 DocType: Purchase Invoice,Total Net Weight,ಒಟ್ಟು ನೆಟ್ ತೂಕ
 DocType: Purchase Order,Order Confirmation No,ಆರ್ಡರ್ ದೃಢೀಕರಣ ಇಲ್ಲ
@@ -3088,7 +3090,6 @@
 apps/erpnext/erpnext/accounts/party.py,Billing currency must be equal to either default company's currency or party account currency,ಬಿಲ್ಲಿಂಗ್ ಕರೆನ್ಸಿ ಡೀಫಾಲ್ಟ್ ಕಂಪನಿಯ ಕರೆನ್ಸಿಯ ಅಥವಾ ಪಾರ್ಟಿ ಖಾತೆ ಕರೆನ್ಸಿಗೆ ಸಮನಾಗಿರಬೇಕು
 DocType: Packing Slip,Indicates that the package is a part of this delivery (Only Draft),ಪ್ಯಾಕೇಜ್ ಈ ವಿತರಣಾ ಒಂದು ಭಾಗ ಎಂದು ಸೂಚಿಸುತ್ತದೆ (ಮಾತ್ರ Draft)
 apps/erpnext/erpnext/accounts/report/customer_ledger_summary/customer_ledger_summary.py,Closing Balance,ಅಂತಿಮ ಉಳಿತಾಯ
-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: Soil Texture,Loam,ಲೊಮ್
 apps/erpnext/erpnext/controllers/accounts_controller.py,Row {0}: Due Date cannot be before posting date,ಸಾಲು {0}: ದಿನಾಂಕವನ್ನು ಪೋಸ್ಟ್ ಮಾಡುವ ಮೊದಲು ದಿನಾಂಕ ಕಾರಣವಾಗಿರಬಾರದು
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py,Quantity for Item {0} must be less than {1},ಪ್ರಮಾಣ ಐಟಂ {0} ಕಡಿಮೆ ಇರಬೇಕು {1}
@@ -3611,7 +3612,6 @@
 DocType: Stock Settings,Raise Material Request when stock reaches re-order level,ಸ್ಟಾಕ್ ಮತ್ತೆ ಸಲುವಾಗಿ ಮಟ್ಟ ತಲುಪಿದಾಗ ವಸ್ತು ವಿನಂತಿಗಳನ್ನು ರೈಸ್
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py,Full-time,ಪೂರ್ಣ ಬಾರಿ
 DocType: Payroll Entry,Employees,ನೌಕರರು
-apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py,Please setup numbering series for Attendance via Setup &gt; Numbering Series,ಸೆಟಪ್&gt; ಸಂಖ್ಯೆಯ ಸರಣಿಯ ಮೂಲಕ ಹಾಜರಾತಿಗಾಗಿ ದಯವಿಟ್ಟು ಸಂಖ್ಯೆಯ ಸರಣಿಯನ್ನು ಹೊಂದಿಸಿ
 DocType: Question,Single Correct Answer,ಒಂದೇ ಸರಿಯಾದ ಉತ್ತರ
 DocType: Employee,Contact Details,ಸಂಪರ್ಕ ವಿವರಗಳು
 DocType: C-Form,Received Date,ಸ್ವೀಕರಿಸಲಾಗಿದೆ ದಿನಾಂಕ
@@ -4240,6 +4240,7 @@
 DocType: Pricing Rule,Price or Product Discount,ಬೆಲೆ ಅಥವಾ ಉತ್ಪನ್ನ ರಿಯಾಯಿತಿ
 apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.py,For row {0}: Enter planned qty,ಸಾಲು {0}: ಯೋಜಿತ qty ಯನ್ನು ನಮೂದಿಸಿ
 DocType: Account,Income Account,ಆದಾಯ ಖಾತೆ
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Customer &gt; Customer Group &gt; Territory,ಗ್ರಾಹಕ&gt; ಗ್ರಾಹಕ ಗುಂಪು&gt; ಪ್ರದೇಶ
 DocType: Payment Request,Amount in customer's currency,ಗ್ರಾಹಕರ ಕರೆನ್ಸಿ ಪ್ರಮಾಣ
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js,Delivery,ಡೆಲಿವರಿ
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.py,Assigning Structures...,ರಚನೆಗಳನ್ನು ನಿಯೋಜಿಸುವುದು ...
@@ -4288,7 +4289,6 @@
 DocType: HR Settings,Check Vacancies On Job Offer Creation,ಜಾಬ್ ಆಫರ್ ಸೃಷ್ಟಿಯಲ್ಲಿ ಖಾಲಿ ಹುದ್ದೆಗಳನ್ನು ಪರಿಶೀಲಿಸಿ
 apps/erpnext/erpnext/utilities/user_progress.py,Go to Letterheads,ಲೆಟರ್ಹೆಡ್ಸ್ಗೆ ಹೋಗಿ
 DocType: Subscription,Cancel At End Of Period,ಅವಧಿಯ ಕೊನೆಯಲ್ಲಿ ರದ್ದುಮಾಡಿ
-apps/erpnext/erpnext/education/doctype/instructor/instructor.py,Please setup Instructor Naming System in Education &gt; Education Settings,ಶಿಕ್ಷಣ&gt; ಶಿಕ್ಷಣ ಸೆಟ್ಟಿಂಗ್‌ಗಳಲ್ಲಿ ಬೋಧಕ ಹೆಸರಿಸುವ ವ್ಯವಸ್ಥೆಯನ್ನು ದಯವಿಟ್ಟು ಹೊಂದಿಸಿ
 apps/erpnext/erpnext/hr/doctype/employee_promotion/employee_promotion.js,Property already added,ಆಸ್ತಿ ಈಗಾಗಲೇ ಸೇರಿಸಲಾಗಿದೆ
 DocType: Item Supplier,Item Supplier,ಐಟಂ ಸರಬರಾಜುದಾರ
 apps/erpnext/erpnext/public/js/controllers/transaction.js,Please enter Item Code to get batch no,ಯಾವುದೇ ಐಟಂ ಬ್ಯಾಚ್ ಪಡೆಯಲು ಕೋಡ್ ನಮೂದಿಸಿ
@@ -4583,6 +4583,7 @@
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.js,Warning: Material Requested Qty is less than Minimum Order Qty,ಎಚ್ಚರಿಕೆ : ಪ್ರಮಾಣ ವಿನಂತಿಸಿದ ವಸ್ತು ಕನಿಷ್ಠ ಪ್ರಮಾಣ ಆದೇಶ ಕಡಿಮೆ
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py,Account {0} is frozen,ಖಾತೆ {0} ಹೆಪ್ಪುಗಟ್ಟಿರುವ
 DocType: Quiz Question,Quiz Question,ರಸಪ್ರಶ್ನೆ ಪ್ರಶ್ನೆ
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Supplier &gt; Supplier Type,ಸರಬರಾಜುದಾರ&gt; ಪೂರೈಕೆದಾರ ಪ್ರಕಾರ
 DocType: Company,Legal Entity / Subsidiary with a separate Chart of Accounts belonging to the Organization.,ಸಂಸ್ಥೆ ಸೇರಿದ ಖಾತೆಗಳ ಪ್ರತ್ಯೇಕ ಚಾರ್ಟ್ ಜೊತೆಗೆ ಕಾನೂನು ಘಟಕದ / ಅಂಗಸಂಸ್ಥೆ.
 DocType: Payment Request,Mute Email,ಮ್ಯೂಟ್ ಇಮೇಲ್
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py,"Food, Beverage & Tobacco","ಆಹಾರ , ಪಾನೀಯ ಮತ್ತು ತಂಬಾಕು"
@@ -5091,7 +5092,6 @@
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py,Delivery warehouse required for stock item {0},ಡೆಲಿವರಿ ಗೋದಾಮಿನ ಸ್ಟಾಕ್ ಐಟಂ ಬೇಕಾದ {0}
 DocType: Packing Slip,The gross weight of the package. Usually net weight + packaging material weight. (for print),ಪ್ಯಾಕೇಜ್ ಒಟ್ಟಾರೆ ತೂಕದ . ಸಾಮಾನ್ಯವಾಗಿ ನಿವ್ವಳ ತೂಕ + ಪ್ಯಾಕೇಜಿಂಗ್ ವಸ್ತುಗಳ ತೂಕ . ( ಮುದ್ರಣ )
 DocType: Assessment Plan,Program,ಕಾರ್ಯಕ್ರಮದಲ್ಲಿ
-apps/erpnext/erpnext/hr/doctype/employee/employee.py,Please setup Employee Naming System in Human Resource &gt; HR Settings,ದಯವಿಟ್ಟು ಮಾನವ ಸಂಪನ್ಮೂಲ&gt; ಮಾನವ ಸಂಪನ್ಮೂಲ ಸೆಟ್ಟಿಂಗ್‌ಗಳಲ್ಲಿ ನೌಕರರ ಹೆಸರಿಸುವ ವ್ಯವಸ್ಥೆಯನ್ನು ಹೊಂದಿಸಿ
 DocType: Accounts Settings,Users with this role are allowed to set frozen accounts and create / modify accounting entries against frozen accounts,ಈ ಪಾತ್ರವನ್ನು ಬಳಕೆದಾರರು ಹೆಪ್ಪುಗಟ್ಟಿದ ಖಾತೆಗಳ ವಿರುದ್ಧ ಲೆಕ್ಕಪರಿಶೋಧಕ ನಮೂದುಗಳನ್ನು ಮಾರ್ಪಡಿಸಲು / ಹೆಪ್ಪುಗಟ್ಟಿದ ಖಾತೆಗಳನ್ನು ಸೆಟ್ ಮತ್ತು ರಚಿಸಲು ಅವಕಾಶ
 ,Project Billing Summary,ಪ್ರಾಜೆಕ್ಟ್ ಬಿಲ್ಲಿಂಗ್ ಸಾರಾಂಶ
 DocType: Vital Signs,Cuts,ಕಡಿತ
@@ -5441,6 +5441,8 @@
 apps/erpnext/erpnext/accounts/doctype/monthly_distribution/monthly_distribution.py,Percentage Allocation should be equal to 100%,ಶೇಕಡಾವಾರು ಅಲೋಕೇಶನ್ 100% ಸಮನಾಗಿರುತ್ತದೆ
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js,Please select Posting Date before selecting Party,ದಯವಿಟ್ಟು ಪಕ್ಷದ ಆರಿಸುವ ಮೊದಲು ಪೋಸ್ಟಿಂಗ್ ದಿನಾಂಕ ಆಯ್ಕೆ
 apps/erpnext/erpnext/config/accounting.py,Payment Terms based on conditions,ಷರತ್ತುಗಳ ಆಧಾರದ ಮೇಲೆ ಪಾವತಿ ನಿಯಮಗಳು
+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: Program Enrollment,School House,ಸ್ಕೂಲ್ ಹೌಸ್
 DocType: Serial No,Out of AMC,ಎಎಂಸಿ ಔಟ್
 DocType: Opportunity,Opportunity Amount,ಅವಕಾಶ ಮೊತ್ತ
@@ -5643,6 +5645,7 @@
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py,Order/Quot %,ಆರ್ಡರ್ / quot%
 apps/erpnext/erpnext/config/healthcare.py,Record Patient Vitals,ರೋಗಿಯ ರೋಗಾಣುಗಳನ್ನು ರೆಕಾರ್ಡ್ ಮಾಡಿ
 DocType: Fee Schedule,Institution,ಇನ್ಸ್ಟಿಟ್ಯೂಷನ್
+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: Asset,Partially Depreciated,ಭಾಗಶಃ Depreciated
 DocType: Issue,Opening Time,ಆರಂಭಿಕ ಸಮಯ
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py,From and To dates required,ಅಗತ್ಯವಿದೆ ದಿನಾಂಕ ಮತ್ತು ಮಾಡಲು
@@ -5859,6 +5862,7 @@
 DocType: Quality Procedure Process,Link existing Quality Procedure.,ಅಸ್ತಿತ್ವದಲ್ಲಿರುವ ಗುಣಮಟ್ಟದ ಕಾರ್ಯವಿಧಾನವನ್ನು ಲಿಂಕ್ ಮಾಡಿ.
 apps/erpnext/erpnext/config/hr.py,Loans,ಸಾಲಗಳು
 DocType: Healthcare Service Unit,Healthcare Service Unit,ಆರೋಗ್ಯ ಸೇವೆ ಘಟಕ
+,Customer-wise Item Price,ಗ್ರಾಹಕವಾರು ಐಟಂ ಬೆಲೆ
 apps/erpnext/erpnext/public/js/financial_statements.js,Cash Flow Statement,ಕ್ಯಾಶ್ ಫ್ಲೋ ಹೇಳಿಕೆ
 apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.py,No material request created,ಯಾವುದೇ ವಸ್ತು ವಿನಂತಿಯು ರಚಿಸಲಾಗಿಲ್ಲ
 apps/erpnext/erpnext/hr/doctype/loan_application/loan_application.py,Loan Amount cannot exceed Maximum Loan Amount of {0},ಸಾಲದ ಪ್ರಮಾಣ ಗರಿಷ್ಠ ಸಾಲದ ಪ್ರಮಾಣ ಮೀರುವಂತಿಲ್ಲ {0}
@@ -6124,6 +6128,7 @@
 apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py,Opening Value,ಆರಂಭಿಕ ಮೌಲ್ಯ
 DocType: Salary Component,Formula,ಸೂತ್ರ
 apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py,Serial #,ಸರಣಿ #
+apps/erpnext/erpnext/hr/doctype/employee/employee.py,Please setup Employee Naming System in Human Resource &gt; HR Settings,ದಯವಿಟ್ಟು ಮಾನವ ಸಂಪನ್ಮೂಲ&gt; ಮಾನವ ಸಂಪನ್ಮೂಲ ಸೆಟ್ಟಿಂಗ್‌ಗಳಲ್ಲಿ ನೌಕರರ ಹೆಸರಿಸುವ ವ್ಯವಸ್ಥೆಯನ್ನು ಹೊಂದಿಸಿ
 DocType: Material Request Plan Item,Required Quantity,ಅಗತ್ಯವಿರುವ ಪ್ರಮಾಣ
 DocType: Lab Test Template,Lab Test Template,ಲ್ಯಾಬ್ ಟೆಸ್ಟ್ ಟೆಂಪ್ಲೇಟು
 apps/erpnext/erpnext/setup/doctype/company/company.py,Sales Account,ಮಾರಾಟದ ಖಾತೆ
@@ -6369,7 +6374,6 @@
 DocType: Request for Quotation Item,Project Name,ಪ್ರಾಜೆಕ್ಟ್ ಹೆಸರು
 apps/erpnext/erpnext/regional/italy/utils.py,Please set the Customer Address,ದಯವಿಟ್ಟು ಗ್ರಾಹಕ ವಿಳಾಸವನ್ನು ಹೊಂದಿಸಿ
 DocType: Customer,Mention if non-standard receivable account,ಬಗ್ಗೆ ಸ್ಟಾಂಡರ್ಡ್ ಅಲ್ಲದ ಸ್ವೀಕೃತಿ ಖಾತೆಯನ್ನು ವೇಳೆ
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Customer &gt; Customer Group &gt; Territory,ಗ್ರಾಹಕ&gt; ಗ್ರಾಹಕ ಗುಂಪು&gt; ಪ್ರದೇಶ
 DocType: Bank,Plaid Access Token,ಪ್ಲೈಡ್ ಪ್ರವೇಶ ಟೋಕನ್
 apps/erpnext/erpnext/hr/doctype/employee_benefit_application/employee_benefit_application.py,Please add the remaining benefits {0} to any of the existing component,ಅಸ್ತಿತ್ವದಲ್ಲಿರುವ ಯಾವುದೇ ಘಟಕಕ್ಕೆ ದಯವಿಟ್ಟು ಉಳಿದ ಪ್ರಯೋಜನಗಳನ್ನು {0} ಸೇರಿಸಿ
 DocType: Journal Entry Account,If Income or Expense,ವೇಳೆ ಆದಾಯ ಅಥವಾ ಖರ್ಚು
@@ -6629,8 +6633,6 @@
 apps/erpnext/erpnext/buying/utils.py,Please enter quantity for Item {0},ಐಟಂ ಪ್ರಮಾಣ ನಮೂದಿಸಿ {0}
 DocType: Quality Procedure,Processes,ಪ್ರಕ್ರಿಯೆಗಳು
 DocType: Shift Type,First Check-in and Last Check-out,ಮೊದಲ ಚೆಕ್-ಇನ್ ಮತ್ತು ಕೊನೆಯ ಚೆಕ್- .ಟ್
-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/regional/report/hsn_wise_summary_of_outward_supplies/hsn_wise_summary_of_outward_supplies.py,Total Taxable Amount,ಒಟ್ಟು ತೆರಿಗೆ ಮೊತ್ತ
 DocType: Employee External Work History,Employee External Work History,ಬಾಹ್ಯ ಕೆಲಸದ ಇತಿಹಾಸ
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.py,Job card {0} created,ಜಾಬ್ ಕಾರ್ಡ್ {0} ರಚಿಸಲಾಗಿದೆ
@@ -6667,6 +6669,7 @@
 apps/erpnext/erpnext/accounts/doctype/payment_terms_template/payment_terms_template.py,Combined invoice portion must equal 100%,ಸಂಯೋಜಿತ ಇನ್ವಾಯ್ಸ್ ಭಾಗವು 100%
 DocType: Item Default,Default Expense Account,ಡೀಫಾಲ್ಟ್ ಖರ್ಚು ಖಾತೆ
 DocType: GST Account,CGST Account,ಸಿಜಿಎಸ್ಟಿ ಖಾತೆ
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Item Code &gt; Item Group &gt; Brand,ಐಟಂ ಕೋಡ್&gt; ಐಟಂ ಗುಂಪು&gt; ಬ್ರಾಂಡ್
 apps/erpnext/erpnext/education/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py,Student Email ID,ವಿದ್ಯಾರ್ಥಿ ಈಮೇಲ್ ಅಡ್ರೆಸ್
 DocType: Employee,Notice (days),ಎಚ್ಚರಿಕೆ ( ದಿನಗಳು)
 DocType: POS Closing Voucher Invoices,POS Closing Voucher Invoices,ಪಿಓಎಸ್ ಚೀಟಿ ರಶೀದಿ ಇನ್ವಾಯ್ಸ್ಗಳನ್ನು ಮುಕ್ತಾಯಗೊಳಿಸುತ್ತದೆ
@@ -7302,6 +7305,7 @@
 DocType: Maintenance Visit,Maintenance Date,ನಿರ್ವಹಣೆ ದಿನಾಂಕ
 DocType: Purchase Invoice Item,Rejected Serial No,ತಿರಸ್ಕರಿಸಲಾಗಿದೆ ಅನುಕ್ರಮ ಸಂಖ್ಯೆ
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py,Year start date or end date is overlapping with {0}. To avoid please set company,ವರ್ಷದ ಆರಂಭದ ದಿನಾಂಕ ಅಥವಾ ಅಂತಿಮ ದಿನಾಂಕ {0} ಜೊತೆ ಅತಿಕ್ರಮಿಸುವ. ತಪ್ಪಿಸಲು ಕಂಪನಿ ಸೆಟ್ ಮಾಡಿ
+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/selling/doctype/customer/customer.py,Please mention the Lead Name in Lead {0},ಲೀಡ್ನಲ್ಲಿರುವ ಲೀಡ್ ಹೆಸರು {0} ಅನ್ನು ದಯವಿಟ್ಟು ಗಮನಿಸಿ.
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py,Start date should be less than end date for Item {0},ಪ್ರಾರಂಭ ದಿನಾಂಕ ಐಟಂ ಅಂತಿಮ ದಿನಾಂಕವನ್ನು ಕಡಿಮೆ Shoulderstand {0}
 DocType: Shift Type,Auto Attendance Settings,ಸ್ವಯಂ ಹಾಜರಾತಿ ಸೆಟ್ಟಿಂಗ್‌ಗಳು
diff --git a/erpnext/translations/ko.csv b/erpnext/translations/ko.csv
index 8ff4e75..9ca23aa 100644
--- a/erpnext/translations/ko.csv
+++ b/erpnext/translations/ko.csv
@@ -168,7 +168,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py,Accountant,회계사
 apps/erpnext/erpnext/stock/report/item_price_stock/item_price_stock.py,Selling Price List,판매 가격리스트
 DocType: Patient,Tobacco Current Use,담배 현재 사용
-apps/erpnext/erpnext/stock/report/item_price_stock/item_price_stock.py,Selling Rate,판매율
+apps/erpnext/erpnext/selling/report/customer_wise_item_price/customer_wise_item_price.py,Selling Rate,판매율
 apps/erpnext/erpnext/erpnext_integrations/doctype/plaid_settings/plaid_settings.js,Please save your document before adding a new account,새 계정을 추가하기 전에 문서를 저장하십시오.
 DocType: Cost Center,Stock User,재고 사용자
 DocType: Soil Analysis,(Ca+Mg)/K,(Ca + Mg) / K
@@ -205,7 +205,6 @@
 DocType: Packed Item,Parent Detail docname,부모 상세 docName 같은
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py,"Reference: {0}, Item Code: {1} and Customer: {2}","참조 : {0}, 상품 코드 : {1} 및 고객 : {2}"
 apps/erpnext/erpnext/accounts/report/consolidated_financial_statement/consolidated_financial_statement.py,{0} {1} is not present in the parent company,모회사에 {0} {1}이 (가) 없습니다.
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Supplier &gt; Supplier Type,공급 업체&gt; 공급 업체 유형
 apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py,Trial Period End Date Cannot be before Trial Period Start Date,평가판 기간 종료 날짜는 평가판 기간 이전 일 수 없습니다. 시작 날짜
 apps/erpnext/erpnext/utilities/user_progress.py,Kg,KG
 DocType: Tax Withholding Category,Tax Withholding Category,세금 원천 징수 카테고리
@@ -319,6 +318,7 @@
 DocType: Quality Procedure Table,Responsible Individual,책임있는 개인
 DocType: Naming Series,Prefix,접두사
 apps/erpnext/erpnext/hr/notification/training_scheduled/training_scheduled.html,Event Location,행사 위치
+apps/erpnext/erpnext/selling/report/customer_wise_item_price/customer_wise_item_price.py,Available Stock,사용 가능한 재고
 DocType: Asset Settings,Asset Settings,자산 설정
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py,Consumable,소모품
 DocType: Student,B-,비-
@@ -352,6 +352,7 @@
 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 \
 				Serial No.",\ Item {0}이 \ Serial No.로 배달 보장 여부와 함께 추가되므로 일련 번호로 배송 할 수 없습니다.
+apps/erpnext/erpnext/education/doctype/instructor/instructor.py,Please setup Instructor Naming System in Education &gt; Education Settings,강사 네이밍 시스템&gt; 교육 환경 설정
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py,At least one mode of payment is required for POS invoice.,결제 적어도 하나의 모드는 POS 송장이 필요합니다.
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py,Batch no is required for batched item {0},일괄 처리 된 항목 {0}에 배치 번호가 필요합니다.
 DocType: Bank Statement Transaction Invoice Item,Bank Statement Transaction Invoice Item,은행 계좌 거래 송장 품목
@@ -880,7 +881,6 @@
 DocType: Vital Signs,Blood Pressure (systolic),혈압 (수축기)
 apps/erpnext/erpnext/controllers/buying_controller.py,{0} {1} is {2},{0} {1}은 (는) {2}입니다.
 DocType: Item Price,Valid Upto,유효한 개까지
-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: Training Event,Workshop,작업장
 DocType: Supplier Scorecard Scoring Standing,Warn Purchase Orders,구매 주문 경고
 apps/erpnext/erpnext/utilities/user_progress.py,List a few of your customers. They could be organizations or individuals.,고객의 몇 가지를 나열합니다.그들은 조직 또는 개인이 될 수 있습니다.
@@ -1690,7 +1690,6 @@
 DocType: Item Barcode,Item Barcode,상품의 바코드
 DocType: Delivery Trip,In Transit,대중 교통 수단
 DocType: Woocommerce Settings,Endpoints,종점
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Item Code &gt; Item Group &gt; Brand,상품 코드&gt; 상품 그룹&gt; 브랜드
 DocType: Shopping Cart Settings,Show Configure Button,구성 버튼 표시
 DocType: Quality Inspection Reading,Reading 6,6 읽기
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js,Cannot {0} {1} {2} without any negative outstanding invoice,하지 {0} {1} {2}없이 음의 뛰어난 송장 수
@@ -2055,6 +2054,7 @@
 DocType: Cheque Print Template,Payer Settings,지불 설정
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js,No pending Material Requests found to link for the given items.,주어진 아이템에 대한 링크가 보류중인 Material Requests가 없습니다.
 apps/erpnext/erpnext/public/js/utils/party.js,Select company first,먼저 회사 선택
+apps/erpnext/erpnext/accounts/general_ledger.py,Account: <b>{0}</b> is capital Work in progress and can not be updated by Journal Entry,계정 : <b>{0}</b> 은 (는) 진행중인 자본 작업이며 업무 일지 항목으로 업데이트 할 수 없습니다.
 apps/erpnext/erpnext/education/doctype/quiz/quiz.py,Compare List function takes on list arguments,목록 비교 함수는 목록 인수를 취합니다.
 DocType: Item Attribute Value,"This will be appended to the Item Code of the variant. For example, if your abbreviation is ""SM"", and the item code is ""T-SHIRT"", the item code of the variant will be ""T-SHIRT-SM""","이 변형의 상품 코드에 추가됩니다.귀하의 약어는 ""SM""이며, 예를 들어, 아이템 코드는 ""T-SHIRT"", ""T-SHIRT-SM""입니다 변형의 항목 코드"
 DocType: Salary Slip,Net Pay (in words) will be visible once you save the Salary Slip.,당신이 급여 슬립을 저장하면 (즉) 순 유료가 표시됩니다.
@@ -2241,6 +2241,7 @@
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js,Item 2,항목 2
 DocType: Pricing Rule,Validate Applied Rule,적용된 규칙 검증
 DocType: QuickBooks Migrator,Authorization Endpoint,권한 부여 엔드 포인트
+DocType: Employee Onboarding,Notify users by email,사용자에게 이메일로 알림
 DocType: Travel Request,International,국제 노동자 동맹
 DocType: Training Event,Training Event,교육 이벤트
 DocType: Item,Auto re-order,자동 재 주문
@@ -2855,7 +2856,6 @@
 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,같은 이름의 고객이 이미 있습니다.
-DocType: Contract,Inactive,비활성
 apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.js,This will submit Salary Slips and create accrual Journal Entry. Do you want to proceed?,급여 전표를 제출하고 발생 분개를 생성합니다. 진행 하시겠습니까?
 DocType: Purchase Invoice,Total Net Weight,총 순중량
 DocType: Purchase Order,Order Confirmation No,주문 확인 번호
@@ -3138,7 +3138,6 @@
 apps/erpnext/erpnext/accounts/party.py,Billing currency must be equal to either default company's currency or party account currency,결제 통화는 기본 회사의 통화 또는 당좌 계좌 통화와 같아야합니다.
 DocType: Packing Slip,Indicates that the package is a part of this delivery (Only Draft),패키지이 배달의 일부임을 나타냅니다 (만 안)
 apps/erpnext/erpnext/accounts/report/customer_ledger_summary/customer_ledger_summary.py,Closing Balance,폐쇄 균형
-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})가 없습니다.
 DocType: Soil Texture,Loam,옥토
 apps/erpnext/erpnext/controllers/accounts_controller.py,Row {0}: Due Date cannot be before posting date,행 {0} : 만기일은 게시일 이전 일 수 없습니다.
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py,Quantity for Item {0} must be less than {1},수량 항목에 대한 {0}보다 작아야합니다 {1}
@@ -3667,7 +3666,6 @@
 DocType: Stock Settings,Raise Material Request when stock reaches re-order level,재고가 다시 주문 수준에 도달 할 때 자료 요청을 올립니다
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py,Full-time,전 시간
 DocType: Payroll Entry,Employees,직원
-apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py,Please setup numbering series for Attendance via Setup &gt; Numbering Series,설정&gt; 번호 매기기 시리즈를 통해 출석을위한 번호 매기기 시리즈를 설정하십시오.
 DocType: Question,Single Correct Answer,단일 정답
 DocType: Employee,Contact Details,연락처 세부 사항
 DocType: C-Form,Received Date,받은 날짜
@@ -4300,6 +4298,7 @@
 DocType: Pricing Rule,Price or Product Discount,가격 또는 제품 할인
 apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.py,For row {0}: Enter planned qty,행 {0} : 계획 수량 입력
 DocType: Account,Income Account,수익 계정
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Customer &gt; Customer Group &gt; Territory,고객&gt; 고객 그룹&gt; 지역
 DocType: Payment Request,Amount in customer's currency,고객의 통화 금액
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js,Delivery,배달
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.py,Assigning Structures...,구조 지정 중 ...
@@ -4349,7 +4348,6 @@
 DocType: HR Settings,Check Vacancies On Job Offer Creation,구인 제안서 작성시 공석을 확인하십시오
 apps/erpnext/erpnext/utilities/user_progress.py,Go to Letterheads,편지지로 이동
 DocType: Subscription,Cancel At End Of Period,기간 만료시 취소
-apps/erpnext/erpnext/education/doctype/instructor/instructor.py,Please setup Instructor Naming System in Education &gt; Education Settings,강사 네이밍 시스템&gt; 교육 환경 설정
 apps/erpnext/erpnext/hr/doctype/employee_promotion/employee_promotion.js,Property already added,속성이 이미 추가되었습니다.
 DocType: Item Supplier,Item Supplier,부품 공급 업체
 apps/erpnext/erpnext/public/js/controllers/transaction.js,Please enter Item Code to get batch no,더 배치를 얻을 수 상품 코드를 입력하시기 바랍니다
@@ -4647,6 +4645,7 @@
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.js,Warning: Material Requested Qty is less than Minimum Order Qty,경고 : 수량 요청 된 자료는 최소 주문 수량보다 적은
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py,Account {0} is frozen,계정 {0} 동결
 DocType: Quiz Question,Quiz Question,퀴즈 질문
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Supplier &gt; Supplier Type,공급 업체&gt; 공급 업체 유형
 DocType: Company,Legal Entity / Subsidiary with a separate Chart of Accounts belonging to the Organization.,조직에 속한 계정의 별도의 차트와 법인 / 자회사.
 DocType: Payment Request,Mute Email,음소거 이메일
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py,"Food, Beverage & Tobacco","음식, 음료 및 담배"
@@ -5162,7 +5161,6 @@
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py,Delivery warehouse required for stock item {0},배송 창고 재고 항목에 필요한 {0}
 DocType: Packing Slip,The gross weight of the package. Usually net weight + packaging material weight. (for print),패키지의 총 무게.보통 그물 무게 + 포장 재료의 무게. (프린트)
 DocType: Assessment Plan,Program,프로그램
-apps/erpnext/erpnext/hr/doctype/employee/employee.py,Please setup Employee Naming System in Human Resource &gt; HR Settings,인력&gt; 인사말 설정에서 직원 네이밍 시스템을 설정하십시오.
 DocType: Accounts Settings,Users with this role are allowed to set frozen accounts and create / modify accounting entries against frozen accounts,이 역할이있는 사용자는 고정 된 계정에 대한 계정 항목을 수정 / 동결 계정을 설정하고 만들 수 있습니다
 ,Project Billing Summary,프로젝트 결제 요약
 DocType: Vital Signs,Cuts,자르다
@@ -5413,6 +5411,7 @@
 apps/erpnext/erpnext/quality_management/doctype/quality_review/quality_review_list.js,No Action,조치 없음
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js,Valuation type charges can not marked as Inclusive,평가 유형 요금은 포괄적으로 표시 할 수 없습니다
 DocType: POS Profile,Update Stock,재고 업데이트
+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/stock/doctype/packing_slip/packing_slip.js,Different UOM for items will lead to incorrect (Total) Net Weight value. Make sure that Net Weight of each item is in the same UOM.,항목에 대해 서로 다른 UOM가 잘못 (총) 순 중량 값으로 이어질 것입니다.각 항목의 순 중량이 동일한 UOM에 있는지 확인하십시오.
 DocType: Certification Application,Payment Details,지불 세부 사항
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py,BOM Rate,BOM 평가
@@ -5518,6 +5517,8 @@
 apps/erpnext/erpnext/accounts/doctype/monthly_distribution/monthly_distribution.py,Percentage Allocation should be equal to 100%,백분율 할당은 100 % 같아야
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js,Please select Posting Date before selecting Party,파티를 선택하기 전에 게시 날짜를 선택하세요
 apps/erpnext/erpnext/config/accounting.py,Payment Terms based on conditions,조건에 따른 지불 조건
+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: Program Enrollment,School House,학교 하우스
 DocType: Serial No,Out of AMC,AMC의 아웃
 DocType: Opportunity,Opportunity Amount,기회 금액
@@ -5721,6 +5722,7 @@
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py,Order/Quot %,주문 / 견적
 apps/erpnext/erpnext/config/healthcare.py,Record Patient Vitals,기록 환자의 생명
 DocType: Fee Schedule,Institution,제도
+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})가 없습니다.
 DocType: Asset,Partially Depreciated,부분적으로 상각
 DocType: Issue,Opening Time,영업 시간
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py,From and To dates required,일자 및 끝
@@ -5941,6 +5943,7 @@
 DocType: Quality Procedure Process,Link existing Quality Procedure.,기존 품질 절차 링크.
 apps/erpnext/erpnext/config/hr.py,Loans,융자
 DocType: Healthcare Service Unit,Healthcare Service Unit,의료 서비스 부서
+,Customer-wise Item Price,고객 현명한 상품 가격
 apps/erpnext/erpnext/public/js/financial_statements.js,Cash Flow Statement,현금 흐름표
 apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.py,No material request created,중요한 요청이 생성되지 않았습니다.
 apps/erpnext/erpnext/hr/doctype/loan_application/loan_application.py,Loan Amount cannot exceed Maximum Loan Amount of {0},대출 금액은 최대 대출 금액을 초과 할 수 없습니다 {0}
@@ -6207,6 +6210,7 @@
 apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py,Opening Value,영업 가치
 DocType: Salary Component,Formula,공식
 apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py,Serial #,직렬 #
+apps/erpnext/erpnext/hr/doctype/employee/employee.py,Please setup Employee Naming System in Human Resource &gt; HR Settings,인력&gt; 인사말 설정에서 직원 네이밍 시스템을 설정하십시오.
 DocType: Material Request Plan Item,Required Quantity,필요 수량
 DocType: Lab Test Template,Lab Test Template,실험실 테스트 템플릿
 apps/erpnext/erpnext/accounts/doctype/accounting_period/accounting_period.py,Accounting Period overlaps with {0},회계 기간이 {0}과 중복 됨
@@ -6457,7 +6461,6 @@
 DocType: Request for Quotation Item,Project Name,프로젝트 이름
 apps/erpnext/erpnext/regional/italy/utils.py,Please set the Customer Address,고객 주소를 설정하십시오.
 DocType: Customer,Mention if non-standard receivable account,언급 표준이 아닌 채권 계정의 경우
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Customer &gt; Customer Group &gt; Territory,고객&gt; 고객 그룹&gt; 지역
 DocType: Bank,Plaid Access Token,격자 무늬 액세스 토큰
 apps/erpnext/erpnext/hr/doctype/employee_benefit_application/employee_benefit_application.py,Please add the remaining benefits {0} to any of the existing component,나머지 기존 혜택 {0}을 기존 구성 요소에 추가하십시오.
 DocType: Journal Entry Account,If Income or Expense,만약 소득 또는 비용
@@ -6721,8 +6724,6 @@
 apps/erpnext/erpnext/buying/utils.py,Please enter quantity for Item {0},제품의 수량을 입력 해주십시오 {0}
 DocType: Quality Procedure,Processes,프로세스
 DocType: Shift Type,First Check-in and Last Check-out,첫 번째 체크인 및 마지막 체크 아웃
-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/regional/report/hsn_wise_summary_of_outward_supplies/hsn_wise_summary_of_outward_supplies.py,Total Taxable Amount,총 과세 금액
 DocType: Employee External Work History,Employee External Work History,직원 외부 일 역사
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.py,Job card {0} created,작업 카드 {0}이 생성되었습니다.
@@ -6759,6 +6760,7 @@
 apps/erpnext/erpnext/accounts/doctype/payment_terms_template/payment_terms_template.py,Combined invoice portion must equal 100%,결합 송장 부분은 100 %
 DocType: Item Default,Default Expense Account,기본 비용 계정
 DocType: GST Account,CGST Account,CGST 계정
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Item Code &gt; Item Group &gt; Brand,상품 코드&gt; 상품 그룹&gt; 브랜드
 apps/erpnext/erpnext/education/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py,Student Email ID,학생 이메일 ID
 DocType: Employee,Notice (days),공지 사항 (일)
 DocType: POS Closing Voucher Invoices,POS Closing Voucher Invoices,POS 마감 바우처 인보이스
@@ -7402,6 +7404,7 @@
 DocType: Maintenance Visit,Maintenance Date,유지 보수 날짜
 DocType: Purchase Invoice Item,Rejected Serial No,시리얼 No 거부
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py,Year start date or end date is overlapping with {0}. To avoid please set company,올해의 시작 날짜 또는 종료 날짜 {0}과 중첩된다. 회사를 설정하시기 바랍니다 방지하려면
+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/selling/doctype/customer/customer.py,Please mention the Lead Name in Lead {0},Lead {0}의 리드 이름을 언급하십시오.
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py,Start date should be less than end date for Item {0},시작 날짜는 항목에 대한 종료 날짜보다 작아야합니다 {0}
 DocType: Shift Type,Auto Attendance Settings,자동 출석 설정
diff --git a/erpnext/translations/ku.csv b/erpnext/translations/ku.csv
index 7a3b52e..1d0c5e5 100644
--- a/erpnext/translations/ku.csv
+++ b/erpnext/translations/ku.csv
@@ -162,7 +162,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py,Accountant,Hesabdar
 apps/erpnext/erpnext/stock/report/item_price_stock/item_price_stock.py,Selling Price List,Lîsteya bihayê bihayê
 DocType: Patient,Tobacco Current Use,Bikaranîna Pêdivî ye
-apps/erpnext/erpnext/stock/report/item_price_stock/item_price_stock.py,Selling Rate,Rêjeya firotanê
+apps/erpnext/erpnext/selling/report/customer_wise_item_price/customer_wise_item_price.py,Selling Rate,Rêjeya firotanê
 apps/erpnext/erpnext/erpnext_integrations/doctype/plaid_settings/plaid_settings.js,Please save your document before adding a new account,"Berî ku hûn hesabek nû zêde bikin, ji kerema xwe belgeya xwe hilînin"
 DocType: Cost Center,Stock User,Stock Bikarhêner
 DocType: Soil Analysis,(Ca+Mg)/K,(Ca + Mg) / K
@@ -198,7 +198,6 @@
 DocType: Packed Item,Parent Detail docname,docname Detail dê û bav
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py,"Reference: {0}, Item Code: {1} and Customer: {2}","World: Kurdî: {0}, Code babet: {1} û Mişterî: {2}"
 apps/erpnext/erpnext/accounts/report/consolidated_financial_statement/consolidated_financial_statement.py,{0} {1} is not present in the parent company,{0} {1} di şirketa bavê de ne
-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/accounts/doctype/subscription/subscription.py,Trial Period End Date Cannot be before Trial Period Start Date,Dîroka Dozgeriya Dawî Dîroka Berî Dema Dema Dema Dadgehê Dema Destpêk Dîrok Nabe
 apps/erpnext/erpnext/utilities/user_progress.py,Kg,kg
 DocType: Tax Withholding Category,Tax Withholding Category,Dabeşkirina Bacê
@@ -309,6 +308,7 @@
 DocType: Quality Procedure Table,Responsible Individual,Berpirsyar Kesane
 DocType: Naming Series,Prefix,Pêşkîte
 apps/erpnext/erpnext/hr/notification/training_scheduled/training_scheduled.html,Event Location,Cihê bûyerê
+apps/erpnext/erpnext/selling/report/customer_wise_item_price/customer_wise_item_price.py,Available Stock,Stock Stock heye
 DocType: Asset Settings,Asset Settings,Sîstema Sîgorteyê
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py,Consumable,bikaranînê
 DocType: Student,B-,B-
@@ -342,6 +342,7 @@
 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 \
 				Serial No.",Nabe ku Serial No ji hêla \ \ Şîfre {0} ve tê veşartin bête û bêyî dagirkirina hilbijêrî ji hêla \ Nîma Serial
+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 Navnekirina Sêwiran saz bikin
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py,At least one mode of payment is required for POS invoice.,De bi kêmanî yek mode of tezmînat ji bo fatûra POS pêwîst e.
 DocType: Bank Statement Transaction Invoice Item,Bank Statement Transaction Invoice Item,Bankeya Daxuyaniya Bexdayê ya Danûstandinê
 DocType: Salary Detail,Tax on flexible benefit,Baca li ser fînansaziya berbiçav
@@ -862,7 +863,6 @@
 DocType: Vital Signs,Blood Pressure (systolic),Pressure Pressure (systolic)
 apps/erpnext/erpnext/controllers/buying_controller.py,{0} {1} is {2},{0} {1} is {2}
 DocType: Item Price,Valid Upto,derbasdar Upto
-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 saz bikin
 DocType: Training Event,Workshop,Kargeh
 DocType: Supplier Scorecard Scoring Standing,Warn Purchase Orders,Biryarên kirînê bikujin
 apps/erpnext/erpnext/utilities/user_progress.py,List a few of your customers. They could be organizations or individuals.,"Lîsteya çend ji mişterîyên xwe. Ew dikarin bibin rêxistin, yan jî kesên."
@@ -1643,7 +1643,6 @@
 DocType: Item Barcode,Item Barcode,Barcode
 DocType: Delivery Trip,In Transit,Di Transit
 DocType: Woocommerce Settings,Endpoints,Endpoints
-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
 DocType: Shopping Cart Settings,Show Configure Button,Button Configure nîşan bide
 DocType: Quality Inspection Reading,Reading 6,Reading 6
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js,Cannot {0} {1} {2} without any negative outstanding invoice,Can ne {0} {1} {2} bêyî ku fatûra hilawîstî neyînî
@@ -2004,6 +2003,7 @@
 DocType: Cheque Print Template,Payer Settings,Settings Jaaniya
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js,No pending Material Requests found to link for the given items.,Naveroka Daxuyaniya Pêdivî nîne ku ji bo daneyên peywendîdar ve girêdayî.
 apps/erpnext/erpnext/public/js/utils/party.js,Select company first,Yekemîn yekemîn hilbijêre
+apps/erpnext/erpnext/accounts/general_ledger.py,Account: <b>{0}</b> is capital Work in progress and can not be updated by Journal Entry,Hesab: <b>{0}</b> sermaye Karê pêşveçûnê ye û nikare ji hêla Journal Entry-ê ve were nûve kirin
 apps/erpnext/erpnext/education/doctype/quiz/quiz.py,Compare List function takes on list arguments,Fonksiyonê Lîsteya Hevberdanê argumên lîsteyê digire
 DocType: Item Attribute Value,"This will be appended to the Item Code of the variant. For example, if your abbreviation is ""SM"", and the item code is ""T-SHIRT"", the item code of the variant will be ""T-SHIRT-SM""","Ev dê ji qanûna Babetê ji guhertoya bendên. Ji bo nimûne, eger kurtenivîsên SYR ji we &quot;SM&quot;, e û code babete de ye &quot;T-SHIRT&quot;, code babete ji yên ku guhertoya wê bibe &quot;T-SHIRT-SM&quot;"
 DocType: Salary Slip,Net Pay (in words) will be visible once you save the Salary Slip.,Pay Net (di peyvên) xuya wê carekê hûn Slip Salary li xilas bike.
@@ -2187,6 +2187,7 @@
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js,Item 2,Babetê 2
 DocType: Pricing Rule,Validate Applied Rule,Rêziknameya Serrastkirî derbas bikin
 DocType: QuickBooks Migrator,Authorization Endpoint,Daxuyaniya Endpoint
+DocType: Employee Onboarding,Notify users by email,Bikarhênerên bi e-nameyê agahdar bikin
 DocType: Travel Request,International,Navnetewî
 DocType: Training Event,Training Event,Event Training
 DocType: Item,Auto re-order,Auto re-da
@@ -2787,7 +2788,6 @@
 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
-DocType: Contract,Inactive,Bêkar
 apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.js,This will submit Salary Slips and create accrual Journal Entry. Do you want to proceed?,Ew ê ji bo salary slips pêşkêş dikin û navnîşa rojnameya rojnamegeriyê biafirînin. Ma hûn dixwazin pêşniyar bikin?
 DocType: Purchase Invoice,Total Net Weight,Net Net Weight
 DocType: Purchase Order,Order Confirmation No,Daxuyaniya Biryara No Na
@@ -3588,7 +3588,6 @@
 DocType: Stock Settings,Raise Material Request when stock reaches re-order level,Bilind Daxwaza Material dema stock asta re-da digihîje
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py,Full-time,Dijwar lîstin
 DocType: Payroll Entry,Employees,karmendên
-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: Question,Single Correct Answer,Bersiva Rast Yek
 DocType: Employee,Contact Details,Contact Details
 DocType: C-Form,Received Date,pêşwaziya Date
@@ -4195,6 +4194,7 @@
 DocType: Pricing Rule,Price or Product Discount,Bihayê an Discount Product
 apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.py,For row {0}: Enter planned qty,Ji bo row {0}
 DocType: Account,Income Account,Account hatina
+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: Payment Request,Amount in customer's currency,Şêwaz li currency mişterî
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js,Delivery,Şandinî
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.py,Assigning Structures...,Dabeşkirina strukturên ...
@@ -4243,7 +4243,6 @@
 DocType: HR Settings,Check Vacancies On Job Offer Creation,Afirandinên Li Ser Afirandina Pêşniyara Karê Vegerin
 apps/erpnext/erpnext/utilities/user_progress.py,Go to Letterheads,Biçe Letterheads
 DocType: Subscription,Cancel At End Of Period,Destpêk Ji Destpêka Dawîn
-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/hr/doctype/employee_promotion/employee_promotion.js,Property already added,Xanûbereya berê got
 DocType: Item Supplier,Item Supplier,Supplier babetî
 apps/erpnext/erpnext/public/js/controllers/transaction.js,Please enter Item Code to get batch no,Tikaye kodî babet bikeve ji bo hevîrê tune
@@ -4526,6 +4525,7 @@
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.js,Warning: Material Requested Qty is less than Minimum Order Qty,Hişyarî: Material Wîkîpediyayê Qty kêmtir ji Minimum Order Qty e
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py,Account {0} is frozen,Account {0} frozen e
 DocType: Quiz Question,Quiz Question,Pirsa Quiz
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Supplier &gt; Supplier Type,Hilberîner&gt; Tîpa pêşkêşkar
 DocType: Company,Legal Entity / Subsidiary with a separate Chart of Accounts belonging to the Organization.,Legal Entity / destekkirinê bi Chart cuda yên Accounts mensûbê Rêxistina.
 DocType: Payment Request,Mute Email,Mute Email
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py,"Food, Beverage & Tobacco","Food, Beverage &amp; tutunê"
@@ -5034,7 +5034,6 @@
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py,Delivery warehouse required for stock item {0},warehouse Delivery pêwîst bo em babete stock {0}
 DocType: Packing Slip,The gross weight of the package. Usually net weight + packaging material weight. (for print),Giraniya derewîn û ji pakêta. Bi piranî weight net + pakêta weight maddî. (Ji bo print)
 DocType: Assessment Plan,Program,Bername
-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: Accounts Settings,Users with this role are allowed to set frozen accounts and create / modify accounting entries against frozen accounts,"Bikarhêner li ser bi vê rola bi destûr ji bo bikarhênerên frozen biafirînin û / ya xeyrandin di entries, hesabgirê dijî bikarhênerên bêhest"
 ,Project Billing Summary,Danasîna Bilindkirina Projeyê
 DocType: Vital Signs,Cuts,Cuts
@@ -5278,6 +5277,7 @@
 apps/erpnext/erpnext/quality_management/doctype/quality_review/quality_review_list.js,No Action,Actionalakî tune
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js,Valuation type charges can not marked as Inclusive,doz type Valuation ne dikarin weke berfireh nîşankirin
 DocType: POS Profile,Update Stock,update Stock
+apps/erpnext/erpnext/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 saz bikin
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js,Different UOM for items will lead to incorrect (Total) Net Weight value. Make sure that Net Weight of each item is in the same UOM.,UOM cuda ji bo tomar dê ji bo Şaşî (Total) nirxa Loss Net rê. Bawer bî ku Loss Net ji hev babete di UOM heman e.
 DocType: Certification Application,Payment Details,Agahdarî
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py,BOM Rate,BOM Rate
@@ -5796,6 +5796,7 @@
 DocType: Quality Procedure Process,Link existing Quality Procedure.,Pêvajoya Kêmasiyê ya heyî girêdin.
 apps/erpnext/erpnext/config/hr.py,Loans,Deynî
 DocType: Healthcare Service Unit,Healthcare Service Unit,Yekîneya Xizmetiya Tenduristiyê
+,Customer-wise Item Price,Buhayê Kêrhatî ya Xerîdar
 apps/erpnext/erpnext/public/js/financial_statements.js,Cash Flow Statement,Daxûyanîya Flow Cash
 apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.py,No material request created,Naveroka maddî tune ne
 apps/erpnext/erpnext/hr/doctype/loan_application/loan_application.py,Loan Amount cannot exceed Maximum Loan Amount of {0},Deyn Mîqdar dikarin Maximum Mîqdar deyn ji mideyeka ne bêtir ji {0}
@@ -6056,6 +6057,7 @@
 apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py,Opening Value,Nirx vekirinê
 DocType: Salary Component,Formula,Formîl
 apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py,Serial #,Serial #
+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: Material Request Plan Item,Required Quantity,Quantity pêwîst
 DocType: Lab Test Template,Lab Test Template,Template Test Lab
 apps/erpnext/erpnext/setup/doctype/company/company.py,Sales Account,Hesabê firotanê
@@ -6300,7 +6302,6 @@
 DocType: Request for Quotation Item,Project Name,Navê Project
 apps/erpnext/erpnext/regional/italy/utils.py,Please set the Customer Address,Ji kerema xwe Navnîşa Xerîdar bicîh bikin
 DocType: Customer,Mention if non-standard receivable account,"Behs, eger ne-standard account teleb"
-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: Bank,Plaid Access Token,Plaid Access Token
 apps/erpnext/erpnext/hr/doctype/employee_benefit_application/employee_benefit_application.py,Please add the remaining benefits {0} to any of the existing component,Ji kerema xwe ji berjewendiyên mayîn {0} ji her yek ji beşên heyî yên nû ve zêde bikin
 DocType: Journal Entry Account,If Income or Expense,Ger Hatinê an jî Expense
@@ -6596,6 +6597,7 @@
 apps/erpnext/erpnext/accounts/doctype/payment_terms_template/payment_terms_template.py,Combined invoice portion must equal 100%,Beşek hevpeymaniya yekgirtî 100%
 DocType: Item Default,Default Expense Account,Account Default Expense
 DocType: GST Account,CGST Account,Hesabê CGST
+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/education/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py,Student Email ID,Xwendekarên ID Email
 DocType: Employee,Notice (days),Notice (rojan)
 DocType: POS Closing Voucher Invoices,POS Closing Voucher Invoices,POS Vooter Daxistin
@@ -7231,6 +7233,7 @@
 DocType: Maintenance Visit,Maintenance Date,Date Maintenance
 DocType: Purchase Invoice Item,Rejected Serial No,No Serial red
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py,Year start date or end date is overlapping with {0}. To avoid please set company,date destpêka salê de an roja dawî gihîjte bi {0}. To rê ji kerema xwe ve set company
+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/maintenance/doctype/maintenance_schedule/maintenance_schedule.py,Start date should be less than end date for Item {0},Start date divê kêmtir ji roja dawî ji bo babet bê {0}
 DocType: Shift Type,Auto Attendance Settings,Mîhengên Beşdariya Auto
 DocType: Item,"Example: ABCD.#####
diff --git a/erpnext/translations/lo.csv b/erpnext/translations/lo.csv
index 5917197..c75883a 100644
--- a/erpnext/translations/lo.csv
+++ b/erpnext/translations/lo.csv
@@ -168,7 +168,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py,Accountant,ບັນຊີ
 apps/erpnext/erpnext/stock/report/item_price_stock/item_price_stock.py,Selling Price List,ລາຄາຂາຍລາຄາ
 DocType: Patient,Tobacco Current Use,Tobacco Current Use
-apps/erpnext/erpnext/stock/report/item_price_stock/item_price_stock.py,Selling Rate,ອັດຕາການຂາຍ
+apps/erpnext/erpnext/selling/report/customer_wise_item_price/customer_wise_item_price.py,Selling Rate,ອັດຕາການຂາຍ
 apps/erpnext/erpnext/erpnext_integrations/doctype/plaid_settings/plaid_settings.js,Please save your document before adding a new account,ກະລຸນາບັນທຶກເອກະສານຂອງທ່ານກ່ອນທີ່ຈະເພີ່ມບັນຊີ ໃໝ່
 DocType: Cost Center,Stock User,User Stock
 DocType: Soil Analysis,(Ca+Mg)/K,(Ca + Mg) / K
@@ -205,7 +205,6 @@
 DocType: Packed Item,Parent Detail docname,ພໍ່ແມ່ຂໍ້ docname
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py,"Reference: {0}, Item Code: {1} and Customer: {2}","ອ້າງອິງ: {0}, ລະຫັດສິນຄ້າ: {1} ແລະລູກຄ້າ: {2}"
 apps/erpnext/erpnext/accounts/report/consolidated_financial_statement/consolidated_financial_statement.py,{0} {1} is not present in the parent company,{0} {1} ບໍ່ມີຢູ່ໃນບໍລິສັດແມ່
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Supplier &gt; Supplier Type,ຜູ້ສະ ໜອງ ສິນຄ້າ&gt; ປະເພດຜູ້ສະ ໜອງ ສິນຄ້າ
 apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py,Trial Period End Date Cannot be before Trial Period Start Date,ວັນທີສິ້ນສຸດການທົດລອງບໍ່ສາມາດຢູ່ໃນໄລຍະເວລາທົດລອງໄດ້
 apps/erpnext/erpnext/utilities/user_progress.py,Kg,ກິໂລກຣາມ
 DocType: Tax Withholding Category,Tax Withholding Category,ປະເພດພາສີອາກອນ
@@ -319,6 +318,7 @@
 DocType: Quality Procedure Table,Responsible Individual,ບຸກຄົນທີ່ຮັບຜິດຊອບ
 DocType: Naming Series,Prefix,ຄໍານໍາຫນ້າ
 apps/erpnext/erpnext/hr/notification/training_scheduled/training_scheduled.html,Event Location,ສະຖານທີ່ຈັດກິດຈະກໍາ
+apps/erpnext/erpnext/selling/report/customer_wise_item_price/customer_wise_item_price.py,Available Stock,ມີຫຸ້ນ
 DocType: Asset Settings,Asset Settings,ການຕັ້ງຄ່າຊັບສິນ
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py,Consumable,ຜູ້ບໍລິໂພກ
 DocType: Student,B-,B-
@@ -352,6 +352,7 @@
 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 \
 				Serial No.",ບໍ່ສາມາດຮັບປະກັນການຈັດສົ່ງໂດຍ Serial No as \ Item {0} ຖືກເພີ່ມແລະບໍ່ມີການຮັບປະກັນການຈັດສົ່ງໂດຍ \ Serial No.
+apps/erpnext/erpnext/education/doctype/instructor/instructor.py,Please setup Instructor Naming System in Education &gt; Education Settings,ກະລຸນາຕິດຕັ້ງລະບົບການຕັ້ງຊື່ຜູ້ສອນໃນການສຶກສາ&gt; ການຕັ້ງຄ່າການສຶກສາ
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py,At least one mode of payment is required for POS invoice.,ຢ່າງຫນ້ອຍຫນຶ່ງຮູບແບບຂອງການຈ່າຍເງິນເປັນສິ່ງຈໍາເປັນສໍາລັບໃບເກັບເງິນ POS.
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py,Batch no is required for batched item {0},ບໍ່ ຈຳ ເປັນຕ້ອງໃຊ້ ສຳ ລັບລາຍການທີ່ ກຳ ຈັດ batched {0}
 DocType: Bank Statement Transaction Invoice Item,Bank Statement Transaction Invoice Item,Bank Statement Transaction Invoice Item
@@ -880,7 +881,6 @@
 DocType: Vital Signs,Blood Pressure (systolic),ຄວາມດັນເລືອດ (systolic)
 apps/erpnext/erpnext/controllers/buying_controller.py,{0} {1} is {2},{0} {1} ແມ່ນ {2}
 DocType: Item Price,Valid Upto,ຖືກຕ້ອງບໍ່ເກີນ
-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: Training Event,Workshop,ກອງປະຊຸມ
 DocType: Supplier Scorecard Scoring Standing,Warn Purchase Orders,ເຕືອນໃບສັ່ງຊື້
 apps/erpnext/erpnext/utilities/user_progress.py,List a few of your customers. They could be organizations or individuals.,ບອກໄດ້ບໍ່ຫຼາຍປານໃດຂອງລູກຄ້າຂອງທ່ານ. ພວກເຂົາເຈົ້າສາມາດຈະມີອົງການຈັດຕັ້ງຫຼືບຸກຄົນ.
@@ -1672,7 +1672,6 @@
 DocType: Item Barcode,Item Barcode,Item Barcode
 DocType: Delivery Trip,In Transit,ໃນການຂົນສົ່ງ
 DocType: Woocommerce Settings,Endpoints,ຈຸດສິ້ນສຸດ
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Item Code &gt; Item Group &gt; Brand,ລະຫັດສິນຄ້າ&gt; ກຸ່ມລາຍການ&gt; ຍີ່ຫໍ້
 DocType: Shopping Cart Settings,Show Configure Button,ສະແດງປຸ່ມຕັ້ງຄ່າ
 DocType: Quality Inspection Reading,Reading 6,ອ່ານ 6
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js,Cannot {0} {1} {2} without any negative outstanding invoice,ສາມາດເຮັດໄດ້ບໍ່ {0} {1} {2} ໂດຍບໍ່ມີການໃບເກັບເງິນທີ່ຍັງຄ້າງຄາໃນທາງລົບ
@@ -2037,6 +2036,7 @@
 DocType: Cheque Print Template,Payer Settings,ການຕັ້ງຄ່າ payer
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js,No pending Material Requests found to link for the given items.,ບໍ່ມີການສະເຫນີຂໍ້ມູນວັດຖຸທີ່ຍັງຄ້າງຢູ່ເພື່ອເຊື່ອມຕໍ່ສໍາລັບລາຍການທີ່ກໍານົດໄວ້.
 apps/erpnext/erpnext/public/js/utils/party.js,Select company first,ເລືອກບໍລິສັດກ່ອນ
+apps/erpnext/erpnext/accounts/general_ledger.py,Account: <b>{0}</b> is capital Work in progress and can not be updated by Journal Entry,ບັນຊີ: <b>{0}</b> ແມ່ນທຶນການເຮັດວຽກທີ່ ກຳ ລັງ ດຳ ເນີນຢູ່ແລະບໍ່ສາມາດອັບເດດໄດ້ໂດຍວາລະສານ Entry
 apps/erpnext/erpnext/education/doctype/quiz/quiz.py,Compare List function takes on list arguments,ປຽບທຽບ ໜ້າ ທີ່ບັນຊີໃຊ້ເວລາໃນການໂຕ້ຖຽງບັນຊີ
 DocType: Item Attribute Value,"This will be appended to the Item Code of the variant. For example, if your abbreviation is ""SM"", and the item code is ""T-SHIRT"", the item code of the variant will be ""T-SHIRT-SM""","ນີ້ຈະໄດ້ຮັບການຜນວກເຂົ້າກັບຂໍ້ມູນລະຫັດຂອງຕົວແປ. ສໍາລັບການຍົກຕົວຢ່າງ, ຖ້າຫາກວ່າຕົວຫຍໍ້ຂອງທ່ານແມ່ນ &quot;SM&quot;, ແລະລະຫັດສິນຄ້າແມ່ນ &quot;ເສື້ອທີເຊີດ&quot;, ລະຫັດສິນຄ້າຂອງ variant ຈະ &quot;ເສື້ອທີເຊີດ, SM&quot;"
 DocType: Salary Slip,Net Pay (in words) will be visible once you save the Salary Slip.,ຈ່າຍສຸດທິ (ໃນຄໍາສັບຕ່າງໆ) ຈະສັງເກດເຫັນເມື່ອທ່ານຊ່ວຍປະຢັດ Slip ເງິນເດືອນໄດ້.
@@ -2223,6 +2223,7 @@
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js,Item 2,ລາຍການ 2
 DocType: Pricing Rule,Validate Applied Rule,ນຳ ໃຊ້ກົດລະບຽບການ ນຳ ໃຊ້ທີ່ຖືກຕ້ອງ
 DocType: QuickBooks Migrator,Authorization Endpoint,Endpoint ການອະນຸຍາດ
+DocType: Employee Onboarding,Notify users by email,ແຈ້ງເຕືອນຜູ້ໃຊ້ທາງອີເມວ
 DocType: Travel Request,International,ສາກົນ
 DocType: Training Event,Training Event,ກິດຈະກໍາການຝຶກອົບຮົມ
 DocType: Item,Auto re-order,Auto Re: ຄໍາສັ່ງ
@@ -2836,7 +2837,6 @@
 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,ລູກຄ້າທີ່ມີຊື່ດຽວກັນກໍ່ມີຢູ່ແລ້ວ
-DocType: Contract,Inactive,Inactive
 apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.js,This will submit Salary Slips and create accrual Journal Entry. Do you want to proceed?,ນີ້ຈະສົ່ງໃບຢັ້ງຢືນເງິນເດືອນແລະສ້າງບັນຊີເລກທະບຽນເຂົ້າ. ທ່ານຕ້ອງການດໍາເນີນການ?
 DocType: Purchase Invoice,Total Net Weight,ນ້ໍາຫນັກສຸດທິທັງຫມົດ
 DocType: Purchase Order,Order Confirmation No,Order Confirmation No
@@ -3119,7 +3119,6 @@
 apps/erpnext/erpnext/accounts/party.py,Billing currency must be equal to either default company's currency or party account currency,ສະກຸນເງິນໃບຢັ້ງຢືນຕ້ອງມີເງີນເທົ່າກັບສະກຸນເງິນຂອງສະກຸນເງິນຂອງບໍລິສັດຫຼືເງິນສະກຸນເງິນຂອງບໍລິສັດ
 DocType: Packing Slip,Indicates that the package is a part of this delivery (Only Draft),ຊີ້ໃຫ້ເຫັນວ່າຊຸດແມ່ນສ່ວນຫນຶ່ງຂອງການຈັດສົ່ງ (ພຽງແຕ່ Draft) ນີ້
 apps/erpnext/erpnext/accounts/report/customer_ledger_summary/customer_ledger_summary.py,Closing Balance,ການປິດຍອດ
-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: Soil Texture,Loam,Loam
 apps/erpnext/erpnext/controllers/accounts_controller.py,Row {0}: Due Date cannot be before posting date,ໄລຍະຫ່າງ {0}: ວັນທີ່ກໍານົດບໍ່ສາມາດເປັນມື້ກ່ອນວັນທີສົ່ງ
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py,Quantity for Item {0} must be less than {1},ປະລິມານສໍາລັບລາຍການ {0} ຕ້ອງຫນ້ອຍກ່ວາ {1}
@@ -3648,7 +3647,6 @@
 DocType: Stock Settings,Raise Material Request when stock reaches re-order level,ຍົກສູງບົດບາດການວັດສະດຸຂໍເວລາຫຸ້ນຮອດລະດັບ Re: ຄໍາສັ່ງ
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py,Full-time,ເຕັມເວລາ
 DocType: Payroll Entry,Employees,ພະນັກງານ
-apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py,Please setup numbering series for Attendance via Setup &gt; Numbering Series,ກະລຸນາຕິດຕັ້ງຊຸດ ໝາຍ ເລກ ສຳ ລັບການເຂົ້າຮຽນຜ່ານການຕັ້ງຄ່າ&gt; ເລກ ລຳ ດັບ
 DocType: Question,Single Correct Answer,ຄຳ ຕອບດຽວທີ່ຖືກຕ້ອງ
 DocType: Employee,Contact Details,ລາຍລະອຽດການຕິດຕໍ່
 DocType: C-Form,Received Date,ວັນທີ່ໄດ້ຮັບ
@@ -4264,6 +4262,7 @@
 DocType: Pricing Rule,Price or Product Discount,ລາຄາຫລືຫຼຸດລາຄາສິນຄ້າ
 apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.py,For row {0}: Enter planned qty,ສໍາຫລັບແຖວ {0}: ກະລຸນາໃສ່ qty ວາງແຜນ
 DocType: Account,Income Account,ບັນຊີລາຍໄດ້
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Customer &gt; Customer Group &gt; Territory,ລູກຄ້າ&gt; ກຸ່ມລູກຄ້າ&gt; ອານາເຂດ
 DocType: Payment Request,Amount in customer's currency,ຈໍານວນເງິນໃນສະກຸນເງິນຂອງລູກຄ້າ
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js,Delivery,ສົ່ງ
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.py,Assigning Structures...,ການມອບ ໝາຍ ໂຄງສ້າງ…
@@ -4313,7 +4312,6 @@
 DocType: HR Settings,Check Vacancies On Job Offer Creation,ກວດສອບການວ່າງວຽກໃນການສ້າງການສະ ເໜີ ວຽກ
 apps/erpnext/erpnext/utilities/user_progress.py,Go to Letterheads,Go to Letterheads
 DocType: Subscription,Cancel At End Of Period,ຍົກເລີກໃນເວລາສິ້ນສຸດໄລຍະເວລາ
-apps/erpnext/erpnext/education/doctype/instructor/instructor.py,Please setup Instructor Naming System in Education &gt; Education Settings,ກະລຸນາຕັ້ງລະບົບການຕັ້ງຊື່ຜູ້ສອນໃນການສຶກສາ&gt; ການຕັ້ງຄ່າການສຶກສາ
 apps/erpnext/erpnext/hr/doctype/employee_promotion/employee_promotion.js,Property already added,ຊັບສິນທີ່ໄດ້ເພີ່ມແລ້ວ
 DocType: Item Supplier,Item Supplier,ຜູ້ຜະລິດລາຍການ
 apps/erpnext/erpnext/public/js/controllers/transaction.js,Please enter Item Code to get batch no,ກະລຸນາໃສ່ລະຫັດສິນຄ້າເພື່ອໃຫ້ໄດ້ຮັບ batch ທີ່ບໍ່ມີ
@@ -4599,6 +4597,7 @@
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.js,Warning: Material Requested Qty is less than Minimum Order Qty,ການເຕືອນໄພ: ວັດສະດຸຂໍຈໍານວນແມ່ນຫນ້ອຍກ່ວາສັ່ງຊື້ຂັ້ນຕ່ໍາຈໍານວນ
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py,Account {0} is frozen,ບັນຊີ {0} ແມ່ນ frozen
 DocType: Quiz Question,Quiz Question,ຄຳ ຖາມຖາມ
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Supplier &gt; Supplier Type,ຜູ້ສະ ໜອງ ສິນຄ້າ&gt; ປະເພດຜູ້ສະ ໜອງ ສິນຄ້າ
 DocType: Company,Legal Entity / Subsidiary with a separate Chart of Accounts belonging to the Organization.,ນິຕິບຸກຄົນ / ບໍລິສັດຍ່ອຍທີ່ມີໃນຕາຕະລາງທີ່ແຍກຕ່າງຫາກຂອງບັນຊີເປັນອົງການຈັດຕັ້ງ.
 DocType: Payment Request,Mute Email,mute Email
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py,"Food, Beverage & Tobacco","ສະບຽງອາຫານ, ເຄື່ອງດື່ມແລະຢາສູບ"
@@ -5115,7 +5114,6 @@
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py,Delivery warehouse required for stock item {0},ຄັງສິນຄ້າຈັດສົ່ງສິນຄ້າຕ້ອງການສໍາລັບລາຍການຫຸ້ນ {0}
 DocType: Packing Slip,The gross weight of the package. Usually net weight + packaging material weight. (for print),ນ້ໍາລວມທັງຫມົດຂອງຊຸດການ. ປົກກະຕິແລ້ວນ້ໍາຫນັກສຸດທິ + ຫຸ້ມຫໍ່ນ້ໍາອຸປະກອນການ. (ສໍາລັບການພິມ)
 DocType: Assessment Plan,Program,ໂຄງການ
-apps/erpnext/erpnext/hr/doctype/employee/employee.py,Please setup Employee Naming System in Human Resource &gt; HR Settings,ກະລຸນາຕິດຕັ້ງລະບົບການຕັ້ງຊື່ພະນັກງານໃນຊັບພະຍາກອນມະນຸດ&gt; ການຕັ້ງຄ່າ HR
 DocType: Accounts Settings,Users with this role are allowed to set frozen accounts and create / modify accounting entries against frozen accounts,ຜູ້ໃຊ້ທີ່ມີພາລະບົດບາດນີ້ໄດ້ຖືກອະນຸຍາດໃຫ້ສ້າງຕັ້ງບັນຊີ frozen ແລະສ້າງ / ປັບປຸງແກ້ໄຂການອອກສຽງການບັນຊີກັບບັນຊີ frozen
 ,Project Billing Summary,ບົດສະຫຼຸບໃບເກັບເງິນຂອງໂຄງການ
 DocType: Vital Signs,Cuts,Cuts
@@ -5366,6 +5364,7 @@
 apps/erpnext/erpnext/quality_management/doctype/quality_review/quality_review_list.js,No Action,ບໍ່ມີການກະ ທຳ
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js,Valuation type charges can not marked as Inclusive,ຄ່າບໍລິການປະເພດການປະເມີນຄ່າບໍ່ສາມາດເຮັດເຄື່ອງຫມາຍເປັນ Inclusive
 DocType: POS Profile,Update Stock,ຫລັກຊັບ
+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/stock/doctype/packing_slip/packing_slip.js,Different UOM for items will lead to incorrect (Total) Net Weight value. Make sure that Net Weight of each item is in the same UOM.,UOM ທີ່ແຕກຕ່າງກັນສໍາລັບລາຍການທີ່ຈະນໍາໄປສູ່ການທີ່ບໍ່ຖືກຕ້ອງ (Total) ຄ່ານ້ໍາຫນັກສຸດທິ. ໃຫ້ແນ່ໃຈວ່ານ້ໍາຫນັກສຸດທິຂອງແຕ່ລະລາຍການແມ່ນຢູ່ໃນ UOM ດຽວກັນ.
 DocType: Certification Application,Payment Details,ລາຍລະອຽດການຊໍາລະເງິນ
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py,BOM Rate,BOM ອັດຕາ
@@ -5471,6 +5470,8 @@
 apps/erpnext/erpnext/accounts/doctype/monthly_distribution/monthly_distribution.py,Percentage Allocation should be equal to 100%,ອັດຕາສ່ວນການຈັດສັນຄວນຈະເທົ່າກັບ 100%
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js,Please select Posting Date before selecting Party,ກະລຸນາເລືອກວັນທີ່ປະກາດກ່ອນທີ່ຈະເລືອກພັກ
 apps/erpnext/erpnext/config/accounting.py,Payment Terms based on conditions,ເງື່ອນໄຂການຊໍາລະເງິນໂດຍອີງໃສ່ເງື່ອນໄຂ
+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: Program Enrollment,School House,ໂຮງຮຽນບ້ານ
 DocType: Serial No,Out of AMC,ອອກຈາກ AMC
 DocType: Opportunity,Opportunity Amount,Opportunity Amount
@@ -5674,6 +5675,7 @@
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py,Order/Quot %,ຄໍາສັ່ງ / quot%
 apps/erpnext/erpnext/config/healthcare.py,Record Patient Vitals,Record Patient Vitals
 DocType: Fee Schedule,Institution,ສະຖາບັນ
+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: Asset,Partially Depreciated,ຄ່າເສື່ອມລາຄາບາງສ່ວນ
 DocType: Issue,Opening Time,ທີ່ໃຊ້ເວລາເປີດ
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py,From and To dates required,ຈາກແລະໄປວັນທີ່ຄຸນຕ້ອງ
@@ -5894,6 +5896,7 @@
 DocType: Quality Procedure Process,Link existing Quality Procedure.,ເຊື່ອມໂຍງຂັ້ນຕອນຄຸນນະພາບທີ່ມີຢູ່.
 apps/erpnext/erpnext/config/hr.py,Loans,ເງິນກູ້
 DocType: Healthcare Service Unit,Healthcare Service Unit,ຫນ່ວຍບໍລິການສຸຂະພາບ
+,Customer-wise Item Price,ລາຄາສິນຄ້າຕາມຄວາມຕ້ອງການຂອງລູກຄ້າ
 apps/erpnext/erpnext/public/js/financial_statements.js,Cash Flow Statement,ຖະແຫຼງການກະແສເງິນສົດ
 apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.py,No material request created,ບໍ່ມີການຮ້ອງຂໍອຸປະກອນການສ້າງ
 apps/erpnext/erpnext/hr/doctype/loan_application/loan_application.py,Loan Amount cannot exceed Maximum Loan Amount of {0},ຈໍານວນເງິນກູ້ບໍ່ເກີນຈໍານວນເງິນກູ້ສູງສຸດຂອງ {0}
@@ -6160,6 +6163,7 @@
 apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py,Opening Value,ມູນຄ່າການເປີດ
 DocType: Salary Component,Formula,ສູດ
 apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py,Serial #,Serial:
+apps/erpnext/erpnext/hr/doctype/employee/employee.py,Please setup Employee Naming System in Human Resource &gt; HR Settings,ກະລຸນາຕິດຕັ້ງລະບົບການຕັ້ງຊື່ພະນັກງານໃນຊັບພະຍາກອນມະນຸດ&gt; ການຕັ້ງຄ່າ HR
 DocType: Material Request Plan Item,Required Quantity,ຈຳ ນວນທີ່ ຈຳ ເປັນ
 DocType: Lab Test Template,Lab Test Template,Lab Test Template
 apps/erpnext/erpnext/accounts/doctype/accounting_period/accounting_period.py,Accounting Period overlaps with {0},ໄລຍະເວລາການບັນຊີຊ້ອນກັນກັບ {0}
@@ -6410,7 +6414,6 @@
 DocType: Request for Quotation Item,Project Name,ຊື່ໂຄງການ
 apps/erpnext/erpnext/regional/italy/utils.py,Please set the Customer Address,ກະລຸນາ ກຳ ນົດທີ່ຢູ່ຂອງລູກຄ້າ
 DocType: Customer,Mention if non-standard receivable account,ເວົ້າເຖິງຖ້າຫາກວ່າບໍ່ໄດ້ມາດຕະຖານບັນຊີລູກຫນີ້
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Customer &gt; Customer Group &gt; Territory,ລູກຄ້າ&gt; ກຸ່ມລູກຄ້າ&gt; ອານາເຂດ
 DocType: Bank,Plaid Access Token,Token Plaid Access Token
 apps/erpnext/erpnext/hr/doctype/employee_benefit_application/employee_benefit_application.py,Please add the remaining benefits {0} to any of the existing component,ກະລຸນາເພີ່ມຜົນປະໂຫຍດສ່ວນທີ່ເຫລືອ {0} ໃຫ້ກັບອົງປະກອບທີ່ມີຢູ່
 DocType: Journal Entry Account,If Income or Expense,ຖ້າຫາກລາຍໄດ້ຫຼືຄ່າໃຊ້ຈ່າຍ
@@ -6674,8 +6677,6 @@
 apps/erpnext/erpnext/buying/utils.py,Please enter quantity for Item {0},ກະລຸນາໃສ່ປະລິມານສໍາລັບລາຍການ {0}
 DocType: Quality Procedure,Processes,ຂະບວນການຕ່າງໆ
 DocType: Shift Type,First Check-in and Last Check-out,ການກວດສອບຄັ້ງ ທຳ ອິດແລະການກວດສອບຄັ້ງສຸດທ້າຍ
-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/regional/report/hsn_wise_summary_of_outward_supplies/hsn_wise_summary_of_outward_supplies.py,Total Taxable Amount,ລວມຈໍານວນເງິນທີ່ຈ່າຍໄດ້
 DocType: Employee External Work History,Employee External Work History,ພະນັກງານປະຫວັດການເຮັດ External
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.py,Job card {0} created,ບັດວຽກ {0} ສ້າງ
@@ -6712,6 +6713,7 @@
 apps/erpnext/erpnext/accounts/doctype/payment_terms_template/payment_terms_template.py,Combined invoice portion must equal 100%,ສ່ວນໃບຮັບເງິນລວມຈະຕ້ອງເທົ່າກັບ 100%
 DocType: Item Default,Default Expense Account,ບັນຊີມາດຕະຖານຄ່າໃຊ້ຈ່າຍ
 DocType: GST Account,CGST Account,ບັນຊີ CGST
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Item Code &gt; Item Group &gt; Brand,ລະຫັດສິນຄ້າ&gt; ກຸ່ມລາຍການ&gt; ຍີ່ຫໍ້
 apps/erpnext/erpnext/education/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py,Student Email ID,ID Email ນັກສຶກສາ
 DocType: Employee,Notice (days),ຫນັງສືແຈ້ງການ (ວັນ)
 DocType: POS Closing Voucher Invoices,POS Closing Voucher Invoices,ໃບຢັ້ງຢືນການປິດໃບຢັ້ງຢືນ POS ໃບຢັ້ງຢືນ
@@ -7355,6 +7357,7 @@
 DocType: Maintenance Visit,Maintenance Date,ວັນທີ່ສະຫມັກບໍາລຸງຮັກສາ
 DocType: Purchase Invoice Item,Rejected Serial No,ປະຕິເສດບໍ່ມີ Serial
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py,Year start date or end date is overlapping with {0}. To avoid please set company,ປີວັນທີເລີ່ມຕົ້ນຫລືວັນທີ່ສິ້ນສຸດແມ່ນ overlapping ກັບ {0}. ເພື່ອຫຼີກເວັ້ນການກະລຸນາຕັ້ງບໍລິສັດ
+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/selling/doctype/customer/customer.py,Please mention the Lead Name in Lead {0},ກະລຸນາລະບຸຊື່ນໍາໃນ Lead {0}
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py,Start date should be less than end date for Item {0},ວັນທີ່ເລີ່ມຕົ້ນຄວນຈະມີຫນ້ອຍກ່ວາວັນທີ່ສິ້ນສຸດສໍາລັບລາຍການ {0}
 DocType: Shift Type,Auto Attendance Settings,ການຕັ້ງຄ່າການເຂົ້າຮຽນອັດຕະໂນມັດ
diff --git a/erpnext/translations/lt.csv b/erpnext/translations/lt.csv
index f9ed41b..620445d 100644
--- a/erpnext/translations/lt.csv
+++ b/erpnext/translations/lt.csv
@@ -168,7 +168,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py,Accountant,buhalteris
 apps/erpnext/erpnext/stock/report/item_price_stock/item_price_stock.py,Selling Price List,Pardavimo kainoraštis
 DocType: Patient,Tobacco Current Use,Tabako vartojimas
-apps/erpnext/erpnext/stock/report/item_price_stock/item_price_stock.py,Selling Rate,Pardavimo norma
+apps/erpnext/erpnext/selling/report/customer_wise_item_price/customer_wise_item_price.py,Selling Rate,Pardavimo norma
 apps/erpnext/erpnext/erpnext_integrations/doctype/plaid_settings/plaid_settings.js,Please save your document before adding a new account,"Prieš pridėdami naują sąskaitą, išsaugokite savo dokumentą"
 DocType: Cost Center,Stock User,akcijų Vartotojas
 DocType: Soil Analysis,(Ca+Mg)/K,(Ca + Mg) / K
@@ -205,7 +205,6 @@
 DocType: Packed Item,Parent Detail docname,Tėvų Išsamiau DOCNAME
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py,"Reference: {0}, Item Code: {1} and Customer: {2}","Nuoroda: {0}, Prekės kodas: {1} ir klientų: {2}"
 apps/erpnext/erpnext/accounts/report/consolidated_financial_statement/consolidated_financial_statement.py,{0} {1} is not present in the parent company,{0} {1} nėra patronuojančioje įmonėje
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Supplier &gt; Supplier Type,Tiekėjas&gt; Tiekėjo tipas
 apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py,Trial Period End Date Cannot be before Trial Period Start Date,Bandymo pabaigos data negali būti prieš bandomojo laikotarpio pradžios datą
 apps/erpnext/erpnext/utilities/user_progress.py,Kg,Kilogramas
 DocType: Tax Withholding Category,Tax Withholding Category,Mokestinių pajamų kategorija
@@ -319,6 +318,7 @@
 DocType: Quality Procedure Table,Responsible Individual,Atsakingas asmuo
 DocType: Naming Series,Prefix,priešdėlis
 apps/erpnext/erpnext/hr/notification/training_scheduled/training_scheduled.html,Event Location,Renginio vieta
+apps/erpnext/erpnext/selling/report/customer_wise_item_price/customer_wise_item_price.py,Available Stock,Turimos atsargos
 DocType: Asset Settings,Asset Settings,Turto nustatymai
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py,Consumable,vartojimo
 DocType: Student,B-,B-
@@ -352,6 +352,7 @@
 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 \
 				Serial No.","Negali užtikrinti pristatymo pagal serijos numerį, nes \ Priemonė {0} yra pridėta su ir be įsitikinimo pristatymu pagal serijos numerį."
+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/accounts/doctype/sales_invoice/sales_invoice.py,At least one mode of payment is required for POS invoice.,Bent vienas režimas mokėjimo reikalingas POS sąskaitą.
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py,Batch no is required for batched item {0},Siunčiamos prekės {0} partijos nereikia
 DocType: Bank Statement Transaction Invoice Item,Bank Statement Transaction Invoice Item,Banko sąskaita faktūra
@@ -1670,7 +1671,6 @@
 DocType: Item Barcode,Item Barcode,Prekės brūkšninis kodas
 DocType: Delivery Trip,In Transit,Tranzitu
 DocType: Woocommerce Settings,Endpoints,Galutiniai taškai
-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
 DocType: Shopping Cart Settings,Show Configure Button,Rodyti mygtuką Konfigūruoti
 DocType: Quality Inspection Reading,Reading 6,Skaitymas 6
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js,Cannot {0} {1} {2} without any negative outstanding invoice,Negaliu {0} {1} {2} be jokio neigiamo išskirtinis sąskaita
@@ -2036,6 +2036,7 @@
 DocType: Cheque Print Template,Payer Settings,mokėtojo Nustatymai
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js,No pending Material Requests found to link for the given items.,"Nebuvo laukiamų medžiagų prašymų, susijusių su nurodytais elementais."
 apps/erpnext/erpnext/public/js/utils/party.js,Select company first,Pirmiausia pasirinkite įmonę
+apps/erpnext/erpnext/accounts/general_ledger.py,Account: <b>{0}</b> is capital Work in progress and can not be updated by Journal Entry,"Paskyra: <b>{0}</b> yra kapitalinis darbas, kurio nebaigta, o žurnalo įrašas negali jo atnaujinti"
 apps/erpnext/erpnext/education/doctype/quiz/quiz.py,Compare List function takes on list arguments,Funkcija Palyginti sąrašą imasi sąrašo argumentų
 DocType: Item Attribute Value,"This will be appended to the Item Code of the variant. For example, if your abbreviation is ""SM"", and the item code is ""T-SHIRT"", the item code of the variant will be ""T-SHIRT-SM""","Tai bus pridėtas prie elemento kodekso variante. Pavyzdžiui, jei jūsų santrumpa yra &quot;S.&quot;, o prekės kodas yra T-shirt &quot;, elementas kodas variantas bus&quot; T-shirt-SM &quot;"
 DocType: Salary Slip,Net Pay (in words) will be visible once you save the Salary Slip.,"Neto darbo užmokestis (žodžiais) bus matomas, kai jums sutaupyti darbo užmokestį."
@@ -2222,6 +2223,7 @@
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js,Item 2,2 punktas
 DocType: Pricing Rule,Validate Applied Rule,Patvirtinkite taikytą taisyklę
 DocType: QuickBooks Migrator,Authorization Endpoint,Autorizacijos pabaiga
+DocType: Employee Onboarding,Notify users by email,Praneškite vartotojams el. Paštu
 DocType: Travel Request,International,Tarptautinis
 DocType: Training Event,Training Event,Kvalifikacijos tobulinimo renginys
 DocType: Item,Auto re-order,Auto naujo užsakymas
@@ -2833,7 +2835,6 @@
 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
-DocType: Contract,Inactive,Neaktyvus
 apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.js,This will submit Salary Slips and create accrual Journal Entry. Do you want to proceed?,Tai pateikia Atlyginimo lapelius ir sukuria kaupimo žurnalo įrašą. Ar norite testi?
 DocType: Purchase Invoice,Total Net Weight,Bendras grynasis svoris
 DocType: Purchase Order,Order Confirmation No,Užsakymo patvirtinimo Nr
@@ -3116,7 +3117,6 @@
 apps/erpnext/erpnext/accounts/party.py,Billing currency must be equal to either default company's currency or party account currency,"Atsiskaitymo valiuta turi būti lygi arba numatytojo įmonės valiuta, arba šalies sąskaitos valiuta"
 DocType: Packing Slip,Indicates that the package is a part of this delivery (Only Draft),"Nurodo, kad paketas yra šio pristatymo (tik projekto) dalis"
 apps/erpnext/erpnext/accounts/report/customer_ledger_summary/customer_ledger_summary.py,Closing Balance,Likutis
-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}
 DocType: Soil Texture,Loam,Loam
 apps/erpnext/erpnext/controllers/accounts_controller.py,Row {0}: Due Date cannot be before posting date,Eilutė {0}: mokėjimo data negali būti prieš paskelbimo datą
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py,Quantity for Item {0} must be less than {1},Kiekis už prekę {0} turi būti mažesnis nei {1}
@@ -3645,7 +3645,6 @@
 DocType: Stock Settings,Raise Material Request when stock reaches re-order level,Pakelkite Material užklausą Kai akcijų pasiekia naujo užsakymo lygį
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py,Full-time,Pilnas laikas
 DocType: Payroll Entry,Employees,darbuotojai
-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: Question,Single Correct Answer,Vienintelis teisingas atsakymas
 DocType: Employee,Contact Details,Kontaktiniai duomenys
 DocType: C-Form,Received Date,gavo data
@@ -4260,6 +4259,7 @@
 DocType: Pricing Rule,Price or Product Discount,Kainos ar produkto nuolaida
 apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.py,For row {0}: Enter planned qty,Eilutėje {0}: įveskite numatytą kiekį
 DocType: Account,Income Account,pajamų sąskaita
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Customer &gt; Customer Group &gt; Territory,Klientas&gt; Klientų grupė&gt; Teritorija
 DocType: Payment Request,Amount in customer's currency,Suma kliento valiuta
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js,Delivery,pristatymas
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.py,Assigning Structures...,Priskiriamos struktūros ...
@@ -4309,7 +4309,6 @@
 DocType: HR Settings,Check Vacancies On Job Offer Creation,Patikrinkite laisvų darbo vietų kūrimo darbo vietas
 apps/erpnext/erpnext/utilities/user_progress.py,Go to Letterheads,Eikite į &quot;Letterheads&quot;
 DocType: Subscription,Cancel At End Of Period,Atšaukti pabaigos laikotarpį
-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/hr/doctype/employee_promotion/employee_promotion.js,Property already added,Turtas jau pridėtas
 DocType: Item Supplier,Item Supplier,Prekė Tiekėjas
 apps/erpnext/erpnext/public/js/controllers/transaction.js,Please enter Item Code to get batch no,Prašome įvesti Prekės kodas gauti partiją nėra
@@ -4595,6 +4594,7 @@
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.js,Warning: Material Requested Qty is less than Minimum Order Qty,Įspėjimas: Medžiaga Prašoma Kiekis yra mažesnis nei minimalus užsakymas Kiekis
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py,Account {0} is frozen,Sąskaita {0} yra sušaldyti
 DocType: Quiz Question,Quiz Question,Viktorinos klausimas
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Supplier &gt; Supplier Type,Tiekėjas&gt; Tiekėjo tipas
 DocType: Company,Legal Entity / Subsidiary with a separate Chart of Accounts belonging to the Organization.,"Juridinio asmens / Dukterinė įmonė su atskiru Chart sąskaitų, priklausančių organizacijos."
 DocType: Payment Request,Mute Email,Nutildyti paštas
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py,"Food, Beverage & Tobacco","Maistas, gėrimai ir tabako"
@@ -5111,7 +5111,6 @@
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py,Delivery warehouse required for stock item {0},Pristatymas sandėlis reikalingas akcijų punkte {0}
 DocType: Packing Slip,The gross weight of the package. Usually net weight + packaging material weight. (for print),Bendras svoris pakuotės. Paprastai neto masė + pakavimo medžiagos svorio. (Spausdinimo)
 DocType: Assessment Plan,Program,programa
-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: Accounts Settings,Users with this role are allowed to set frozen accounts and create / modify accounting entries against frozen accounts,"Vartotojai, turintys šį vaidmenį yra leidžiama nustatyti įšaldytas sąskaitas ir sukurti / pakeisti apskaitos įrašus prieš įšaldytų sąskaitų"
 ,Project Billing Summary,Projekto atsiskaitymo suvestinė
 DocType: Vital Signs,Cuts,Gabalai
@@ -5466,6 +5465,8 @@
 apps/erpnext/erpnext/accounts/doctype/monthly_distribution/monthly_distribution.py,Percentage Allocation should be equal to 100%,Procentas paskirstymas turi būti lygus 100%
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js,Please select Posting Date before selecting Party,Prašome pasirinkti Skelbimo data prieš pasirinkdami Šaliai
 apps/erpnext/erpnext/config/accounting.py,Payment Terms based on conditions,Mokėjimo sąlygos pagrįstos sąlygomis
+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: Program Enrollment,School House,Mokykla Namas
 DocType: Serial No,Out of AMC,Iš AMC
 DocType: Opportunity,Opportunity Amount,Galimybių suma
@@ -5668,6 +5669,7 @@
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py,Order/Quot %,Užsakymas / quot%
 apps/erpnext/erpnext/config/healthcare.py,Record Patient Vitals,Įrašykite Pacientų Vital
 DocType: Fee Schedule,Institution,institucija
+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}
 DocType: Asset,Partially Depreciated,dalinai nudėvimas
 DocType: Issue,Opening Time,atidarymo laikas
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py,From and To dates required,"Iš ir į datas, reikalingų"
@@ -5888,6 +5890,7 @@
 DocType: Quality Procedure Process,Link existing Quality Procedure.,Susiekite esamą kokybės procedūrą.
 apps/erpnext/erpnext/config/hr.py,Loans,Paskolos
 DocType: Healthcare Service Unit,Healthcare Service Unit,Sveikatos priežiūros tarnybos skyrius
+,Customer-wise Item Price,Prekės kaina pagal klientą
 apps/erpnext/erpnext/public/js/financial_statements.js,Cash Flow Statement,Pinigų srautų ataskaita
 apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.py,No material request created,Nepateiktas jokių svarbių užklausų
 apps/erpnext/erpnext/hr/doctype/loan_application/loan_application.py,Loan Amount cannot exceed Maximum Loan Amount of {0},Paskolos suma negali viršyti maksimalios paskolos sumos iš {0}
@@ -6154,6 +6157,7 @@
 apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py,Opening Value,atidarymo kaina
 DocType: Salary Component,Formula,formulė
 apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py,Serial #,Serijinis #
+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: Material Request Plan Item,Required Quantity,Reikalingas kiekis
 DocType: Lab Test Template,Lab Test Template,Laboratorijos bandymo šablonas
 apps/erpnext/erpnext/accounts/doctype/accounting_period/accounting_period.py,Accounting Period overlaps with {0},Apskaitos laikotarpis sutampa su {0}
@@ -6404,7 +6408,6 @@
 DocType: Request for Quotation Item,Project Name,projekto pavadinimas
 apps/erpnext/erpnext/regional/italy/utils.py,Please set the Customer Address,Prašome nustatyti kliento adresą
 DocType: Customer,Mention if non-standard receivable account,"Nurodyk, jei gautina nestandartinis sąskaita"
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Customer &gt; Customer Group &gt; Territory,Klientas&gt; Klientų grupė&gt; Teritorija
 DocType: Bank,Plaid Access Token,Plaid Access Token
 apps/erpnext/erpnext/hr/doctype/employee_benefit_application/employee_benefit_application.py,Please add the remaining benefits {0} to any of the existing component,Pridėkite likusią naudą {0} bet kuriai iš esamų komponentų
 DocType: Journal Entry Account,If Income or Expense,Jei pajamos ar sąnaudos
@@ -6667,8 +6670,6 @@
 apps/erpnext/erpnext/buying/utils.py,Please enter quantity for Item {0},Prašome įvesti kiekį punkte {0}
 DocType: Quality Procedure,Processes,Procesai
 DocType: Shift Type,First Check-in and Last Check-out,Pirmasis įsiregistravimas ir paskutinis išsiregistravimas
-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/regional/report/hsn_wise_summary_of_outward_supplies/hsn_wise_summary_of_outward_supplies.py,Total Taxable Amount,Visa apmokestinamoji suma
 DocType: Employee External Work History,Employee External Work History,Darbuotojų Išorinis Darbo istorija
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.py,Job card {0} created,Darbo kortelė {0} sukurta
@@ -6705,6 +6706,7 @@
 apps/erpnext/erpnext/accounts/doctype/payment_terms_template/payment_terms_template.py,Combined invoice portion must equal 100%,Kombinuota sąskaitos faktūros dalis turi būti lygi 100%
 DocType: Item Default,Default Expense Account,Numatytasis išlaidų sąskaita
 DocType: GST Account,CGST Account,CGST sąskaita
+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/education/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py,Student Email ID,Studentų E-mail ID
 DocType: Employee,Notice (days),Pranešimas (dienų)
 DocType: POS Closing Voucher Invoices,POS Closing Voucher Invoices,POS uždarymo balso sąskaitos faktūros
@@ -7348,6 +7350,7 @@
 DocType: Maintenance Visit,Maintenance Date,priežiūra data
 DocType: Purchase Invoice Item,Rejected Serial No,Atmesta Serijos Nr
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py,Year start date or end date is overlapping with {0}. To avoid please set company,Metų pradžios datą arba pabaigos data sutampa su {0}. Norėdami išvengti nustatykite įmonę
+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/selling/doctype/customer/customer.py,Please mention the Lead Name in Lead {0},Prašome paminėti švino pavadinimą pirmaujančioje {0}
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py,Start date should be less than end date for Item {0},Pradžios data turėtų būti mažesnis nei pabaigos datos punkte {0}
 DocType: Shift Type,Auto Attendance Settings,Automatinio lankymo nustatymai
diff --git a/erpnext/translations/lv.csv b/erpnext/translations/lv.csv
index 9a66a63..a45b551 100644
--- a/erpnext/translations/lv.csv
+++ b/erpnext/translations/lv.csv
@@ -168,7 +168,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py,Accountant,Grāmatvedis
 apps/erpnext/erpnext/stock/report/item_price_stock/item_price_stock.py,Selling Price List,Pārdošanas cenrādis
 DocType: Patient,Tobacco Current Use,Tabakas patēriņš
-apps/erpnext/erpnext/stock/report/item_price_stock/item_price_stock.py,Selling Rate,Pārdošanas likme
+apps/erpnext/erpnext/selling/report/customer_wise_item_price/customer_wise_item_price.py,Selling Rate,Pārdošanas likme
 apps/erpnext/erpnext/erpnext_integrations/doctype/plaid_settings/plaid_settings.js,Please save your document before adding a new account,"Pirms jauna konta pievienošanas, lūdzu, saglabājiet to"
 DocType: Cost Center,Stock User,Stock User
 DocType: Soil Analysis,(Ca+Mg)/K,(Ca + Mg) / K
@@ -205,7 +205,6 @@
 DocType: Packed Item,Parent Detail docname,Parent Detail docname
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py,"Reference: {0}, Item Code: {1} and Customer: {2}","Reference: {0}, Produkta kods: {1} un Klients: {2}"
 apps/erpnext/erpnext/accounts/report/consolidated_financial_statement/consolidated_financial_statement.py,{0} {1} is not present in the parent company,{0} {1} mātes sabiedrībā nav
-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/accounts/doctype/subscription/subscription.py,Trial Period End Date Cannot be before Trial Period Start Date,Pārbaudes beigu datums nevar būt pirms pārbaudes laika sākuma datuma
 apps/erpnext/erpnext/utilities/user_progress.py,Kg,Kg
 DocType: Tax Withholding Category,Tax Withholding Category,Nodokļu ieturēšanas kategorija
@@ -318,6 +317,7 @@
 DocType: Quality Procedure Table,Responsible Individual,Atbildīgs indivīds
 DocType: Naming Series,Prefix,Priedēklis
 apps/erpnext/erpnext/hr/notification/training_scheduled/training_scheduled.html,Event Location,Pasākuma vieta
+apps/erpnext/erpnext/selling/report/customer_wise_item_price/customer_wise_item_price.py,Available Stock,Pieejamie krājumi
 DocType: Asset Settings,Asset Settings,Aktīvu iestatījumi
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py,Consumable,Patērējamās
 DocType: Student,B-,B-
@@ -351,6 +351,7 @@
 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 \
 				Serial No.","Nevaru nodrošināt piegādi ar kārtas numuru, jo \ Item {0} tiek pievienots ar un bez nodrošināšanas piegādes ar \ Serial Nr."
+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/accounts/doctype/sales_invoice/sales_invoice.py,At least one mode of payment is required for POS invoice.,Vismaz viens maksājuma veids ir nepieciešams POS rēķinu.
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py,Batch no is required for batched item {0},Partija {0} partijai nav nepieciešama
 DocType: Bank Statement Transaction Invoice Item,Bank Statement Transaction Invoice Item,Bankas izziņa Darījuma rēķina postenis
@@ -877,7 +878,6 @@
 DocType: Vital Signs,Blood Pressure (systolic),Asinsspiediens (sistolisks)
 apps/erpnext/erpnext/controllers/buying_controller.py,{0} {1} is {2},{0} {1} ir {2}
 DocType: Item Price,Valid Upto,Derīgs Līdz pat
-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: Training Event,Workshop,darbnīca
 DocType: Supplier Scorecard Scoring Standing,Warn Purchase Orders,Brīdināt pirkumu pasūtījumus
 apps/erpnext/erpnext/utilities/user_progress.py,List a few of your customers. They could be organizations or individuals.,Uzskaitīt daži no saviem klientiem. Tie varētu būt organizācijas vai privātpersonas.
@@ -1668,7 +1668,6 @@
 DocType: Item Barcode,Item Barcode,Postenis Barcode
 DocType: Delivery Trip,In Transit,Tranzītā
 DocType: Woocommerce Settings,Endpoints,Galarezultāti
-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
 DocType: Shopping Cart Settings,Show Configure Button,Rādīt konfigurēšanas pogu
 DocType: Quality Inspection Reading,Reading 6,Lasīšana 6
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js,Cannot {0} {1} {2} without any negative outstanding invoice,Nevar {0} {1} {2} bez jebkāda negatīva izcili rēķins
@@ -2033,6 +2032,7 @@
 DocType: Cheque Print Template,Payer Settings,maksātājs iestatījumi
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js,No pending Material Requests found to link for the given items.,"Netika atrasts materiālu pieprasījums, kas saistīts ar konkrētajiem priekšmetiem."
 apps/erpnext/erpnext/public/js/utils/party.js,Select company first,Vispirms izvēlieties uzņēmumu
+apps/erpnext/erpnext/accounts/general_ledger.py,Account: <b>{0}</b> is capital Work in progress and can not be updated by Journal Entry,"Konts: <b>{0}</b> ir kapitāls, kas turpina darbu, un žurnāla ieraksts to nevar atjaunināt"
 apps/erpnext/erpnext/education/doctype/quiz/quiz.py,Compare List function takes on list arguments,Funkcija Salīdzināt sarakstu uzņem saraksta argumentus
 DocType: Item Attribute Value,"This will be appended to the Item Code of the variant. For example, if your abbreviation is ""SM"", and the item code is ""T-SHIRT"", the item code of the variant will be ""T-SHIRT-SM""","Tas tiks pievienots Vienības kodeksa variantu. Piemēram, ja jūsu saīsinājums ir ""SM"", un pozīcijas kods ir ""T-krekls"", postenis kods variants būs ""T-krekls-SM"""
 DocType: Salary Slip,Net Pay (in words) will be visible once you save the Salary Slip.,"Neto Pay (vārdiem), būs redzams pēc tam, kad esat saglabāt algas aprēķinu."
@@ -2219,6 +2219,7 @@
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js,Item 2,Prece 2
 DocType: Pricing Rule,Validate Applied Rule,Apstipriniet piemēroto noteikumu
 DocType: QuickBooks Migrator,Authorization Endpoint,Autorizācijas parametrs
+DocType: Employee Onboarding,Notify users by email,Paziņojiet lietotājiem pa e-pastu
 DocType: Travel Request,International,Starptautisks
 DocType: Training Event,Training Event,Training Event
 DocType: Item,Auto re-order,Auto re-pasūtīt
@@ -2832,7 +2833,6 @@
 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
-DocType: Contract,Inactive,Neaktīvs
 apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.js,This will submit Salary Slips and create accrual Journal Entry. Do you want to proceed?,Tas iesniegs Algas likmes un izveidos uzkrājumu žurnāla ierakstu. Vai vēlaties turpināt?
 DocType: Purchase Invoice,Total Net Weight,Kopējais tīrsvars
 DocType: Purchase Order,Order Confirmation No,Pasūtījuma apstiprinājuma Nr
@@ -3115,7 +3115,6 @@
 apps/erpnext/erpnext/accounts/party.py,Billing currency must be equal to either default company's currency or party account currency,Norēķinu valūtai jābūt vienādai ar noklusējuma uzņēmuma valūtas vai partijas konta valūtu
 DocType: Packing Slip,Indicates that the package is a part of this delivery (Only Draft),"Norāda, ka pakete ir daļa no šīs piegādes (Tikai projekts)"
 apps/erpnext/erpnext/accounts/report/customer_ledger_summary/customer_ledger_summary.py,Closing Balance,Noslēguma bilance
-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}).
 DocType: Soil Texture,Loam,Loam
 apps/erpnext/erpnext/controllers/accounts_controller.py,Row {0}: Due Date cannot be before posting date,Rinda {0}: maksājuma datums nevar būt pirms izlikšanas datuma
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py,Quantity for Item {0} must be less than {1},Daudzums postenī {0} nedrīkst būt mazāks par {1}
@@ -3644,7 +3643,6 @@
 DocType: Stock Settings,Raise Material Request when stock reaches re-order level,Paaugstināt Materiālu pieprasījums kad akciju sasniedz atkārtoti pasūtījuma līmeni
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py,Full-time,Pilna laika
 DocType: Payroll Entry,Employees,darbinieki
-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: Question,Single Correct Answer,Viena pareiza atbilde
 DocType: Employee,Contact Details,Kontaktinformācija
 DocType: C-Form,Received Date,Saņēma Datums
@@ -4258,6 +4256,7 @@
 DocType: Pricing Rule,Price or Product Discount,Cena vai produkta atlaide
 apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.py,For row {0}: Enter planned qty,Rindai {0}: ievadiet plānoto daudzumu
 DocType: Account,Income Account,Ienākumu konta
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Customer &gt; Customer Group &gt; Territory,Klients&gt; Klientu grupa&gt; Teritorija
 DocType: Payment Request,Amount in customer's currency,Summa klienta valūtā
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js,Delivery,Nodošana
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.py,Assigning Structures...,Piešķirot struktūras ...
@@ -4307,7 +4306,6 @@
 DocType: HR Settings,Check Vacancies On Job Offer Creation,Pārbaudiet vakances darba piedāvājuma izveidē
 apps/erpnext/erpnext/utilities/user_progress.py,Go to Letterheads,Iet uz Letterheads
 DocType: Subscription,Cancel At End Of Period,Atcelt beigās periodā
-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/hr/doctype/employee_promotion/employee_promotion.js,Property already added,Īpašums jau ir pievienots
 DocType: Item Supplier,Item Supplier,Postenis piegādātājs
 apps/erpnext/erpnext/public/js/controllers/transaction.js,Please enter Item Code to get batch no,"Ievadiet posteņu kodu, lai iegūtu partiju nē"
@@ -4593,6 +4591,7 @@
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.js,Warning: Material Requested Qty is less than Minimum Order Qty,Brīdinājums: Materiāls Pieprasītā Daudz ir mazāks nekā minimālais pasūtījums Daudz
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py,Account {0} is frozen,Konts {0} ir sasalusi
 DocType: Quiz Question,Quiz Question,Viktorīnas jautājums
+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: Company,Legal Entity / Subsidiary with a separate Chart of Accounts belonging to the Organization.,"Juridiskā persona / meitas uzņēmums ar atsevišķu kontu plānu, kas pieder Organizācijai."
 DocType: Payment Request,Mute Email,Mute Email
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py,"Food, Beverage & Tobacco","Pārtika, dzērieni un tabakas"
@@ -5109,7 +5108,6 @@
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py,Delivery warehouse required for stock item {0},Piegāde noliktava nepieciešama akciju posteni {0}
 DocType: Packing Slip,The gross weight of the package. Usually net weight + packaging material weight. (for print),Bruto iepakojuma svars. Parasti neto svars + iepakojuma materiālu svara. (Drukāšanai)
 DocType: Assessment Plan,Program,programma
-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: Accounts Settings,Users with this role are allowed to set frozen accounts and create / modify accounting entries against frozen accounts,"Lietotāji ar šo lomu ir atļauts noteikt iesaldētos kontus, un izveidot / mainīt grāmatvedības ierakstus pret iesaldētos kontus"
 ,Project Billing Summary,Projekta norēķinu kopsavilkums
 DocType: Vital Signs,Cuts,Izcirtņi
@@ -5359,6 +5357,7 @@
 apps/erpnext/erpnext/quality_management/doctype/quality_review/quality_review_list.js,No Action,Nekāda darbība
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js,Valuation type charges can not marked as Inclusive,Vērtēšanas veida maksājumus nevar atzīmēts kā Inclusive
 DocType: POS Profile,Update Stock,Update Stock
+apps/erpnext/erpnext/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/stock/doctype/packing_slip/packing_slip.js,Different UOM for items will lead to incorrect (Total) Net Weight value. Make sure that Net Weight of each item is in the same UOM.,"Different UOM objektus, novedīs pie nepareizas (kopā) Neto svars vērtību. Pārliecinieties, ka neto svars katru posteni ir tādā pašā UOM."
 DocType: Certification Application,Payment Details,Maksājumu informācija
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py,BOM Rate,BOM Rate
@@ -5464,6 +5463,8 @@
 apps/erpnext/erpnext/accounts/doctype/monthly_distribution/monthly_distribution.py,Percentage Allocation should be equal to 100%,Procentuālais sadalījums būtu vienāda ar 100%
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js,Please select Posting Date before selecting Party,"Lūdzu, izvēlieties Publicēšanas datums pirms izvēloties puse"
 apps/erpnext/erpnext/config/accounting.py,Payment Terms based on conditions,"Maksājuma nosacījumi, pamatojoties uz nosacījumiem"
+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: Program Enrollment,School House,School House
 DocType: Serial No,Out of AMC,Out of AMC
 DocType: Opportunity,Opportunity Amount,Iespējas summa
@@ -5666,6 +5667,7 @@
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py,Order/Quot %,Pasūtījums / Quot%
 apps/erpnext/erpnext/config/healthcare.py,Record Patient Vitals,Ierakstīt Pacientu Vitals
 DocType: Fee Schedule,Institution,iestāde
+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}).
 DocType: Asset,Partially Depreciated,daļēji to nolietojums
 DocType: Issue,Opening Time,Atvēršanas laiks
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py,From and To dates required,No un uz datumiem nepieciešamo
@@ -5886,6 +5888,7 @@
 DocType: Quality Procedure Process,Link existing Quality Procedure.,Saistīt esošo kvalitātes procedūru.
 apps/erpnext/erpnext/config/hr.py,Loans,Aizdevumi
 DocType: Healthcare Service Unit,Healthcare Service Unit,Veselības aprūpes dienesta nodaļa
+,Customer-wise Item Price,Klienta ziņā preces cena
 apps/erpnext/erpnext/public/js/financial_statements.js,Cash Flow Statement,Naudas plūsmas pārskats
 apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.py,No material request created,Nav izveidots neviens materiāls pieprasījums
 apps/erpnext/erpnext/hr/doctype/loan_application/loan_application.py,Loan Amount cannot exceed Maximum Loan Amount of {0},Kredīta summa nedrīkst pārsniegt maksimālo summu {0}
@@ -6152,6 +6155,7 @@
 apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py,Opening Value,atklāšanas Value
 DocType: Salary Component,Formula,Formula
 apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py,Serial #,Sērijas #
+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: Material Request Plan Item,Required Quantity,Nepieciešamais daudzums
 DocType: Lab Test Template,Lab Test Template,Lab testēšanas veidne
 apps/erpnext/erpnext/accounts/doctype/accounting_period/accounting_period.py,Accounting Period overlaps with {0},Grāmatvedības periods pārklājas ar {0}
@@ -6241,6 +6245,7 @@
 DocType: Attendance Request,Half Day Date,Half Day Date
 DocType: Academic Year,Academic Year Name,Akadēmiskais gads Name
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py,{0} not allowed to transact with {1}. Please change the Company.,"{0} nav atļauts veikt darījumus ar {1}. Lūdzu, mainiet uzņēmumu."
+apps/erpnext/erpnext/hr/doctype/employee_tax_exemption_sub_category/employee_tax_exemption_sub_category.py,Max Exemption Amount cannot be greater than maximum exemption amount {0} of Tax Exemption Category {1},Maksimālā atbrīvojuma summa nevar būt lielāka par maksimālo atbrīvojuma summu {0} no nodokļa atbrīvojuma kategorijas {1}
 DocType: Sales Partner,Contact Desc,Contact Desc
 DocType: Email Digest,Send regular summary reports via Email.,Regulāri jānosūta kopsavilkuma ziņojumu pa e-pastu.
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py,Please set default account in Expense Claim Type {0},Lūdzu iestatīt noklusēto kontu Izdevumu prasījuma veida {0}
@@ -6401,7 +6406,6 @@
 DocType: Request for Quotation Item,Project Name,Projekta nosaukums
 apps/erpnext/erpnext/regional/italy/utils.py,Please set the Customer Address,"Lūdzu, iestatiet klienta adresi"
 DocType: Customer,Mention if non-standard receivable account,Pieminēt ja nestandarta debitoru konts
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Customer &gt; Customer Group &gt; Territory,Klients&gt; Klientu grupa&gt; Teritorija
 DocType: Bank,Plaid Access Token,Plaid piekļuves marķieris
 apps/erpnext/erpnext/hr/doctype/employee_benefit_application/employee_benefit_application.py,Please add the remaining benefits {0} to any of the existing component,"Lūdzu, pievienojiet atlikušos ieguvumus {0} jebkuram no esošajiem komponentiem"
 DocType: Journal Entry Account,If Income or Expense,Ja ieņēmumi vai izdevumi
@@ -6665,8 +6669,6 @@
 apps/erpnext/erpnext/buying/utils.py,Please enter quantity for Item {0},Ievadiet daudzumu postenī {0}
 DocType: Quality Procedure,Processes,Procesi
 DocType: Shift Type,First Check-in and Last Check-out,Pirmā reģistrēšanās un pēdējā reģistrēšanās
-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/regional/report/hsn_wise_summary_of_outward_supplies/hsn_wise_summary_of_outward_supplies.py,Total Taxable Amount,Kopējā apliekamā summa
 DocType: Employee External Work History,Employee External Work History,Darbinieku Ārējās Work Vēsture
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.py,Job card {0} created,Darba karte {0} izveidota
@@ -6703,6 +6705,7 @@
 apps/erpnext/erpnext/accounts/doctype/payment_terms_template/payment_terms_template.py,Combined invoice portion must equal 100%,Kombinētajai rēķina daļai jābūt vienādai ar 100%
 DocType: Item Default,Default Expense Account,Default Izdevumu konts
 DocType: GST Account,CGST Account,CGST konts
+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/education/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py,Student Email ID,Student Email ID
 DocType: Employee,Notice (days),Paziņojums (dienas)
 DocType: POS Closing Voucher Invoices,POS Closing Voucher Invoices,POS slēgšanas vaučeru rēķini
@@ -7346,6 +7349,7 @@
 DocType: Maintenance Visit,Maintenance Date,Uzturēšana Datums
 DocType: Purchase Invoice Item,Rejected Serial No,Noraidīts Sērijas Nr
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py,Year start date or end date is overlapping with {0}. To avoid please set company,Gadu sākuma datums vai beigu datums ir pārklāšanās ar {0}. Lai izvairītos lūdzu iestatītu uzņēmumu
+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/selling/doctype/customer/customer.py,Please mention the Lead Name in Lead {0},"Lūdzu, norādiet svina nosaukumu vadībā {0}"
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py,Start date should be less than end date for Item {0},Sākuma datums ir jābūt mazākam par beigu datumu postenī {0}
 DocType: Shift Type,Auto Attendance Settings,Auto apmeklējumu iestatījumi
diff --git a/erpnext/translations/mk.csv b/erpnext/translations/mk.csv
index 0e0a4a4..9fe1e50 100644
--- a/erpnext/translations/mk.csv
+++ b/erpnext/translations/mk.csv
@@ -155,6 +155,7 @@
 DocType: Accounts Settings,Currency Exchange Settings,Подесувања за размена на валута
 DocType: Work Order Operation,Work In Progress,Работа во прогрес
 DocType: Leave Control Panel,Branch (optional),Гранка (по избор)
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/utils.py,Row {0}: user has not applied rule <b>{1}</b> on the item <b>{2}</b>,Ред {0}: корисникот не примени правило <b>{1}</b> на точката <b>{2}</b>
 apps/erpnext/erpnext/education/report/absent_student_report/absent_student_report.py,Please select date,Ве молиме одберете датум
 DocType: Item Price,Minimum Qty ,Минимална количина
 DocType: Finance Book,Finance Book,Финансиска книга
@@ -165,7 +166,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py,Accountant,Сметководител
 apps/erpnext/erpnext/stock/report/item_price_stock/item_price_stock.py,Selling Price List,Продажба на ценовник
 DocType: Patient,Tobacco Current Use,Тековна употреба на тутун
-apps/erpnext/erpnext/stock/report/item_price_stock/item_price_stock.py,Selling Rate,Продажба стапка
+apps/erpnext/erpnext/selling/report/customer_wise_item_price/customer_wise_item_price.py,Selling Rate,Продажба стапка
 apps/erpnext/erpnext/erpnext_integrations/doctype/plaid_settings/plaid_settings.js,Please save your document before adding a new account,Зачувајте го вашиот документ пред да додадете нова сметка
 DocType: Cost Center,Stock User,Акциите пристап
 DocType: Soil Analysis,(Ca+Mg)/K,(Ca + Mg) / K
@@ -202,7 +203,6 @@
 DocType: Packed Item,Parent Detail docname,Родител Детална docname
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py,"Reference: {0}, Item Code: {1} and Customer: {2}","Суд: {0}, Точка Код: {1} и од купувачи: {2}"
 apps/erpnext/erpnext/accounts/report/consolidated_financial_statement/consolidated_financial_statement.py,{0} {1} is not present in the parent company,{0} {1} не е присутен во матичната компанија
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Supplier &gt; Supplier Type,Добавувач&gt; Тип на снабдувач
 apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py,Trial Period End Date Cannot be before Trial Period Start Date,Крајниот датум на судечкиот период не може да биде пред датумот на започнување на судечкиот период
 apps/erpnext/erpnext/utilities/user_progress.py,Kg,Кг
 DocType: Tax Withholding Category,Tax Withholding Category,Категорија на задржување на данок
@@ -315,6 +315,7 @@
 DocType: Quality Procedure Table,Responsible Individual,Одговорна индивидуа
 DocType: Naming Series,Prefix,Префикс
 apps/erpnext/erpnext/hr/notification/training_scheduled/training_scheduled.html,Event Location,Локација на настанот
+apps/erpnext/erpnext/selling/report/customer_wise_item_price/customer_wise_item_price.py,Available Stock,Достапно акции
 DocType: Asset Settings,Asset Settings,Поставки за средства
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py,Consumable,Потрошни
 DocType: Student,B-,Б-
@@ -348,6 +349,7 @@
 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 \
 				Serial No.",Не може да се обезбеди испорака од страна на Сериски број како што се додава \ Item {0} со и без Обезбедете испорака со \ Сериски број
+apps/erpnext/erpnext/education/doctype/instructor/instructor.py,Please setup Instructor Naming System in Education &gt; Education Settings,"Ве молиме, поставете Систем за именување на инструктори во образованието&gt; Поставки за образование"
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py,At least one mode of payment is required for POS invoice.,Потребна е барем еден начин за плаќање на POS фактура.
 DocType: Bank Statement Transaction Invoice Item,Bank Statement Transaction Invoice Item,Точка за трансакциска фактура на банкарска изјава
 DocType: Salary Detail,Tax on flexible benefit,Данок на флексибилна корист
@@ -870,7 +872,6 @@
 DocType: Vital Signs,Blood Pressure (systolic),Крвен притисок (систолен)
 apps/erpnext/erpnext/controllers/buying_controller.py,{0} {1} is {2},{0} {1} е {2}
 DocType: Item Price,Valid Upto,Важи до
-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: Training Event,Workshop,Работилница
 DocType: Supplier Scorecard Scoring Standing,Warn Purchase Orders,Предупреди налози за набавка
 apps/erpnext/erpnext/utilities/user_progress.py,List a few of your customers. They could be organizations or individuals.,Листа на неколку од вашите клиенти. Тие можат да бидат организации или поединци.
@@ -1656,7 +1657,6 @@
 DocType: Item Barcode,Item Barcode,Точка Баркод
 DocType: Delivery Trip,In Transit,Во транзит
 DocType: Woocommerce Settings,Endpoints,Крајни точки
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Item Code &gt; Item Group &gt; Brand,Код на точка&gt; Група на производи&gt; Бренд
 DocType: Shopping Cart Settings,Show Configure Button,Прикажи го копчето за конфигурирање
 DocType: Quality Inspection Reading,Reading 6,Читање 6
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js,Cannot {0} {1} {2} without any negative outstanding invoice,Не може да се {0} {1} {2} без никакви негативни извонредна фактура
@@ -2018,6 +2018,7 @@
 DocType: Cheque Print Template,Payer Settings,Прилагодување обврзник
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js,No pending Material Requests found to link for the given items.,Не се очекуваат материјални барања што се очекуваат за да се поврзат за дадени предмети.
 apps/erpnext/erpnext/public/js/utils/party.js,Select company first,Прво изберете компанија
+apps/erpnext/erpnext/accounts/general_ledger.py,Account: <b>{0}</b> is capital Work in progress and can not be updated by Journal Entry,Сметка: <b>{0}</b> е капитал Работа во тек и не може да се ажурира од страна на списание Влез
 apps/erpnext/erpnext/education/doctype/quiz/quiz.py,Compare List function takes on list arguments,Функцијата Спореди список ги зема аргументите на списокот
 DocType: Item Attribute Value,"This will be appended to the Item Code of the variant. For example, if your abbreviation is ""SM"", and the item code is ""T-SHIRT"", the item code of the variant will be ""T-SHIRT-SM""","Ова ќе биде додаден на Кодексот точка на варијанта. На пример, ако вашиот кратенката е &quot;СМ&quot; и кодот на предметот е &quot;Т-маица&quot;, кодот го ставка на варијанта ќе биде &quot;Т-маица-СМ&quot;"
 DocType: Salary Slip,Net Pay (in words) will be visible once you save the Salary Slip.,Нето плати (со зборови) ќе биде видлив откако ќе ја зачувате фиш плата.
@@ -2203,6 +2204,7 @@
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js,Item 2,Точка 2
 DocType: Pricing Rule,Validate Applied Rule,Валидирајте го применетото правило
 DocType: QuickBooks Migrator,Authorization Endpoint,Крајна точка на авторизација
+DocType: Employee Onboarding,Notify users by email,Известете ги корисниците по е-пошта
 DocType: Travel Request,International,Меѓународен
 DocType: Training Event,Training Event,обука на настанот
 DocType: Item,Auto re-order,Автоматско повторно цел
@@ -2810,7 +2812,6 @@
 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,Потрошувач со исто име веќе постои
-DocType: Contract,Inactive,Неактивен
 apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.js,This will submit Salary Slips and create accrual Journal Entry. Do you want to proceed?,Ова ќе достави дописници за плати и ќе создаде пресметувачки дневник. Дали сакате да продолжите?
 DocType: Purchase Invoice,Total Net Weight,Вкупно нето тежина
 DocType: Purchase Order,Order Confirmation No,Потврда за нарачката бр
@@ -3614,7 +3615,6 @@
 DocType: Stock Settings,Raise Material Request when stock reaches re-order level,Подигне материјал Барање кога акциите достигне нивото повторно цел
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py,Full-time,Со полно работно време
 DocType: Payroll Entry,Employees,вработени
-apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py,Please setup numbering series for Attendance via Setup &gt; Numbering Series,Поставете серија за нумерирање за присуство преку Поставување&gt; Серии за нумерирање
 DocType: Question,Single Correct Answer,Единствен точен одговор
 DocType: Employee,Contact Details,Податоци за контакт
 DocType: C-Form,Received Date,Доби датум
@@ -4226,6 +4226,7 @@
 DocType: Pricing Rule,Price or Product Discount,Цена или попуст на производот
 apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.py,For row {0}: Enter planned qty,За ред {0}: Внесете го планираното количество
 DocType: Account,Income Account,Сметка приходи
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Customer &gt; Customer Group &gt; Territory,Клиент&gt; Група на клиенти&gt; Територија
 DocType: Payment Request,Amount in customer's currency,Износ во валута на клиентите
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js,Delivery,Испорака
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.py,Assigning Structures...,Доделување структури ...
@@ -4274,7 +4275,6 @@
 DocType: HR Settings,Check Vacancies On Job Offer Creation,Проверете ги работните места за создавање понуда за работа
 apps/erpnext/erpnext/utilities/user_progress.py,Go to Letterheads,Одете во писма
 DocType: Subscription,Cancel At End Of Period,Откажи на крајот на периодот
-apps/erpnext/erpnext/education/doctype/instructor/instructor.py,Please setup Instructor Naming System in Education &gt; Education Settings,"Ве молиме, поставете Систем за именување на инструктори во образованието&gt; Поставки за образование"
 apps/erpnext/erpnext/hr/doctype/employee_promotion/employee_promotion.js,Property already added,Имотот веќе е додаден
 DocType: Item Supplier,Item Supplier,Точка Добавувачот
 apps/erpnext/erpnext/public/js/controllers/transaction.js,Please enter Item Code to get batch no,Ве молиме внесете Точка законик за да се добие серија не
@@ -4556,6 +4556,7 @@
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.js,Warning: Material Requested Qty is less than Minimum Order Qty,Предупредување: Материјал Бараниот Количина е помалку од Минимална Подреди Количина
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py,Account {0} is frozen,На сметка {0} е замрзнат
 DocType: Quiz Question,Quiz Question,Квиз прашање
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Supplier &gt; Supplier Type,Добавувач&gt; Тип на снабдувач
 DocType: Company,Legal Entity / Subsidiary with a separate Chart of Accounts belonging to the Organization.,Правното лице / Подружница со посебен сметковен кои припаѓаат на Организацијата.
 DocType: Payment Request,Mute Email,Неми-пошта
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py,"Food, Beverage & Tobacco","Храна, пијалаци и тутун"
@@ -5067,7 +5068,6 @@
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py,Delivery warehouse required for stock item {0},Испорака магацин потребни за трговија ставка {0}
 DocType: Packing Slip,The gross weight of the package. Usually net weight + packaging material weight. (for print),Бруто тежина на пакувањето. Обично нето тежина + материјал за пакување тежина. (За печатење)
 DocType: Assessment Plan,Program,Програмата
-apps/erpnext/erpnext/hr/doctype/employee/employee.py,Please setup Employee Naming System in Human Resource &gt; HR Settings,Поставете го системот за именување на вработените во човечки ресурси&gt; Поставки за човечки ресурси
 DocType: Accounts Settings,Users with this role are allowed to set frozen accounts and create / modify accounting entries against frozen accounts,Корисниците со оваа улога може да поставите замрзнати сметки и да се создаде / измени на сметководствените ставки кон замрзнатите сметки
 ,Project Billing Summary,Резиме за наплата на проект
 DocType: Vital Signs,Cuts,Парчиња
@@ -5313,6 +5313,7 @@
 apps/erpnext/erpnext/quality_management/doctype/quality_review/quality_review_list.js,No Action,Нема акција
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js,Valuation type charges can not marked as Inclusive,Трошоци тип вреднување не може да го означи како Инклузивна
 DocType: POS Profile,Update Stock,Ажурирање берза
+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/stock/doctype/packing_slip/packing_slip.js,Different UOM for items will lead to incorrect (Total) Net Weight value. Make sure that Net Weight of each item is in the same UOM.,Различни ЕМ за Артикли ќе доведе до Неточна (Вкупно) вредност за Нето тежина. Проверете дали Нето тежината на секој артикал е во иста ЕМ.
 DocType: Certification Application,Payment Details,Детали за плаќањата
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py,BOM Rate,Бум стапка
@@ -5413,6 +5414,8 @@
 apps/erpnext/erpnext/accounts/doctype/monthly_distribution/monthly_distribution.py,Percentage Allocation should be equal to 100%,Процент распределба треба да биде еднаква на 100%
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js,Please select Posting Date before selecting Party,Ве молам изберете Праќање пораки во Датум пред изборот партија
 apps/erpnext/erpnext/config/accounting.py,Payment Terms based on conditions,Услови за плаќање врз основа на услови
+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: Program Enrollment,School House,школа куќа
 DocType: Serial No,Out of AMC,Од АМЦ
 DocType: Opportunity,Opportunity Amount,Износ на можност
@@ -5831,6 +5834,7 @@
 DocType: Quality Procedure Process,Link existing Quality Procedure.,Поврзете ја постојната процедура за квалитет.
 apps/erpnext/erpnext/config/hr.py,Loans,Заеми
 DocType: Healthcare Service Unit,Healthcare Service Unit,Единица за здравствена заштита
+,Customer-wise Item Price,Цена на производот поучен од потрошувачите
 apps/erpnext/erpnext/public/js/financial_statements.js,Cash Flow Statement,Извештај за паричниот тек
 apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.py,No material request created,Нема креирано материјално барање
 apps/erpnext/erpnext/hr/doctype/loan_application/loan_application.py,Loan Amount cannot exceed Maximum Loan Amount of {0},Износ на кредитот не може да надмине максимален заем во износ од {0}
@@ -6096,6 +6100,7 @@
 apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py,Opening Value,отворање вредност
 DocType: Salary Component,Formula,формула
 apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py,Serial #,Сериски #
+apps/erpnext/erpnext/hr/doctype/employee/employee.py,Please setup Employee Naming System in Human Resource &gt; HR Settings,Поставете го системот за именување на вработените во човечки ресурси&gt; Поставки за човечки ресурси
 DocType: Material Request Plan Item,Required Quantity,Потребна количина
 DocType: Lab Test Template,Lab Test Template,Лабораториски тест обрасци
 apps/erpnext/erpnext/setup/doctype/company/company.py,Sales Account,Продажна сметка
@@ -6340,7 +6345,6 @@
 DocType: Request for Quotation Item,Project Name,Име на проектот
 apps/erpnext/erpnext/regional/italy/utils.py,Please set the Customer Address,Поставете адреса на клиент
 DocType: Customer,Mention if non-standard receivable account,Наведе ако нестандардни побарувања сметка
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Customer &gt; Customer Group &gt; Territory,Клиент&gt; Група на клиенти&gt; Територија
 DocType: Bank,Plaid Access Token,Означен пристап до карирани
 apps/erpnext/erpnext/hr/doctype/employee_benefit_application/employee_benefit_application.py,Please add the remaining benefits {0} to any of the existing component,Ве молиме додадете ги преостанатите придобивки {0} на некоја од постоечките компоненти
 DocType: Journal Entry Account,If Income or Expense,Ако приходите и расходите
@@ -6601,8 +6605,6 @@
 apps/erpnext/erpnext/buying/utils.py,Please enter quantity for Item {0},Ве молиме внесете количество за Точка {0}
 DocType: Quality Procedure,Processes,Процеси
 DocType: Shift Type,First Check-in and Last Check-out,Прво најавување и последно одјавување
-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/regional/report/hsn_wise_summary_of_outward_supplies/hsn_wise_summary_of_outward_supplies.py,Total Taxable Amount,Вкупно даночен износ
 DocType: Employee External Work History,Employee External Work History,Вработен Надворешни Историја работа
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.py,Job card {0} created,Создадена е картичка за работа {0}
@@ -6639,6 +6641,7 @@
 apps/erpnext/erpnext/accounts/doctype/payment_terms_template/payment_terms_template.py,Combined invoice portion must equal 100%,Комбинираната дел од фактурата мора да изнесува 100%
 DocType: Item Default,Default Expense Account,Стандардно сметка сметка
 DocType: GST Account,CGST Account,CGST сметка
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Item Code &gt; Item Group &gt; Brand,Код на точка&gt; Група на производи&gt; Бренд
 apps/erpnext/erpnext/education/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py,Student Email ID,Студент e-mail проект
 DocType: Employee,Notice (days),Известување (во денови)
 DocType: POS Closing Voucher Invoices,POS Closing Voucher Invoices,POS-затворање ваучер-фактури
@@ -7194,6 +7197,7 @@
 DocType: Vital Signs,Coated,Обложени
 apps/erpnext/erpnext/assets/doctype/asset/asset.py,Row {0}: Expected Value After Useful Life must be less than Gross Purchase Amount,Ред {0}: Очекувана вредност по корисен животен век мора да биде помала од износот на бруто-откуп
 DocType: GoCardless Settings,GoCardless Settings,GoCardless Settings
+apps/erpnext/erpnext/controllers/stock_controller.py,Create Quality Inspection for Item {0},Создадете квалитетна инспекција за производот {0}
 DocType: Leave Block List,Leave Block List Name,Остави Забрани Листа на Име
 DocType: Certified Consultant,Certification Validity,Валидност на сертификацијата
 apps/erpnext/erpnext/hr/doctype/vehicle/vehicle.py,Insurance Start date should be less than Insurance End date,Дата на започнување осигурување треба да биде помал од осигурување Дата на завршување
@@ -7274,6 +7278,7 @@
 DocType: Maintenance Visit,Maintenance Date,Датум на одржување
 DocType: Purchase Invoice Item,Rejected Serial No,Одбиени Сериски Не
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py,Year start date or end date is overlapping with {0}. To avoid please set company,Година датум за почеток или крај датум се преклопуваат со {0}. За да се избегне молам постави компанијата
+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/selling/doctype/customer/customer.py,Please mention the Lead Name in Lead {0},Ве молиме да го споменете Водечкото Име во Водач {0}
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py,Start date should be less than end date for Item {0},Датум на почеток треба да биде помал од крајот датум за Точка {0}
 DocType: Shift Type,Auto Attendance Settings,Поставки за автоматско присуство
diff --git a/erpnext/translations/ml.csv b/erpnext/translations/ml.csv
index cf656e5..b36a50f 100644
--- a/erpnext/translations/ml.csv
+++ b/erpnext/translations/ml.csv
@@ -163,7 +163,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py,Accountant,കണക്കെഴുത്തുകാരന്
 apps/erpnext/erpnext/stock/report/item_price_stock/item_price_stock.py,Selling Price List,വില ലിസ്റ്റ് വിൽക്കുന്നു
 DocType: Patient,Tobacco Current Use,പുകയില നിലവിലുളള ഉപയോഗം
-apps/erpnext/erpnext/stock/report/item_price_stock/item_price_stock.py,Selling Rate,വിൽക്കുന്ന നിരക്ക്
+apps/erpnext/erpnext/selling/report/customer_wise_item_price/customer_wise_item_price.py,Selling Rate,വിൽക്കുന്ന നിരക്ക്
 apps/erpnext/erpnext/erpnext_integrations/doctype/plaid_settings/plaid_settings.js,Please save your document before adding a new account,ഒരു പുതിയ അക്കൗണ്ട് ചേർക്കുന്നതിന് മുമ്പ് ദയവായി നിങ്ങളുടെ പ്രമാണം സംരക്ഷിക്കുക
 DocType: Cost Center,Stock User,സ്റ്റോക്ക് ഉപയോക്താവ്
 DocType: Soil Analysis,(Ca+Mg)/K,(Ca + Mg) / K
@@ -199,7 +199,6 @@
 DocType: Packed Item,Parent Detail docname,പാരന്റ് വിശദാംശം docname
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py,"Reference: {0}, Item Code: {1} and Customer: {2}","പരാമർശം: {2}: {0}, ഇനം കോഡ്: {1} ഉപഭോക്തൃ"
 apps/erpnext/erpnext/accounts/report/consolidated_financial_statement/consolidated_financial_statement.py,{0} {1} is not present in the parent company,{0} {1} മാതാപിതാക്കളുടെ കമ്പനിയിൽ ഇല്ല
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Supplier &gt; Supplier Type,വിതരണക്കാരൻ&gt; വിതരണ തരം
 apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py,Trial Period End Date Cannot be before Trial Period Start Date,ട്രയൽ കാലാവധി അവസാന തീയതി ട്രയൽ കാലയളവ് ആരംഭിക്കുന്ന തീയതിക്ക് മുമ്പായിരിക്കരുത്
 apps/erpnext/erpnext/utilities/user_progress.py,Kg,കി. ഗ്രാം
 DocType: Tax Withholding Category,Tax Withholding Category,നികുതി പിരിച്ചെടുത്ത വിഭാഗം
@@ -311,6 +310,7 @@
 DocType: Quality Procedure Table,Responsible Individual,ഉത്തരവാദിത്തമുള്ള വ്യക്തിഗത
 DocType: Naming Series,Prefix,പ്രിഫിക്സ്
 apps/erpnext/erpnext/hr/notification/training_scheduled/training_scheduled.html,Event Location,ഇവന്റ് ലൊക്കേഷൻ
+apps/erpnext/erpnext/selling/report/customer_wise_item_price/customer_wise_item_price.py,Available Stock,ലഭ്യമായ സ്റ്റോക്ക്
 DocType: Asset Settings,Asset Settings,അസറ്റ് ക്രമീകരണങ്ങൾ
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py,Consumable,Consumable
 DocType: Student,B-,ലോകോത്തര
@@ -344,6 +344,7 @@
 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 \
 				Serial No.",\ സീരിയൽ നമ്പർ വഴി ഡെലിവറി ഉറപ്പാക്കാനാവില്ല \ ഇനം {0} ചേർത്തും അല്ലാതെയും \ സീരിയൽ നമ്പർ ഡെലിവറി ഉറപ്പാക്കുന്നു.
+apps/erpnext/erpnext/education/doctype/instructor/instructor.py,Please setup Instructor Naming System in Education &gt; Education Settings,വിദ്യാഭ്യാസം&gt; വിദ്യാഭ്യാസ ക്രമീകരണങ്ങളിൽ ഇൻസ്ട്രക്ടർ നാമകരണ സംവിധാനം സജ്ജമാക്കുക
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py,At least one mode of payment is required for POS invoice.,പേയ്മെന്റ് കുറഞ്ഞത് ഒരു മോഡ് POS ൽ ഇൻവോയ്സ് ആവശ്യമാണ്.
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py,Batch no is required for batched item {0},ബാച്ച് ചെയ്ത ഇനത്തിന് ബാച്ച് നമ്പർ ആവശ്യമില്ല {0}
 DocType: Bank Statement Transaction Invoice Item,Bank Statement Transaction Invoice Item,ബാങ്ക് സ്റ്റേറ്റ്മെന്റ് ട്രാൻസാക്ഷൻ ഇൻവോയ്സ് ആക്റ്റ്
@@ -1635,7 +1636,6 @@
 DocType: Item Barcode,Item Barcode,ഇനം ബാർകോഡ്
 DocType: Delivery Trip,In Transit,യാത്രയിൽ
 DocType: Woocommerce Settings,Endpoints,എൻഡ്പോയിന്റുകൾ
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Item Code &gt; Item Group &gt; Brand,ഇന കോഡ്&gt; ഐറ്റം ഗ്രൂപ്പ്&gt; ബ്രാൻഡ്
 DocType: Shopping Cart Settings,Show Configure Button,കോൺഫിഗർ ബട്ടൺ കാണിക്കുക
 DocType: Quality Inspection Reading,Reading 6,6 Reading
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js,Cannot {0} {1} {2} without any negative outstanding invoice,അല്ല {0} കഴിയുമോ {1} {2} നെഗറ്റിവ് കുടിശ്ശിക ഇൻവോയ്സ് ഇല്ലാതെ
@@ -2172,6 +2172,7 @@
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js,Item 2,ഇനം 2
 DocType: Pricing Rule,Validate Applied Rule,പ്രായോഗിക നിയമം സാധൂകരിക്കുക
 DocType: QuickBooks Migrator,Authorization Endpoint,പ്രാമാണീകരണ Endpoint
+DocType: Employee Onboarding,Notify users by email,ഇമെയിൽ വഴി ഉപയോക്താക്കളെ അറിയിക്കുക
 DocType: Travel Request,International,ഇന്റർനാഷണൽ
 DocType: Training Event,Training Event,പരിശീലന ഇവന്റ്
 DocType: Item,Auto re-order,ഓട്ടോ റീ-ഓർഡർ
@@ -2770,7 +2771,6 @@
 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,സമാന പേരിലുള്ള ഒരു ഉപയോക്താവ് ഇതിനകം നിലവിലുണ്ട്
-DocType: Contract,Inactive,നിഷ്ക്രിയം
 apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.js,This will submit Salary Slips and create accrual Journal Entry. Do you want to proceed?,ഇത് ശമ്പള സ്ലിപ്പുകളും സമർപ്പിക്കണം. നിങ്ങൾക്ക് തുടരാൻ താൽപ്പര്യമുണ്ടോ?
 DocType: Purchase Invoice,Total Net Weight,ആകെ മൊത്തം ഭാരം
 DocType: Purchase Order,Order Confirmation No,ഓർഡർ സ്ഥിരീകരണം നം
@@ -3049,7 +3049,6 @@
 apps/erpnext/erpnext/accounts/party.py,Billing currency must be equal to either default company's currency or party account currency,ബില്ലിംഗ് കറൻസി സ്ഥിര കമ്പനിയുടെ കറൻസി അല്ലെങ്കിൽ കക്ഷി അക്കൗണ്ട് കറൻസിക്ക് തുല്യമാണ്
 DocType: Packing Slip,Indicates that the package is a part of this delivery (Only Draft),(മാത്രം ഡ്രാഫ്റ്റ്) പാക്കേജ് ഈ ഡെലിവറി ഒരു ഭാഗമാണ് സൂചിപ്പിക്കുന്നു
 apps/erpnext/erpnext/accounts/report/customer_ledger_summary/customer_ledger_summary.py,Closing Balance,അടയ്ക്കൽ ബാലൻസ്
-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: Soil Texture,Loam,ഹരം
 apps/erpnext/erpnext/controllers/accounts_controller.py,Row {0}: Due Date cannot be before posting date,വരി {0}: തീയതി തീയതി പോസ്റ്റുചെയ്യുന്നതിനു മുമ്പുള്ള തീയതി അല്ല
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py,Quantity for Item {0} must be less than {1},ഇനം {0} വേണ്ടി ക്വാണ്ടിറ്റി {1} താഴെ ആയിരിക്കണം
@@ -3568,7 +3567,6 @@
 DocType: Stock Settings,Raise Material Request when stock reaches re-order level,സ്റ്റോക്ക് റീ-ഓർഡർ തലത്തിൽ എത്തുമ്പോൾ മെറ്റീരിയൽ അഭ്യർത്ഥന ഉയർത്തലും
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py,Full-time,മുഴുവൻ സമയവും
 DocType: Payroll Entry,Employees,എംപ്ലോയീസ്
-apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py,Please setup numbering series for Attendance via Setup &gt; Numbering Series,സജ്ജീകരണം&gt; നമ്പറിംഗ് സീരീസ് വഴി അറ്റൻഡൻസിനായി നമ്പറിംഗ് സീരീസ് സജ്ജമാക്കുക
 DocType: Question,Single Correct Answer,ശരിയായ ശരിയായ ഉത്തരം
 DocType: Employee,Contact Details,കോൺടാക്റ്റ് വിശദാംശങ്ങൾ
 DocType: C-Form,Received Date,ലഭിച്ച തീയതി
@@ -4171,6 +4169,7 @@
 DocType: Pricing Rule,Price or Product Discount,വില അല്ലെങ്കിൽ ഉൽപ്പന്ന കിഴിവ്
 apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.py,For row {0}: Enter planned qty,വരിയ്ക്കായി {0}: ആസൂത്രിത അളവുകൾ നൽകുക
 DocType: Account,Income Account,ആദായ അക്കൗണ്ട്
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Customer &gt; Customer Group &gt; Territory,കസ്റ്റമർ&gt; കസ്റ്റമർ ഗ്രൂപ്പ്&gt; ടെറിട്ടറി
 DocType: Payment Request,Amount in customer's currency,ഉപഭോക്താവിന്റെ കറൻസി തുക
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js,Delivery,ഡെലിവറി
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.py,Assigning Structures...,ഘടനകൾ നിർണ്ണയിക്കുന്നു ...
@@ -4216,7 +4215,6 @@
 DocType: HR Settings,Check Vacancies On Job Offer Creation,ജോലി ഓഫർ സൃഷ്ടിക്കുന്നതിലെ ഒഴിവുകൾ പരിശോധിക്കുക
 apps/erpnext/erpnext/utilities/user_progress.py,Go to Letterheads,Letterheads ലേക്ക് പോകുക
 DocType: Subscription,Cancel At End Of Period,അവസാന കാലത്ത് റദ്ദാക്കുക
-apps/erpnext/erpnext/education/doctype/instructor/instructor.py,Please setup Instructor Naming System in Education &gt; Education Settings,വിദ്യാഭ്യാസം&gt; വിദ്യാഭ്യാസ ക്രമീകരണങ്ങളിൽ ഇൻസ്ട്രക്ടർ നാമകരണ സംവിധാനം സജ്ജമാക്കുക
 apps/erpnext/erpnext/hr/doctype/employee_promotion/employee_promotion.js,Property already added,പ്രോപ്പർട്ടി ഇതിനകം ചേർത്തു
 DocType: Item Supplier,Item Supplier,ഇനം വിതരണക്കാരൻ
 apps/erpnext/erpnext/public/js/controllers/transaction.js,Please enter Item Code to get batch no,യാതൊരു ബാച്ച് ലഭിക്കാൻ ഇനം കോഡ് നൽകുക
@@ -4499,6 +4497,7 @@
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.js,Warning: Material Requested Qty is less than Minimum Order Qty,മുന്നറിയിപ്പ്: Qty അഭ്യർത്ഥിച്ചു മെറ്റീരിയൽ മിനിമം ഓർഡർ Qty കുറവാണ്
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py,Account {0} is frozen,അക്കൗണ്ട് {0} മരവിച്ചു
 DocType: Quiz Question,Quiz Question,ക്വിസ് ചോദ്യം
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Supplier &gt; Supplier Type,വിതരണക്കാരൻ&gt; വിതരണ തരം
 DocType: Company,Legal Entity / Subsidiary with a separate Chart of Accounts belonging to the Organization.,സംഘടന പെടുന്ന അക്കൗണ്ടുകൾ ഒരു പ്രത്യേക ചാർട്ട് കൊണ്ട് നിയമ വിഭാഗമായാണ് / സബ്സിഡിയറി.
 DocType: Payment Request,Mute Email,നിശബ്ദമാക്കുക ഇമെയിൽ
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py,"Food, Beverage & Tobacco","ഫുഡ്, ബീവറേജ് &amp; പുകയില"
@@ -4922,6 +4921,7 @@
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py,Bank Overdraft Account,ബാങ്ക് ഓവർഡ്രാഫ്റ്റിലായില്ല അക്കൗണ്ട്
 DocType: Patient,Patient ID,രോഗിയുടെ ഐഡി
 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/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}: തുക കുടിശ്ശിക തുക അധികമാകരുത് കഴിയില്ല.
@@ -5005,7 +5005,6 @@
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py,Delivery warehouse required for stock item {0},ഓഹരി ഇനത്തിന്റെ {0} ആവശ്യമുള്ളതിൽ ഡെലിവറി വെയർഹൗസ്
 DocType: Packing Slip,The gross weight of the package. Usually net weight + packaging material weight. (for print),പാക്കേജിന്റെ ആകെ ഭാരം. മൊത്തം ഭാരം + പാക്കേജിംഗ് മെറ്റീരിയൽ ഭാരം സാധാരണയായി. (പ്രിന്റ് വേണ്ടി)
 DocType: Assessment Plan,Program,പ്രോഗ്രാം
-apps/erpnext/erpnext/hr/doctype/employee/employee.py,Please setup Employee Naming System in Human Resource &gt; HR Settings,ഹ്യൂമൻ റിസോഴ്സ്&gt; എച്ച്ആർ ക്രമീകരണങ്ങളിൽ ജീവനക്കാരുടെ പേരിടൽ സംവിധാനം സജ്ജമാക്കുക
 DocType: Accounts Settings,Users with this role are allowed to set frozen accounts and create / modify accounting entries against frozen accounts,ഈ പങ്ക് ഉപയോക്താക്കൾ മരവിച്ച അക്കൗണ്ടുകൾ സജ്ജമാക്കാനും സൃഷ്ടിക്കുന്നതിനും / ശീതീകരിച്ച അക്കൗണ്ടുകൾ നേരെ അക്കൗണ്ടിങ് എൻട്രികൾ പരിഷ്ക്കരിക്കുക അനുവദിച്ചിരിക്കുന്ന
 ,Project Billing Summary,പ്രോജക്റ്റ് ബില്ലിംഗ് സംഗ്രഹം
 DocType: Vital Signs,Cuts,കുറുക്കുവഴികൾ
@@ -5351,6 +5350,8 @@
 apps/erpnext/erpnext/accounts/doctype/monthly_distribution/monthly_distribution.py,Percentage Allocation should be equal to 100%,ശതമാന അലോക്കേഷൻ 100% തുല്യമോ വേണം
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js,Please select Posting Date before selecting Party,പാർട്ടി തിരഞ്ഞെടുക്കുന്നതിന് മുമ്പ് പോസ്റ്റിംഗ് തീയതി തിരഞ്ഞെടുക്കുക
 apps/erpnext/erpnext/config/accounting.py,Payment Terms based on conditions,വ്യവസ്ഥകളെ അടിസ്ഥാനമാക്കി പേയ്‌മെന്റ് നിബന്ധനകൾ
+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: Program Enrollment,School House,സ്കൂൾ ഹൗസ്
 DocType: Serial No,Out of AMC,എഎംസി പുറത്താണ്
 DocType: Opportunity,Opportunity Amount,അവസര തുക
@@ -5552,6 +5553,7 @@
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py,Order/Quot %,ഓർഡർ / quot%
 apps/erpnext/erpnext/config/healthcare.py,Record Patient Vitals,റെക്കോർഡ് പേപ്പർ വിന്റോസ്
 DocType: Fee Schedule,Institution,സ്ഥാപനം
+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: Asset,Partially Depreciated,ഭാഗികമായി മൂല്യത്തകർച്ചയുണ്ടായ
 DocType: Issue,Opening Time,സമയം തുറക്കുന്നു
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py,From and To dates required,നിന്ന് ആവശ്യമായ തീയതികൾ ചെയ്യുക
@@ -5766,6 +5768,7 @@
 DocType: Quality Procedure Process,Link existing Quality Procedure.,നിലവിലുള്ള ഗുണനിലവാര നടപടിക്രമം ലിങ്ക് ചെയ്യുക.
 apps/erpnext/erpnext/config/hr.py,Loans,വായ്പകൾ
 DocType: Healthcare Service Unit,Healthcare Service Unit,ഹെൽത്ത് സർവീസ് യൂണിറ്റ്
+,Customer-wise Item Price,ഉപഭോക്തൃ തിരിച്ചുള്ള ഇന വില
 apps/erpnext/erpnext/public/js/financial_statements.js,Cash Flow Statement,ക്യാഷ് ഫ്ളോ പ്രസ്താവന
 apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.py,No material request created,ഭൌതിക അഭ്യർത്ഥനയൊന്നും സൃഷ്ടിച്ചിട്ടില്ല
 apps/erpnext/erpnext/hr/doctype/loan_application/loan_application.py,Loan Amount cannot exceed Maximum Loan Amount of {0},വായ്പാ തുക {0} പരമാവധി വായ്പാ തുക കവിയാൻ പാടില്ല
@@ -6027,6 +6030,7 @@
 apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py,Opening Value,തുറക്കുന്നു മൂല്യം
 DocType: Salary Component,Formula,ഫോർമുല
 apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py,Serial #,സീരിയൽ #
+apps/erpnext/erpnext/hr/doctype/employee/employee.py,Please setup Employee Naming System in Human Resource &gt; HR Settings,ഹ്യൂമൻ റിസോഴ്സ്&gt; എച്ച്ആർ ക്രമീകരണങ്ങളിൽ ജീവനക്കാരുടെ പേരിടൽ സംവിധാനം സജ്ജമാക്കുക
 DocType: Material Request Plan Item,Required Quantity,ആവശ്യമായ അളവ്
 DocType: Lab Test Template,Lab Test Template,ടെസ്റ്റ് ടെംപ്ലേറ്റ് ടെംപ്ലേറ്റ്
 apps/erpnext/erpnext/setup/doctype/company/company.py,Sales Account,സെൽ അക്കൌണ്ട്
@@ -6271,7 +6275,6 @@
 DocType: Request for Quotation Item,Project Name,പ്രോജക്ട് പേര്
 apps/erpnext/erpnext/regional/italy/utils.py,Please set the Customer Address,ഉപഭോക്തൃ വിലാസം സജ്ജമാക്കുക
 DocType: Customer,Mention if non-standard receivable account,സ്റ്റാൻഡേർഡ് അല്ലാത്ത സ്വീകരിക്കുന്ന അക്കൌണ്ട് എങ്കിൽ പ്രസ്താവിക്കുക
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Customer &gt; Customer Group &gt; Territory,കസ്റ്റമർ&gt; കസ്റ്റമർ ഗ്രൂപ്പ്&gt; ടെറിട്ടറി
 DocType: Bank,Plaid Access Token,പ്ലെയ്ഡ് ആക്സസ് ടോക്കൺ
 apps/erpnext/erpnext/hr/doctype/employee_benefit_application/employee_benefit_application.py,Please add the remaining benefits {0} to any of the existing component,നിലവിലുള്ള ഏതെങ്കിലും ഘടകഭാഗത്ത് ബാക്കിയുള്ള ആനുകൂല്യങ്ങൾ ചേർക്കുക {0}
 DocType: Journal Entry Account,If Income or Expense,ആദായ അല്ലെങ്കിൽ ചിലവേറിയ ചെയ്താൽ
@@ -6531,8 +6534,6 @@
 apps/erpnext/erpnext/buying/utils.py,Please enter quantity for Item {0},ഇനം {0} വേണ്ടി അളവ് നൽകുക
 DocType: Quality Procedure,Processes,പ്രക്രിയകൾ
 DocType: Shift Type,First Check-in and Last Check-out,"ആദ്യ ചെക്ക്-ഇൻ, അവസാന ചെക്ക് out ട്ട്"
-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/regional/report/hsn_wise_summary_of_outward_supplies/hsn_wise_summary_of_outward_supplies.py,Total Taxable Amount,നികുതി അടയ്ക്കാനുള്ള തുക
 DocType: Employee External Work History,Employee External Work History,ജീവനക്കാർ പുറത്തേക്കുള്ള വർക്ക് ചരിത്രം
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.py,Job card {0} created,തൊഴിൽ കാർഡ് {0} സൃഷ്ടിച്ചു
@@ -6569,6 +6570,7 @@
 apps/erpnext/erpnext/accounts/doctype/payment_terms_template/payment_terms_template.py,Combined invoice portion must equal 100%,സംയോജിത ഇൻവോയ്സ് ഭാഗം 100%
 DocType: Item Default,Default Expense Account,സ്ഥിരസ്ഥിതി ചിലവേറിയ
 DocType: GST Account,CGST Account,CGST അക്കൗണ്ട്
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Item Code &gt; Item Group &gt; Brand,ഇന കോഡ്&gt; ഐറ്റം ഗ്രൂപ്പ്&gt; ബ്രാൻഡ്
 apps/erpnext/erpnext/education/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py,Student Email ID,വിദ്യാർത്ഥിയുടെ ഇമെയിൽ ഐഡി
 DocType: Employee,Notice (days),അറിയിപ്പ് (ദിവസം)
 DocType: POS Closing Voucher Invoices,POS Closing Voucher Invoices,POS ക്ലോസിംഗ് വൗച്ചർ ഇൻവോയ്സുകൾ
@@ -7200,6 +7202,7 @@
 DocType: Maintenance Visit,Maintenance Date,മെയിൻറനൻസ് തീയതി
 DocType: Purchase Invoice Item,Rejected Serial No,നിരസിച്ചു സീരിയൽ പോസ്റ്റ്
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py,Year start date or end date is overlapping with {0}. To avoid please set company,വർഷം ആരംഭിക്കുന്ന തീയതി അല്ലെങ്കിൽ അവസാന തീയതി {0} ഓവർലാപ്പുചെയ്യുന്നു ആണ്. ഒഴിവാക്കാൻ കമ്പനി സജ്ജമാക്കാൻ ദയവായി
+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/maintenance/doctype/maintenance_schedule/maintenance_schedule.py,Start date should be less than end date for Item {0},തീയതി ഇനം {0} വേണ്ടി അവസാനം തീയതി കുറവായിരിക്കണം ആരംഭിക്കുക
 DocType: Shift Type,Auto Attendance Settings,യാന്ത്രിക ഹാജർ ക്രമീകരണങ്ങൾ
 DocType: Item,"Example: ABCD.#####
diff --git a/erpnext/translations/mr.csv b/erpnext/translations/mr.csv
index 3e0a5c5..4aae06d 100644
--- a/erpnext/translations/mr.csv
+++ b/erpnext/translations/mr.csv
@@ -165,7 +165,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py,Accountant,लेखापाल
 apps/erpnext/erpnext/stock/report/item_price_stock/item_price_stock.py,Selling Price List,किंमत सूची विक्री
 DocType: Patient,Tobacco Current Use,तंबाखू वर्तमान वापर
-apps/erpnext/erpnext/stock/report/item_price_stock/item_price_stock.py,Selling Rate,विक्री दर
+apps/erpnext/erpnext/selling/report/customer_wise_item_price/customer_wise_item_price.py,Selling Rate,विक्री दर
 apps/erpnext/erpnext/erpnext_integrations/doctype/plaid_settings/plaid_settings.js,Please save your document before adding a new account,कृपया नवीन खाते जोडण्यापूर्वी आपला कागदजत्र जतन करा
 DocType: Cost Center,Stock User,शेअर सदस्य
 DocType: Soil Analysis,(Ca+Mg)/K,(सीए + एमजी) / के
@@ -202,7 +202,6 @@
 DocType: Packed Item,Parent Detail docname,पालक तपशील docname
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py,"Reference: {0}, Item Code: {1} and Customer: {2}","संदर्भ: {0}, आयटम कोड: {1} आणि ग्राहक: {2}"
 apps/erpnext/erpnext/accounts/report/consolidated_financial_statement/consolidated_financial_statement.py,{0} {1} is not present in the parent company,{0} {1} मूळ कंपनीत नाही
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Supplier &gt; Supplier Type,पुरवठादार&gt; पुरवठादार प्रकार
 apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py,Trial Period End Date Cannot be before Trial Period Start Date,चाचणी कालावधी समाप्ती तारीख चाचणी कालावधी प्रारंभ दिनांक आधी होऊ शकत नाही
 apps/erpnext/erpnext/utilities/user_progress.py,Kg,किलो
 DocType: Tax Withholding Category,Tax Withholding Category,करसवलक्षण श्रेणी
@@ -315,6 +314,7 @@
 DocType: Quality Procedure Table,Responsible Individual,जबाबदार वैयक्तिक
 DocType: Naming Series,Prefix,पूर्वपद
 apps/erpnext/erpnext/hr/notification/training_scheduled/training_scheduled.html,Event Location,इव्हेंट स्थान
+apps/erpnext/erpnext/selling/report/customer_wise_item_price/customer_wise_item_price.py,Available Stock,उपलब्ध स्टॉक
 DocType: Asset Settings,Asset Settings,मालमत्ता सेटिंग्ज
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py,Consumable,Consumable
 DocType: Student,B-,B-
@@ -348,6 +348,7 @@
 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 \
 				Serial No.",सीरीयल नुसार डिलिव्हरीची खात्री करणे शक्य नाही कारण \ आयटम {0} सह आणि \ Serial No. द्वारे डिलिव्हरी सुनिश्चित केल्याशिवाय जोडली आहे.
+apps/erpnext/erpnext/education/doctype/instructor/instructor.py,Please setup Instructor Naming System in Education &gt; Education Settings,कृपया शिक्षण&gt; शिक्षण सेटिंग्ज मधील इन्स्ट्रक्टर नामांकन प्रणाली सेट करा
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py,At least one mode of payment is required for POS invoice.,पैसे किमान एक मोड POS चलन आवश्यक आहे.
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py,Batch no is required for batched item {0},बॅच केलेल्या आयटमसाठी बॅच क्रमांक आवश्यक नाही {0}
 DocType: Bank Statement Transaction Invoice Item,Bank Statement Transaction Invoice Item,बँक स्टेटमेंट व्यवहार इनवॉइस आयटम
@@ -1649,7 +1650,6 @@
 DocType: Item Barcode,Item Barcode,आयटम बारकोड
 DocType: Delivery Trip,In Transit,पारगमन मध्ये
 DocType: Woocommerce Settings,Endpoints,अंत्यबिंदू
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Item Code &gt; Item Group &gt; Brand,आयटम कोड&gt; आयटम गट&gt; ब्रँड
 DocType: Shopping Cart Settings,Show Configure Button,कॉन्फिगर बटण दर्शवा
 DocType: Quality Inspection Reading,Reading 6,6 वाचन
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js,Cannot {0} {1} {2} without any negative outstanding invoice,नाही {0} {1} {2} कोणत्याही नकारात्मक थकबाकी चलन करू शकता
@@ -2005,6 +2005,7 @@
 DocType: Payroll Entry,Employee Details,कर्मचारी तपशील
 DocType: Amazon MWS Settings,CN,सीएन
 DocType: Item Variant Settings,Fields will be copied over only at time of creation.,निर्मितीच्या वेळी केवळ फील्डवर कॉपी केली जाईल.
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py,Row {0}: asset is required for item {1},पंक्ती {0}: मालमत्ता {1} आयटमसाठी आवश्यक आहे
 DocType: Setup Progress Action,Domains,डोमेन
 apps/erpnext/erpnext/projects/doctype/task/task.py,'Actual Start Date' can not be greater than 'Actual End Date','वास्तविक प्रारंभ तारीख' ही 'वास्तविक अंतिम तारीख' यापेक्षा जास्त असू शकत नाही
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py,Management,व्यवस्थापन
@@ -2196,6 +2197,7 @@
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js,Item 2,आयटम 2
 DocType: Pricing Rule,Validate Applied Rule,लागू नियम
 DocType: QuickBooks Migrator,Authorization Endpoint,अधिकृतता समाप्तीबिंदू
+DocType: Employee Onboarding,Notify users by email,वापरकर्त्यांना ईमेलद्वारे सूचित करा
 DocType: Travel Request,International,आंतरराष्ट्रीय
 DocType: Training Event,Training Event,प्रशिक्षण कार्यक्रम
 DocType: Item,Auto re-order,ऑटो पुन्हा आदेश
@@ -2801,7 +2803,6 @@
 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,त्याच नावासह असलेले ग्राहक आधीपासून अस्तित्वात आहे
-DocType: Contract,Inactive,निष्क्रिय
 apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.js,This will submit Salary Slips and create accrual Journal Entry. Do you want to proceed?,हे सल्ले स्लिप्स सबमिट करेल आणि जमा करुन जर्नल एंट्री तयार करेल. आपण पुढे सुरु ठेवू इच्छिता?
 DocType: Purchase Invoice,Total Net Weight,एकूण नेट वजन
 DocType: Purchase Order,Order Confirmation No,ऑर्डर पुष्टीकरण नाही
@@ -3080,7 +3081,6 @@
 apps/erpnext/erpnext/accounts/party.py,Billing currency must be equal to either default company's currency or party account currency,बिलिंग चलन एकतर डीफॉल्ट कंपनीच्या चलन किंवा पक्ष खाते चलनाच्या बरोबरीने असणे आवश्यक आहे
 DocType: Packing Slip,Indicates that the package is a part of this delivery (Only Draft),पॅकेज वितरण (फक्त मसुदा) एक भाग आहे असे दर्शवले
 apps/erpnext/erpnext/accounts/report/customer_ledger_summary/customer_ledger_summary.py,Closing Balance,अंतिम शिल्लक
-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: Soil Texture,Loam,लोम
 apps/erpnext/erpnext/controllers/accounts_controller.py,Row {0}: Due Date cannot be before posting date,पंक्ती {0}: तारखेच्या तारखेची तारीख पोस्ट करण्यापूर्वी असू शकत नाही
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py,Quantity for Item {0} must be less than {1},आयटम  {0} साठी  प्रमाण  {1} पेक्षा कमी असणे आवश्यक आहे
@@ -3602,7 +3602,6 @@
 DocType: Stock Settings,Raise Material Request when stock reaches re-order level,स्टॉक पुन्हा आदेश स्तरावर पोहोचते तेव्हा साहित्य विनंती वाढवा
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py,Full-time,पूर्ण-वेळ
 DocType: Payroll Entry,Employees,कर्मचारी
-apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py,Please setup numbering series for Attendance via Setup &gt; Numbering Series,कृपया सेटअप&gt; क्रमांकिंग सीरिजद्वारे उपस्थितीसाठी क्रमांकन मालिका सेट करा
 DocType: Question,Single Correct Answer,एकच अचूक उत्तर
 DocType: Employee,Contact Details,संपर्क माहिती
 DocType: C-Form,Received Date,प्राप्त तारीख
@@ -4214,6 +4213,7 @@
 DocType: Pricing Rule,Price or Product Discount,किंमत किंवा उत्पादनाची सूट
 apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.py,For row {0}: Enter planned qty,{0} पंक्तीसाठी: नियोजित प्रमाण प्रविष्ट करा
 DocType: Account,Income Account,उत्पन्न खाते
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Customer &gt; Customer Group &gt; Territory,ग्राहक&gt; ग्राहक गट&gt; प्रदेश
 DocType: Payment Request,Amount in customer's currency,ग्राहक चलनात रक्कम
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js,Delivery,डिलिव्हरी
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.py,Assigning Structures...,रचना नियुक्त करीत आहे ...
@@ -4263,7 +4263,6 @@
 DocType: HR Settings,Check Vacancies On Job Offer Creation,जॉब ऑफर क्रिएशनवर रिक्त जागा तपासा
 apps/erpnext/erpnext/utilities/user_progress.py,Go to Letterheads,लेटरहेडवर जा
 DocType: Subscription,Cancel At End Of Period,कालावधी समाप्ती वर रद्द करा
-apps/erpnext/erpnext/education/doctype/instructor/instructor.py,Please setup Instructor Naming System in Education &gt; Education Settings,कृपया शिक्षण&gt; शिक्षण सेटिंग्ज मधील इन्स्ट्रक्टर नामांकन प्रणाली सेट करा
 apps/erpnext/erpnext/hr/doctype/employee_promotion/employee_promotion.js,Property already added,गुणधर्म आधीपासून जोडले आहेत
 DocType: Item Supplier,Item Supplier,आयटम पुरवठादार
 apps/erpnext/erpnext/public/js/controllers/transaction.js,Please enter Item Code to get batch no,बॅच नाही मिळविण्यासाठी आयटम कोड प्रविष्ट करा
@@ -4548,6 +4547,7 @@
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.js,Warning: Material Requested Qty is less than Minimum Order Qty,चेतावनी:  मागणी साहित्य Qty किमान Qty पेक्षा कमी आहे
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py,Account {0} is frozen,खाते {0} गोठविले
 DocType: Quiz Question,Quiz Question,प्रश्नोत्तरी प्रश्न
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Supplier &gt; Supplier Type,पुरवठादार&gt; पुरवठादार प्रकार
 DocType: Company,Legal Entity / Subsidiary with a separate Chart of Accounts belonging to the Organization.,कायदेशीर अस्तित्व / उपकंपनी स्वतंत्र लेखा चार्ट सह संघटनेला संबंधित करते
 DocType: Payment Request,Mute Email,निःशब्द ईमेल
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py,"Food, Beverage & Tobacco","अन्न, पेय आणि तंबाखू"
@@ -5060,7 +5060,6 @@
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py,Delivery warehouse required for stock item {0},डिलिव्हरी कोठार स्टॉक आयटम आवश्यक {0}
 DocType: Packing Slip,The gross weight of the package. Usually net weight + packaging material weight. (for print),संकुल एकूण वजन. सहसा निव्वळ वजन + पॅकेजिंग साहित्य वजन. (मुद्रण)
 DocType: Assessment Plan,Program,कार्यक्रम
-apps/erpnext/erpnext/hr/doctype/employee/employee.py,Please setup Employee Naming System in Human Resource &gt; HR Settings,मानव संसाधन&gt; एचआर सेटिंग्जमध्ये कर्मचारी नेमिंग सिस्टम सेट करा
 DocType: Accounts Settings,Users with this role are allowed to set frozen accounts and create / modify accounting entries against frozen accounts,या भूमिका वापरकर्त्यांनी  गोठविलेल्या खात्यांचे विरुद्ध लेखा नोंदी गोठविलेल्या खाती सेट आणि तयार / सुधारित करण्याची अनुमती आहे
 ,Project Billing Summary,प्रकल्प बिलिंग सारांश
 DocType: Vital Signs,Cuts,कट
@@ -5407,6 +5406,8 @@
 apps/erpnext/erpnext/accounts/doctype/monthly_distribution/monthly_distribution.py,Percentage Allocation should be equal to 100%,टक्केवारी वाटप 100% समान असावी
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js,Please select Posting Date before selecting Party,कृपया पार्टी निवड केली पोस्टिंग तारीख निवडा
 apps/erpnext/erpnext/config/accounting.py,Payment Terms based on conditions,अटींवर आधारित देय अटी
+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: Program Enrollment,School House,शाळा हाऊस
 DocType: Serial No,Out of AMC,एएमसी पैकी
 DocType: Opportunity,Opportunity Amount,संधीची रक्कम
@@ -5607,6 +5608,7 @@
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py,Order/Quot %,ऑर्डर / quot%
 apps/erpnext/erpnext/config/healthcare.py,Record Patient Vitals,नोंद रुग्ण Vitals
 DocType: Fee Schedule,Institution,संस्था
+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: Asset,Partially Depreciated,अंशतः अवमूल्यन
 DocType: Issue,Opening Time,उघडण्याची  वेळ
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py,From and To dates required,पासून आणि  पर्यंत तारखा आवश्यक आहेत
@@ -5824,6 +5826,7 @@
 DocType: Quality Procedure Process,Link existing Quality Procedure.,विद्यमान गुणवत्ता प्रक्रियेचा दुवा साधा.
 apps/erpnext/erpnext/config/hr.py,Loans,कर्ज
 DocType: Healthcare Service Unit,Healthcare Service Unit,हेल्थकेअर सर्व्हिस युनिट
+,Customer-wise Item Price,ग्राहकनिहाय वस्तूंची किंमत
 apps/erpnext/erpnext/public/js/financial_statements.js,Cash Flow Statement,रोख फ्लो स्टेटमेंट
 apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.py,No material request created,कोणतीही भौतिक विनंती तयार केली नाही
 apps/erpnext/erpnext/hr/doctype/loan_application/loan_application.py,Loan Amount cannot exceed Maximum Loan Amount of {0},कर्ज रक्कम कमाल कर्ज रक्कम जास्त असू शकत नाही {0}
@@ -6088,6 +6091,7 @@
 apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py,Opening Value,उघडण्याचे  मूल्य
 DocType: Salary Component,Formula,सुत्र
 apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py,Serial #,सिरियल #
+apps/erpnext/erpnext/hr/doctype/employee/employee.py,Please setup Employee Naming System in Human Resource &gt; HR Settings,मानव संसाधन&gt; एचआर सेटिंग्जमध्ये कर्मचारी नेमिंग सिस्टम सेट करा
 DocType: Material Request Plan Item,Required Quantity,आवश्यक प्रमाणात
 DocType: Lab Test Template,Lab Test Template,लॅब टेस्ट टेम्पलेट
 apps/erpnext/erpnext/setup/doctype/company/company.py,Sales Account,विक्री खाते
@@ -6332,7 +6336,6 @@
 DocType: Request for Quotation Item,Project Name,प्रकल्प नाव
 apps/erpnext/erpnext/regional/italy/utils.py,Please set the Customer Address,कृपया ग्राहक पत्ता सेट करा
 DocType: Customer,Mention if non-standard receivable account,उल्लेख गैर-मानक प्राप्त खाते तर
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Customer &gt; Customer Group &gt; Territory,ग्राहक&gt; ग्राहक गट&gt; प्रदेश
 DocType: Bank,Plaid Access Token,प्लेड Tokक्सेस टोकन
 apps/erpnext/erpnext/hr/doctype/employee_benefit_application/employee_benefit_application.py,Please add the remaining benefits {0} to any of the existing component,कृपया विद्यमान कोणतेही घटक {0} वर विद्यमान घटक जोडा
 DocType: Journal Entry Account,If Income or Expense,उत्पन्न किंवा खर्च असेल तर
@@ -6592,8 +6595,6 @@
 apps/erpnext/erpnext/buying/utils.py,Please enter quantity for Item {0},आयटम {0} साठी  संख्या प्रविष्ट करा
 DocType: Quality Procedure,Processes,प्रक्रिया
 DocType: Shift Type,First Check-in and Last Check-out,प्रथम चेक इन आणि अंतिम तपासणी
-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/regional/report/hsn_wise_summary_of_outward_supplies/hsn_wise_summary_of_outward_supplies.py,Total Taxable Amount,एकूण करपात्र रक्कम
 DocType: Employee External Work History,Employee External Work History,कर्मचारी बाह्य कार्य इतिहास
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.py,Job card {0} created,जॉब कार्ड {0} तयार केले
@@ -6630,6 +6631,7 @@
 apps/erpnext/erpnext/accounts/doctype/payment_terms_template/payment_terms_template.py,Combined invoice portion must equal 100%,संयुक्त चलन भाग 100%
 DocType: Item Default,Default Expense Account,मुलभूत खर्च खाते
 DocType: GST Account,CGST Account,CGST खाते
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Item Code &gt; Item Group &gt; Brand,आयटम कोड&gt; आयटम गट&gt; ब्रँड
 apps/erpnext/erpnext/education/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py,Student Email ID,विद्यार्थी ईमेल आयडी
 DocType: Employee,Notice (days),सूचना (दिवस)
 DocType: POS Closing Voucher Invoices,POS Closing Voucher Invoices,पीओएस बंद व्हाउचर इनवॉइसस
@@ -6954,6 +6956,7 @@
 DocType: POS Closing Voucher,Expense Details,खर्चाचा तपशील
 apps/erpnext/erpnext/public/js/stock_analytics.js,Select Brand...,ब्रँड निवडा
 apps/erpnext/erpnext/public/js/setup_wizard.js,Non Profit (beta),नॉन प्रॉफिट (बीटा)
+apps/erpnext/erpnext/portal/doctype/products_settings/products_settings.py,"Filter Fields Row #{0}: Fieldname <b>{1}</b> must be of type ""Link"" or ""Table MultiSelect""",फिल्टर फील्ड पंक्ती # {0}: फील्डचेम <b>{1}</b> &quot;दुवा&quot; किंवा &quot;सारणी मल्टि निवड&quot; प्रकारातील असणे आवश्यक आहे
 apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py,Accumulated Depreciation as on,म्हणून घसारा जमा
 DocType: Employee Tax Exemption Category,Employee Tax Exemption Category,कर्मचारी कर सूट श्रेणी
 apps/erpnext/erpnext/hr/doctype/additional_salary/additional_salary.py,Amount should not be less than zero.,रक्कम शून्यापेक्षा कमी नसावी.
@@ -7266,6 +7269,7 @@
 DocType: Maintenance Visit,Maintenance Date,देखभाल तारीख
 DocType: Purchase Invoice Item,Rejected Serial No,नाकारल्याचे सिरियल क्रमांक
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py,Year start date or end date is overlapping with {0}. To avoid please set company,वर्ष प्रारंभ तारीख किंवा समाप्ती तारीख {0} आच्छादित आहे. टाळण्यासाठी कृपया कंपनी
+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/selling/doctype/customer/customer.py,Please mention the Lead Name in Lead {0},लीडचे नाव {0} मध्ये लिहा.
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py,Start date should be less than end date for Item {0},आयटम  {0} साठी प्रारंभ तारीखेपेक्षा अंतिम तारीख कमी असणे आवश्यक आहे
 DocType: Shift Type,Auto Attendance Settings,स्वयं उपस्थिती सेटिंग्ज
diff --git a/erpnext/translations/ms.csv b/erpnext/translations/ms.csv
index af33861..cff7e09 100644
--- a/erpnext/translations/ms.csv
+++ b/erpnext/translations/ms.csv
@@ -168,7 +168,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py,Accountant,Akauntan
 apps/erpnext/erpnext/stock/report/item_price_stock/item_price_stock.py,Selling Price List,Senarai Harga Jualan
 DocType: Patient,Tobacco Current Use,Penggunaan Semasa Tembakau
-apps/erpnext/erpnext/stock/report/item_price_stock/item_price_stock.py,Selling Rate,Kadar Jualan
+apps/erpnext/erpnext/selling/report/customer_wise_item_price/customer_wise_item_price.py,Selling Rate,Kadar Jualan
 apps/erpnext/erpnext/erpnext_integrations/doctype/plaid_settings/plaid_settings.js,Please save your document before adding a new account,Sila simpan dokumen anda sebelum menambah akaun baru
 DocType: Cost Center,Stock User,Saham pengguna
 DocType: Soil Analysis,(Ca+Mg)/K,(Ca + Mg) / K
@@ -205,7 +205,6 @@
 DocType: Packed Item,Parent Detail docname,Detail Ibu Bapa docname
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py,"Reference: {0}, Item Code: {1} and Customer: {2}","Rujukan: {0}, Kod Item: {1} dan Pelanggan: {2}"
 apps/erpnext/erpnext/accounts/report/consolidated_financial_statement/consolidated_financial_statement.py,{0} {1} is not present in the parent company,{0} {1} tidak terdapat di syarikat induk
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Supplier &gt; Supplier Type,Pembekal&gt; Jenis Pembekal
 apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py,Trial Period End Date Cannot be before Trial Period Start Date,Tarikh Akhir Tempoh Percubaan Tidak boleh sebelum Tarikh Mula Tempoh Percubaan
 apps/erpnext/erpnext/utilities/user_progress.py,Kg,Kg
 DocType: Tax Withholding Category,Tax Withholding Category,Kategori Pemotongan Cukai
@@ -319,6 +318,7 @@
 DocType: Quality Procedure Table,Responsible Individual,Individu Yang Bertanggungjawab
 DocType: Naming Series,Prefix,Awalan
 apps/erpnext/erpnext/hr/notification/training_scheduled/training_scheduled.html,Event Location,Lokasi Acara
+apps/erpnext/erpnext/selling/report/customer_wise_item_price/customer_wise_item_price.py,Available Stock,Stok Tersedia
 DocType: Asset Settings,Asset Settings,Tetapan Aset
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py,Consumable,Guna habis
 DocType: Student,B-,B-
@@ -352,6 +352,7 @@
 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 \
 				Serial No.",Tidak dapat memastikan penghantaran oleh Siri Tidak seperti \ item {0} ditambah dengan dan tanpa Memastikan Penghantaran oleh \ No.
+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/accounts/doctype/sales_invoice/sales_invoice.py,At least one mode of payment is required for POS invoice.,Sekurang-kurangnya satu cara pembayaran adalah diperlukan untuk POS invois.
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py,Batch no is required for batched item {0},Batch tidak diperlukan untuk item yang dibatal {0}
 DocType: Bank Statement Transaction Invoice Item,Bank Statement Transaction Invoice Item,Item Invois Transaksi Penyata Bank
@@ -880,7 +881,6 @@
 DocType: Vital Signs,Blood Pressure (systolic),Tekanan Darah (sistolik)
 apps/erpnext/erpnext/controllers/buying_controller.py,{0} {1} is {2},{0} {1} ialah {2}
 DocType: Item Price,Valid Upto,Sah Upto
-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: Training Event,Workshop,bengkel
 DocType: Supplier Scorecard Scoring Standing,Warn Purchase Orders,Perhatian Pesanan Pembelian
 apps/erpnext/erpnext/utilities/user_progress.py,List a few of your customers. They could be organizations or individuals.,Senarai beberapa pelanggan anda. Mereka boleh menjadi organisasi atau individu.
@@ -1672,7 +1672,6 @@
 DocType: Item Barcode,Item Barcode,Item Barcode
 DocType: Delivery Trip,In Transit,Dalam Transit
 DocType: Woocommerce Settings,Endpoints,Titik akhir
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Item Code &gt; Item Group &gt; Brand,Kod Item&gt; Kumpulan Item&gt; Jenama
 DocType: Shopping Cart Settings,Show Configure Button,Tunjukkan Butang Konfigurasi
 DocType: Quality Inspection Reading,Reading 6,Membaca 6
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js,Cannot {0} {1} {2} without any negative outstanding invoice,Tidak boleh {0} {1} {2} tanpa sebarang invois tertunggak negatif
@@ -2037,6 +2036,7 @@
 DocType: Cheque Print Template,Payer Settings,Tetapan pembayar
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js,No pending Material Requests found to link for the given items.,Tiada Permintaan Bahan yang belum selesai dijumpai untuk dihubungkan untuk item yang diberikan.
 apps/erpnext/erpnext/public/js/utils/party.js,Select company first,Pilih syarikat pertama
+apps/erpnext/erpnext/accounts/general_ledger.py,Account: <b>{0}</b> is capital Work in progress and can not be updated by Journal Entry,Akaun: <b>{0}</b> adalah modal Kerja dalam proses dan tidak dapat dikemas kini oleh Kemasukan Jurnal
 apps/erpnext/erpnext/education/doctype/quiz/quiz.py,Compare List function takes on list arguments,Bandingkan fungsi Senarai mengambil argumen senarai
 DocType: Item Attribute Value,"This will be appended to the Item Code of the variant. For example, if your abbreviation is ""SM"", and the item code is ""T-SHIRT"", the item code of the variant will be ""T-SHIRT-SM""","Ini akan dilampirkan Kod Item bagi varian. Sebagai contoh, jika anda adalah singkatan &quot;SM&quot;, dan kod item adalah &quot;T-SHIRT&quot;, kod item varian akan &quot;T-SHIRT-SM&quot;"
 DocType: Salary Slip,Net Pay (in words) will be visible once you save the Salary Slip.,Gaji bersih (dengan perkataan) akan dapat dilihat selepas anda menyimpan Slip Gaji.
@@ -2223,6 +2223,7 @@
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js,Item 2,Perkara 2
 DocType: Pricing Rule,Validate Applied Rule,Mengesahkan Peraturan Terapan
 DocType: QuickBooks Migrator,Authorization Endpoint,Endpoint Kebenaran
+DocType: Employee Onboarding,Notify users by email,Beritahu pengguna melalui e-mel
 DocType: Travel Request,International,Antarabangsa
 DocType: Training Event,Training Event,Event Training
 DocType: Item,Auto re-order,Auto semula perintah
@@ -2836,7 +2837,6 @@
 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
-DocType: Contract,Inactive,Tidak aktif
 apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.js,This will submit Salary Slips and create accrual Journal Entry. Do you want to proceed?,Ini akan menghantar Slip Gaji dan membuat Penyertaan Jurnal akrual. Adakah anda mahu meneruskan?
 DocType: Purchase Invoice,Total Net Weight,Jumlah Berat Bersih
 DocType: Purchase Order,Order Confirmation No,Pengesahan Pesanan No
@@ -3119,7 +3119,6 @@
 apps/erpnext/erpnext/accounts/party.py,Billing currency must be equal to either default company's currency or party account currency,Mata wang penagihan mestilah sama dengan mata wang syarikat atau mata wang akaun pihak ketiga
 DocType: Packing Slip,Indicates that the package is a part of this delivery (Only Draft),Menunjukkan bahawa pakej itu adalah sebahagian daripada penghantaran ini (Hanya Draf)
 apps/erpnext/erpnext/accounts/report/customer_ledger_summary/customer_ledger_summary.py,Closing Balance,Baki Penutupan
-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}
 DocType: Soil Texture,Loam,Loam
 apps/erpnext/erpnext/controllers/accounts_controller.py,Row {0}: Due Date cannot be before posting date,Baris {0}: Tarikh Hutang tidak dapat sebelum tarikh siaran
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py,Quantity for Item {0} must be less than {1},Kuantiti untuk Perkara {0} mesti kurang daripada {1}
@@ -3648,7 +3647,6 @@
 DocType: Stock Settings,Raise Material Request when stock reaches re-order level,Meningkatkan Bahan Permintaan apabila saham mencapai tahap semula perintah-
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py,Full-time,Sepenuh masa
 DocType: Payroll Entry,Employees,pekerja
-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: Question,Single Correct Answer,Jawapan yang betul
 DocType: Employee,Contact Details,Butiran Hubungi
 DocType: C-Form,Received Date,Tarikh terima
@@ -4264,6 +4262,7 @@
 DocType: Pricing Rule,Price or Product Discount,Diskaun Harga atau Produk
 apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.py,For row {0}: Enter planned qty,Untuk baris {0}: Masukkan qty yang dirancang
 DocType: Account,Income Account,Akaun Pendapatan
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Customer &gt; Customer Group &gt; Territory,Pelanggan&gt; Kumpulan Pelanggan&gt; Wilayah
 DocType: Payment Request,Amount in customer's currency,Amaun dalam mata wang pelanggan
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js,Delivery,Penghantaran
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.py,Assigning Structures...,Menetapkan Struktur ...
@@ -4313,7 +4312,6 @@
 DocType: HR Settings,Check Vacancies On Job Offer Creation,Semak Kekosongan Mengenai Penciptaan Tawaran Kerja
 apps/erpnext/erpnext/utilities/user_progress.py,Go to Letterheads,Pergi ke Letterheads
 DocType: Subscription,Cancel At End Of Period,Batalkan Pada Akhir Tempoh
-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/hr/doctype/employee_promotion/employee_promotion.js,Property already added,Harta sudah ditambah
 DocType: Item Supplier,Item Supplier,Perkara Pembekal
 apps/erpnext/erpnext/public/js/controllers/transaction.js,Please enter Item Code to get batch no,Sila masukkan Kod Item untuk mendapatkan kumpulan tidak
@@ -4599,6 +4597,7 @@
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.js,Warning: Material Requested Qty is less than Minimum Order Qty,Amaran: Bahan Kuantiti yang diminta adalah kurang daripada Minimum Kuantiti Pesanan
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py,Account {0} is frozen,Akaun {0} dibekukan
 DocType: Quiz Question,Quiz Question,Soalan Kuiz
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Supplier &gt; Supplier Type,Pembekal&gt; Jenis Pembekal
 DocType: Company,Legal Entity / Subsidiary with a separate Chart of Accounts belonging to the Organization.,Undang-undang Entiti / Anak Syarikat dengan Carta berasingan Akaun milik Pertubuhan.
 DocType: Payment Request,Mute Email,Senyapkan E-mel
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py,"Food, Beverage & Tobacco","Makanan, Minuman &amp; Tembakau"
@@ -5115,7 +5114,6 @@
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py,Delivery warehouse required for stock item {0},Gudang penghantaran diperlukan untuk item stok {0}
 DocType: Packing Slip,The gross weight of the package. Usually net weight + packaging material weight. (for print),Berat kasar pakej. Biasanya berat bersih + pembungkusan berat badan yang ketara. (Untuk cetak)
 DocType: Assessment Plan,Program,program
-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: Accounts Settings,Users with this role are allowed to set frozen accounts and create / modify accounting entries against frozen accounts,Pengguna dengan peranan ini dibenarkan untuk menetapkan akaun beku dan mencipta / mengubahsuai entri perakaunan terhadap akaun beku
 ,Project Billing Summary,Ringkasan Pengebilan Projek
 DocType: Vital Signs,Cuts,Cuts
@@ -5366,6 +5364,7 @@
 apps/erpnext/erpnext/quality_management/doctype/quality_review/quality_review_list.js,No Action,Tiada tindakan
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js,Valuation type charges can not marked as Inclusive,Caj jenis penilaian tidak boleh ditandakan sebagai Inclusive
 DocType: POS Profile,Update Stock,Update Saham
+apps/erpnext/erpnext/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/stock/doctype/packing_slip/packing_slip.js,Different UOM for items will lead to incorrect (Total) Net Weight value. Make sure that Net Weight of each item is in the same UOM.,UOM berbeza untuk perkara akan membawa kepada tidak betul (Jumlah) Nilai Berat Bersih. Pastikan Berat bersih setiap item adalah dalam UOM yang sama.
 DocType: Certification Application,Payment Details,Butiran Pembayaran
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py,BOM Rate,Kadar BOM
@@ -5471,6 +5470,8 @@
 apps/erpnext/erpnext/accounts/doctype/monthly_distribution/monthly_distribution.py,Percentage Allocation should be equal to 100%,Peratus Peruntukan hendaklah sama dengan 100%
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js,Please select Posting Date before selecting Party,Sila pilih Tarikh Pengeposan sebelum memilih Parti
 apps/erpnext/erpnext/config/accounting.py,Payment Terms based on conditions,Terma pembayaran berdasarkan syarat
+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: Program Enrollment,School House,School House
 DocType: Serial No,Out of AMC,Daripada AMC
 DocType: Opportunity,Opportunity Amount,Jumlah Peluang
@@ -5674,6 +5675,7 @@
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py,Order/Quot %,Order / Quot%
 apps/erpnext/erpnext/config/healthcare.py,Record Patient Vitals,Catatkan Vital Pesakit
 DocType: Fee Schedule,Institution,institusi
+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}
 DocType: Asset,Partially Depreciated,sebahagiannya telah disusutnilai
 DocType: Issue,Opening Time,Masa Pembukaan
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py,From and To dates required,Dari dan kepada tarikh yang dikehendaki
@@ -5894,6 +5896,7 @@
 DocType: Quality Procedure Process,Link existing Quality Procedure.,Pautan Prosedur Kualiti yang sedia ada.
 apps/erpnext/erpnext/config/hr.py,Loans,Pinjaman
 DocType: Healthcare Service Unit,Healthcare Service Unit,Unit Perkhidmatan Penjagaan Kesihatan
+,Customer-wise Item Price,Harga item pelanggan-bijak
 apps/erpnext/erpnext/public/js/financial_statements.js,Cash Flow Statement,Penyata aliran tunai
 apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.py,No material request created,Tiada permintaan bahan dibuat
 apps/erpnext/erpnext/hr/doctype/loan_application/loan_application.py,Loan Amount cannot exceed Maximum Loan Amount of {0},Jumlah Pinjaman tidak boleh melebihi Jumlah Pinjaman maksimum {0}
@@ -6160,6 +6163,7 @@
 apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py,Opening Value,Nilai pembukaan
 DocType: Salary Component,Formula,formula
 apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py,Serial #,Serial #
+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: Material Request Plan Item,Required Quantity,Kuantiti yang Diperlukan
 DocType: Lab Test Template,Lab Test Template,Templat Ujian Lab
 apps/erpnext/erpnext/accounts/doctype/accounting_period/accounting_period.py,Accounting Period overlaps with {0},Tempoh Perakaunan bertindih dengan {0}
@@ -6410,7 +6414,6 @@
 DocType: Request for Quotation Item,Project Name,Nama Projek
 apps/erpnext/erpnext/regional/italy/utils.py,Please set the Customer Address,Sila tetapkan Alamat Pelanggan
 DocType: Customer,Mention if non-standard receivable account,Sebut jika akaun belum terima tidak standard
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Customer &gt; Customer Group &gt; Territory,Pelanggan&gt; Kumpulan Pelanggan&gt; Wilayah
 DocType: Bank,Plaid Access Token,Token Akses Plaid
 apps/erpnext/erpnext/hr/doctype/employee_benefit_application/employee_benefit_application.py,Please add the remaining benefits {0} to any of the existing component,Sila tambahkan faedah yang tinggal {0} kepada mana-mana komponen sedia ada
 DocType: Journal Entry Account,If Income or Expense,Jika Pendapatan atau Perbelanjaan
@@ -6674,8 +6677,6 @@
 apps/erpnext/erpnext/buying/utils.py,Please enter quantity for Item {0},Sila masukkan kuantiti untuk Perkara {0}
 DocType: Quality Procedure,Processes,Proses
 DocType: Shift Type,First Check-in and Last Check-out,Daftar Masuk Pertama dan Daftar Keluar Terakhir
-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/regional/report/hsn_wise_summary_of_outward_supplies/hsn_wise_summary_of_outward_supplies.py,Total Taxable Amount,Jumlah Cukai Yang Boleh Dibayar
 DocType: Employee External Work History,Employee External Work History,Luar pekerja Sejarah Kerja
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.py,Job card {0} created,Kad kerja {0} dibuat
@@ -6712,6 +6713,7 @@
 apps/erpnext/erpnext/accounts/doctype/payment_terms_template/payment_terms_template.py,Combined invoice portion must equal 100%,Bahagian invois gabungan mesti bersamaan 100%
 DocType: Item Default,Default Expense Account,Akaun Perbelanjaan Default
 DocType: GST Account,CGST Account,Akaun CGST
+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/education/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py,Student Email ID,Pelajar Email ID
 DocType: Employee,Notice (days),Notis (hari)
 DocType: POS Closing Voucher Invoices,POS Closing Voucher Invoices,Invois Baucar Penutupan POS
@@ -7355,6 +7357,7 @@
 DocType: Maintenance Visit,Maintenance Date,Tarikh Penyelenggaraan
 DocType: Purchase Invoice Item,Rejected Serial No,Tiada Serial Ditolak
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py,Year start date or end date is overlapping with {0}. To avoid please set company,Tahun tarikh mula atau tarikh akhir adalah bertindih dengan {0}. Untuk mengelakkan sila menetapkan syarikat
+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/selling/doctype/customer/customer.py,Please mention the Lead Name in Lead {0},Sila nyatakan Nama Utama di Lead {0}
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py,Start date should be less than end date for Item {0},Tarikh mula boleh kurang daripada tarikh akhir untuk Perkara {0}
 DocType: Shift Type,Auto Attendance Settings,Tetapan Kehadiran Auto
diff --git a/erpnext/translations/my.csv b/erpnext/translations/my.csv
index af6b960..d74175a 100644
--- a/erpnext/translations/my.csv
+++ b/erpnext/translations/my.csv
@@ -168,7 +168,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py,Accountant,စာရင်းကိုင်
 apps/erpnext/erpnext/stock/report/item_price_stock/item_price_stock.py,Selling Price List,စျေးစာရင်းရောင်းချနေ
 DocType: Patient,Tobacco Current Use,ဆေးရွက်ကြီးလက်ရှိအသုံးပြုမှု
-apps/erpnext/erpnext/stock/report/item_price_stock/item_price_stock.py,Selling Rate,ရောင်းချနှုန်း
+apps/erpnext/erpnext/selling/report/customer_wise_item_price/customer_wise_item_price.py,Selling Rate,ရောင်းချနှုန်း
 apps/erpnext/erpnext/erpnext_integrations/doctype/plaid_settings/plaid_settings.js,Please save your document before adding a new account,သစ်တစ်ခုအကောင့်ဖြည့်စွက်ရှေ့၌သင်တို့စာရွက်စာတမ်းကယ်တင်ပေးပါ
 DocType: Cost Center,Stock User,စတော့အိတ်အသုံးပြုသူတို့၏
 DocType: Soil Analysis,(Ca+Mg)/K,(Ca + Mg) / K သည်
@@ -205,7 +205,6 @@
 DocType: Packed Item,Parent Detail docname,မိဘ Detail docname
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py,"Reference: {0}, Item Code: {1} and Customer: {2}","ကိုးကားစရာ: {0}, Item Code ကို: {1} နှင့်ဖောက်သည်: {2}"
 apps/erpnext/erpnext/accounts/report/consolidated_financial_statement/consolidated_financial_statement.py,{0} {1} is not present in the parent company,{0} {1} မိဘကုမ္ပဏီအတွက်ပစ္စုပ္ပန်မဟုတ်ပါ
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Supplier &gt; Supplier Type,ပေးသွင်း&gt; ပေးသွင်းအမျိုးအစား
 apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py,Trial Period End Date Cannot be before Trial Period Start Date,စမ်းသပ်မှုကာလပြီးဆုံးရက်စွဲရုံးတင်စစ်ဆေးကာလ Start ကိုနေ့စွဲမတိုင်မီမဖြစ်နိုင်သလား
 apps/erpnext/erpnext/utilities/user_progress.py,Kg,ကီလိုဂရမ်
 DocType: Tax Withholding Category,Tax Withholding Category,အခွန်နှိမ် Category:
@@ -319,6 +318,7 @@
 DocType: Quality Procedure Table,Responsible Individual,တာဝန်ရှိတစ်ဦးချင်း
 DocType: Naming Series,Prefix,ရှေ့ဆကျတှဲ
 apps/erpnext/erpnext/hr/notification/training_scheduled/training_scheduled.html,Event Location,ဖြစ်ရပ်တည်နေရာ
+apps/erpnext/erpnext/selling/report/customer_wise_item_price/customer_wise_item_price.py,Available Stock,ရရှိနိုင်ပါစတော့အိတ်
 DocType: Asset Settings,Asset Settings,ပိုင်ဆိုင်မှု Settings များ
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py,Consumable,Consumer
 DocType: Student,B-,ပါဘူးရှငျ
@@ -352,6 +352,7 @@
 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 \
 				Serial No.",\ Item {0} နှင့်အတူထည့်သွင်းခြင်းနှင့်မပါဘဲ \ Serial နံပါတ်အားဖြင့် Delivery အာမခံဖြစ်ပါတယ်အဖြစ် Serial အဘယ်သူမျှမနေဖြင့်ဖြန့်ဝေသေချာမပေးနိုင်
+apps/erpnext/erpnext/education/doctype/instructor/instructor.py,Please setup Instructor Naming System in Education &gt; Education Settings,ပညာရေးအတွက် System ကိုအမည်ဖြင့်သမုတ် ကျေးဇူးပြု. setup ကိုနည်းပြ&gt; ပညာရေးကိုဆက်တင်
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py,At least one mode of payment is required for POS invoice.,ငွေပေးချေမှု၏အနည်းဆုံး mode ကို POS ငွေတောင်းခံလွှာဘို့လိုအပ်ပါသည်။
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py,Batch no is required for batched item {0},အသုတ်အဘယ်သူမျှမ batch ကို item {0} ဘို့လိုအပ်ပါသည်
 DocType: Bank Statement Transaction Invoice Item,Bank Statement Transaction Invoice Item,ဘဏ်ဖော်ပြချက်ငွေသွင်းငွေထုတ်ပြေစာ Item
@@ -880,7 +881,6 @@
 DocType: Vital Signs,Blood Pressure (systolic),သွေးဖိအား (နှလုံးကျုံ့)
 apps/erpnext/erpnext/controllers/buying_controller.py,{0} {1} is {2},{0} {1} {2} ဖြစ်ပါသည်
 DocType: Item Price,Valid Upto,သက်တမ်းရှိအထိ
-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: Training Event,Workshop,အလုပ်ရုံ
 DocType: Supplier Scorecard Scoring Standing,Warn Purchase Orders,အရစ်ကျမိန့်သတိပေး
 apps/erpnext/erpnext/utilities/user_progress.py,List a few of your customers. They could be organizations or individuals.,သင့်ရဲ့ဖောက်သည်၏အနည်းငယ်စာရင်း။ သူတို့ဟာအဖွဲ့အစည်းများသို့မဟုတ်လူပုဂ္ဂိုလ်တစ်ဦးချင်းဖြစ်နိုင်ပါတယ်။
@@ -1672,7 +1672,6 @@
 DocType: Item Barcode,Item Barcode,item Barcode
 DocType: Delivery Trip,In Transit,အကူးအပြောင်းတွင်
 DocType: Woocommerce Settings,Endpoints,Endpoints
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Item Code &gt; Item Group &gt; Brand,item Code ကို&gt; item Group မှ&gt; အမှတ်တံဆိပ်
 DocType: Shopping Cart Settings,Show Configure Button,Show ကို Configure Button လေး
 DocType: Quality Inspection Reading,Reading 6,6 Reading
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js,Cannot {0} {1} {2} without any negative outstanding invoice,နိုင်သလားမ {0} {1} {2} မည်သည့်အနှုတ်လက္ခဏာထူးချွန်ငွေတောင်းခံလွှာမပါဘဲ
@@ -2037,6 +2036,7 @@
 DocType: Cheque Print Template,Payer Settings,အခွန်ထမ်းက Settings
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js,No pending Material Requests found to link for the given items.,ပေးထားသောပစ္စည်းများကိုများအတွက်ချိတ်ဆက်မျှမတွေ့ဆိုင်းငံ့ပစ္စည်းတောင်းဆိုချက်များ။
 apps/erpnext/erpnext/public/js/utils/party.js,Select company first,ပထမဦးဆုံးအကုမ္ပဏီကိုရွေးချယ်ပါ
+apps/erpnext/erpnext/accounts/general_ledger.py,Account: <b>{0}</b> is capital Work in progress and can not be updated by Journal Entry,အကောင့်: <b>{0}</b> တိုးတက်မှုအတွက်မြို့တော်သူ Work သည်နှင့်ဂျာနယ် Entry အားဖြင့် update လုပ်မရနိုငျ
 apps/erpnext/erpnext/education/doctype/quiz/quiz.py,Compare List function takes on list arguments,စာရင်းအငြင်းပွားမှုများအပေါ်ကြာစာရင်း function ကိုနှိုငျးယှဉျ
 DocType: Item Attribute Value,"This will be appended to the Item Code of the variant. For example, if your abbreviation is ""SM"", and the item code is ""T-SHIRT"", the item code of the variant will be ""T-SHIRT-SM""","ဤသည်မူကွဲ၏ Item Code ကိုမှ appended လိမ့်မည်။ သင့်ရဲ့အတိုကောက် &quot;SM&quot; ဖြစ်ပြီး, ပစ္စည်း code ကို &quot;သည် T-shirt&quot; ဖြစ်ပါတယ်လျှင်ဥပမာ, ကိုမူကွဲ၏ပစ္စည်း code ကို &quot;သည် T-shirt-SM&quot; ဖြစ်လိမ့်မည်"
 DocType: Salary Slip,Net Pay (in words) will be visible once you save the Salary Slip.,သင်လစာစလစ်ဖြတ်ပိုင်းပုံစံကိုကယ်တင်တခါ (စကား) Net က Pay ကိုမြင်နိုင်ပါလိမ့်မည်။
@@ -2223,6 +2223,7 @@
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js,Item 2,item 2
 DocType: Pricing Rule,Validate Applied Rule,တရားဝင်အောင်ပြုလုပ်အသုံးချနည်းဥပဒေ
 DocType: QuickBooks Migrator,Authorization Endpoint,authorization ဆုံးမှတ်
+DocType: Employee Onboarding,Notify users by email,အီးမေးလ်ဖြင့်အသုံးပြုသူများသည်အသိပေး
 DocType: Travel Request,International,အပြည်ပြည်ဆိုင်ရာ
 DocType: Training Event,Training Event,လေ့ကျင့်ရေးပွဲ
 DocType: Item,Auto re-order,မော်တော်ကားပြန်လည်အမိန့်
@@ -2836,7 +2837,6 @@
 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,အမည်တူနှင့်အတူတစ်ဦးကဖောက်သည်ပြီးသားတည်ရှိ
-DocType: Contract,Inactive,မလှုပ်ရှားတတ်သော
 apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.js,This will submit Salary Slips and create accrual Journal Entry. Do you want to proceed?,ဤသည်လစာစလစ်တင်ပြရန်နှင့်တိုးပွားလာသောဂျာနယ် Entry ဖန်တီးပါလိမ့်မယ်။ သငျသညျဆက်လက်ဆောင်ရွက်ချင်ပါသလား?
 DocType: Purchase Invoice,Total Net Weight,စုစုပေါင်းအသားတင်အလေးချိန်
 DocType: Purchase Order,Order Confirmation No,အမိန့်အတည်ပြုချက်အဘယ်သူမျှမ
@@ -3119,7 +3119,6 @@
 apps/erpnext/erpnext/accounts/party.py,Billing currency must be equal to either default company's currency or party account currency,ငွေတောင်းခံငွေကြေးသော်လည်းကောင်း default အကုမ္ပဏီ၏ငွေကြေးသို့မဟုတ်ပါတီအကောင့်ငွေကြေးညီမျှရှိရမည်
 DocType: Packing Slip,Indicates that the package is a part of this delivery (Only Draft),(သာလျှင် Draft) ကို package ကိုဒီပို့ဆောင်မှု၏အစိတ်အပိုင်းတစ်ခုဖြစ်တယ်ဆိုတာဆိုတာကိုပြသ
 apps/erpnext/erpnext/accounts/report/customer_ledger_summary/customer_ledger_summary.py,Closing Balance,စာရင်းပိတ်လက်ကျန်
-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}
 DocType: Soil Texture,Loam,Loam
 apps/erpnext/erpnext/controllers/accounts_controller.py,Row {0}: Due Date cannot be before posting date,အတန်း {0}: ကြောင့်နေ့စွဲရက်စွဲကိုပို့စ်တင်မတိုင်မီမဖွစျနိုငျ
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py,Quantity for Item {0} must be less than {1},Item {0} သည်အရေအတွက် {1} ထက်နည်းရှိရမည်
@@ -3648,7 +3647,6 @@
 DocType: Stock Settings,Raise Material Request when stock reaches re-order level,စတော့ရှယ်ယာပြန်လည်မိန့်အဆင့်ရောက်ရှိသည့်အခါပစ္စည်းတောင်းဆိုမှုမြှင်
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py,Full-time,အချိန်ပြည့်
 DocType: Payroll Entry,Employees,န်ထမ်း
-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: Question,Single Correct Answer,လူပျိုမှန်ကန်သောအဖြေ
 DocType: Employee,Contact Details,ဆက်သွယ်ရန်အသေးစိတ်
 DocType: C-Form,Received Date,ရရှိထားသည့်နေ့စွဲ
@@ -4264,6 +4262,7 @@
 DocType: Pricing Rule,Price or Product Discount,စျေးသို့မဟုတ်ကုန်ပစ္စည်းလျှော့
 apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.py,For row {0}: Enter planned qty,အတန်းများအတွက် {0}: စီစဉ်ထားအရည်အတွက် Enter
 DocType: Account,Income Account,ဝင်ငွေခွန်အကောင့်
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Customer &gt; Customer Group &gt; Territory,ဖောက်သည်&gt; ဖောက်သည် Group မှ&gt; နယ်မြေတွေကို
 DocType: Payment Request,Amount in customer's currency,ဖောက်သည်ရဲ့ငွေကြေးပမာဏ
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js,Delivery,delivery
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.py,Assigning Structures...,သတ်မှတ်ခြင်း structures များ ...
@@ -4313,7 +4312,6 @@
 DocType: HR Settings,Check Vacancies On Job Offer Creation,ယောဘသည်ကမ်းလှမ်းချက်ဖန်ဆင်းခြင်းတွင် VACANCY Check
 apps/erpnext/erpnext/utilities/user_progress.py,Go to Letterheads,Letterheads ကိုသွားပါ
 DocType: Subscription,Cancel At End Of Period,ကာလ၏အဆုံးမှာ Cancel
-apps/erpnext/erpnext/education/doctype/instructor/instructor.py,Please setup Instructor Naming System in Education &gt; Education Settings,ပညာရေးအတွက် System ကိုအမည်ဖြင့်သမုတ် ကျေးဇူးပြု. setup ကိုနည်းပြ&gt; ပညာရေးကိုဆက်တင်
 apps/erpnext/erpnext/hr/doctype/employee_promotion/employee_promotion.js,Property already added,အိမ်ခြံမြေပြီးသားကဆက်ပြောသည်
 DocType: Item Supplier,Item Supplier,item ပေးသွင်း
 apps/erpnext/erpnext/public/js/controllers/transaction.js,Please enter Item Code to get batch no,အဘယ်သူမျှမသုတ်ရ Item Code ကိုရိုက်ထည့်ပေးပါ
@@ -4599,6 +4597,7 @@
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.js,Warning: Material Requested Qty is less than Minimum Order Qty,သတိပေးချက်: Qty တောင်းဆိုထားသောပစ္စည်းအနည်းဆုံးအမိန့် Qty ထက်နည်းသော
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py,Account {0} is frozen,အကောင့်ကို {0} အေးခဲသည်
 DocType: Quiz Question,Quiz Question,ပဟေဠိမေးခွန်း
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Supplier &gt; Supplier Type,ပေးသွင်း&gt; ပေးသွင်းအမျိုးအစား
 DocType: Company,Legal Entity / Subsidiary with a separate Chart of Accounts belonging to the Organization.,အဖွဲ့ပိုင်ငွေစာရင်း၏သီးခြားဇယားနှင့်အတူဥပဒေကြောင်းအရ Entity / လုပ်ငန်းခွဲများ။
 DocType: Payment Request,Mute Email,အသံတိတ်အီးမေးလ်
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py,"Food, Beverage & Tobacco","အစားအစာ, Beverage &amp; ဆေးရွက်ကြီး"
@@ -5115,7 +5114,6 @@
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py,Delivery warehouse required for stock item {0},စတော့ရှယ်ယာကို item {0} များအတွက်လိုအပ်သော delivery ဂိုဒေါင်
 DocType: Packing Slip,The gross weight of the package. Usually net weight + packaging material weight. (for print),အထုပ်၏စုစုပေါင်းအလေးချိန်။ ပိုက်ကွန်ကိုအလေးချိန် + ထုပ်ပိုးပစ္စည်းအလေးချိန်များသောအားဖြင့်။ (ပုံနှိပ်သည်)
 DocType: Assessment Plan,Program,အစီအစဉ်
-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: Accounts Settings,Users with this role are allowed to set frozen accounts and create / modify accounting entries against frozen accounts,ဒီအခန်းကဏ္ဍနှင့်အတူအသုံးပြုသူများကအေးခဲအကောင့်အသစ်များ၏ ထား. ဖန်တီး / အေးစက်နေတဲ့အကောင့်အသစ်များ၏ဆန့်ကျင်စာရင်းကိုင် entries တွေကိုပြုပြင်မွမ်းမံဖို့ခွင့်ပြုနေကြတယ်
 ,Project Billing Summary,Project မှငွေတောင်းခံလွှာအနှစ်ချုပ်
 DocType: Vital Signs,Cuts,ဖြတ်တောက်မှု
@@ -5366,6 +5364,7 @@
 apps/erpnext/erpnext/quality_management/doctype/quality_review/quality_review_list.js,No Action,အဘယ်သူမျှမဇာတ်ကြမ်း
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js,Valuation type charges can not marked as Inclusive,အဘိုးပြတ်သည်အတိုင်း type ကိုစွဲချက် Inclusive အဖြစ်မှတ်သားမရပါဘူး
 DocType: POS Profile,Update Stock,စတော့အိတ် Update
+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/stock/doctype/packing_slip/packing_slip.js,Different UOM for items will lead to incorrect (Total) Net Weight value. Make sure that Net Weight of each item is in the same UOM.,ပစ္စည်းများသည်ကွဲပြားခြားနားသော UOM မမှန်ကန် (Total) Net ကအလေးချိန်တန်ဖိုးကိုဆီသို့ဦးတည်ပါလိမ့်မယ်။ အသီးအသီးကို item ၏ Net ကအလေးချိန်တူညီ UOM အတွက်ကြောင်းသေချာပါစေ။
 DocType: Certification Application,Payment Details,ငွေပေးချေမှုရမည့်အသေးစိတ်အကြောင်းအရာ
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py,BOM Rate,BOM Rate
@@ -5471,6 +5470,8 @@
 apps/erpnext/erpnext/accounts/doctype/monthly_distribution/monthly_distribution.py,Percentage Allocation should be equal to 100%,ရာခိုင်နှုန်းဖြန့်ဝေ 100% နဲ့ညီမျှဖြစ်သင့်
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js,Please select Posting Date before selecting Party,ပါတီမရွေးခင် Post date ကို select လုပ်ပါကျေးဇူးပြုပြီး
 apps/erpnext/erpnext/config/accounting.py,Payment Terms based on conditions,အခြေအနေများအပေါ် အခြေခံ. ငွေပေးချေမှုရမည့်စည်းမျဉ်းစည်းကမ်းများ
+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: Program Enrollment,School House,School တွင်အိမ်
 DocType: Serial No,Out of AMC,AMC ထဲက
 DocType: Opportunity,Opportunity Amount,အခွင့်အလမ်းငွေပမာဏ
@@ -5674,6 +5675,7 @@
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py,Order/Quot %,အမိန့် / quote%
 apps/erpnext/erpnext/config/healthcare.py,Record Patient Vitals,စံချိန်လူနာအရေးပါသောအ
 DocType: Fee Schedule,Institution,တည်ထောင်ခြင်း
+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}
 DocType: Asset,Partially Depreciated,တစ်စိတ်တစ်ပိုင်းတန်ဖိုးလျော့ကျ
 DocType: Issue,Opening Time,အချိန်ဖွင့်လှစ်
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py,From and To dates required,ကနေနှင့်လိုအပ်သည့်ရက်စွဲများရန်
@@ -5894,6 +5896,7 @@
 DocType: Quality Procedure Process,Link existing Quality Procedure.,Link ကိုအရည်အသွေးလုပ်ထုံးလုပ်နည်းတည်ဆဲ။
 apps/erpnext/erpnext/config/hr.py,Loans,ချေးငွေများ
 DocType: Healthcare Service Unit,Healthcare Service Unit,ကျန်းမာရေးစောင့်ရှောက်မှုဝန်ဆောင်မှုယူနစ်
+,Customer-wise Item Price,ဖောက်သည်ပညာပစ္စည်းဈေးနှုန်း
 apps/erpnext/erpnext/public/js/financial_statements.js,Cash Flow Statement,ငွေသား Flow ဖော်ပြချက်
 apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.py,No material request created,created အဘယ်သူမျှမပစ္စည်းကိုတောငျးဆိုခကျြ
 apps/erpnext/erpnext/hr/doctype/loan_application/loan_application.py,Loan Amount cannot exceed Maximum Loan Amount of {0},ချေးငွေပမာဏ {0} အများဆုံးချေးငွေပမာဏထက်မပိုနိုင်
@@ -6160,6 +6163,7 @@
 apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py,Opening Value,ဖွင့်လှစ် Value တစ်ခု
 DocType: Salary Component,Formula,နည်း
 apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py,Serial #,serial #
+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: Material Request Plan Item,Required Quantity,လိုအပ်သောပမာဏ
 DocType: Lab Test Template,Lab Test Template,Lab ကစမ်းသပ် Template ကို
 apps/erpnext/erpnext/accounts/doctype/accounting_period/accounting_period.py,Accounting Period overlaps with {0},စာရင်းကိုင်ကာလ {0} နှင့်ထပ်
@@ -6410,7 +6414,6 @@
 DocType: Request for Quotation Item,Project Name,စီမံကိန်းအမည်
 apps/erpnext/erpnext/regional/italy/utils.py,Please set the Customer Address,အဆိုပါဖောက်သည်လိပ်စာသတ်မှတ်ပေးပါ
 DocType: Customer,Mention if non-standard receivable account,Non-စံ receiver အကောင့်ကိုလျှင်ဖော်ပြထားခြင်း
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Customer &gt; Customer Group &gt; Territory,ဖောက်သည်&gt; ဖောက်သည် Group မှ&gt; နယ်မြေတွေကို
 DocType: Bank,Plaid Access Token,Plaid Access ကိုတိုကင်
 apps/erpnext/erpnext/hr/doctype/employee_benefit_application/employee_benefit_application.py,Please add the remaining benefits {0} to any of the existing component,လက်ရှိအစိတ်အပိုင်းမဆိုရန်ကျန်ရှိအကျိုးကျေးဇူးများကို {0} add ပေးပါ
 DocType: Journal Entry Account,If Income or Expense,ဝင်ငွေခွန်သို့မဟုတ်သုံးစွဲမှုမယ်ဆိုရင်
@@ -6674,8 +6677,6 @@
 apps/erpnext/erpnext/buying/utils.py,Please enter quantity for Item {0},Item {0} သည်အရေအတွက်ရိုက်ထည့်ပေးပါ
 DocType: Quality Procedure,Processes,လုပ်ငန်းစဉ်များ
 DocType: Shift Type,First Check-in and Last Check-out,ပထမဦးစွာ Check-In နှင့်နောက်ဆုံးစစ်ဆေးမှုထွက်
-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/regional/report/hsn_wise_summary_of_outward_supplies/hsn_wise_summary_of_outward_supplies.py,Total Taxable Amount,စုစုပေါင်း Taxable ငွေပမာဏ
 DocType: Employee External Work History,Employee External Work History,ဝန်ထမ်းပြင်ပလုပ်ငန်းခွင်သမိုင်း
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.py,Job card {0} created,ယောဘသည်ကဒ် {0} created
@@ -6712,6 +6713,7 @@
 apps/erpnext/erpnext/accounts/doctype/payment_terms_template/payment_terms_template.py,Combined invoice portion must equal 100%,ပေါင်းလိုက်သောငွေတောင်းခံလွှာသောအဘို့ကို 100% တူညီရမယ်
 DocType: Item Default,Default Expense Account,default သုံးစွဲမှုအကောင့်
 DocType: GST Account,CGST Account,CGST အကောင့်
+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/education/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py,Student Email ID,ကျောင်းသားသမဂ္ဂအီးမေးလ် ID ကို
 DocType: Employee,Notice (days),အသိပေးစာ (ရက်)
 DocType: POS Closing Voucher Invoices,POS Closing Voucher Invoices,voucher ငွေတောင်းခံလွှာကိုပိတ်ခြင်း POS
@@ -7355,6 +7357,7 @@
 DocType: Maintenance Visit,Maintenance Date,ပြုပြင်ထိန်းသိမ်းမှုနေ့စွဲ
 DocType: Purchase Invoice Item,Rejected Serial No,ပယ်ချ Serial No
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py,Year start date or end date is overlapping with {0}. To avoid please set company,တစ်နှစ်တာစတင်နေ့စွဲသို့မဟုတ်အဆုံးနေ့စွဲ {0} နှင့်အတူထပ်ဖြစ်ပါတယ်။ ရှောင်ရှားရန်ကုမ္ပဏီသတ်မှတ်ထားကျေးဇူးပြုပြီး
+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/selling/doctype/customer/customer.py,Please mention the Lead Name in Lead {0},ခဲထဲမှာ {0} အဆိုပါခဲအမည်ဖော်ပြထားခြင်း ကျေးဇူးပြု.
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py,Start date should be less than end date for Item {0},နေ့စွဲ Item {0} သည်အဆုံးနေ့စွဲထက်နည်းဖြစ်သင့် Start
 DocType: Shift Type,Auto Attendance Settings,အော်တိုတက်ရောက် Settings များ
diff --git a/erpnext/translations/nl.csv b/erpnext/translations/nl.csv
index d2fcdc5..6e57649 100644
--- a/erpnext/translations/nl.csv
+++ b/erpnext/translations/nl.csv
@@ -168,7 +168,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py,Accountant,Accountant
 apps/erpnext/erpnext/stock/report/item_price_stock/item_price_stock.py,Selling Price List,Verkoopprijslijst
 DocType: Patient,Tobacco Current Use,Tabaksgebruik
-apps/erpnext/erpnext/stock/report/item_price_stock/item_price_stock.py,Selling Rate,Verkoopcijfers
+apps/erpnext/erpnext/selling/report/customer_wise_item_price/customer_wise_item_price.py,Selling Rate,Verkoopcijfers
 apps/erpnext/erpnext/erpnext_integrations/doctype/plaid_settings/plaid_settings.js,Please save your document before adding a new account,Bewaar uw document voordat u een nieuw account toevoegt
 DocType: Cost Center,Stock User,Aandeel Gebruiker
 DocType: Soil Analysis,(Ca+Mg)/K,(Ca + Mg) / K
@@ -205,7 +205,6 @@
 DocType: Packed Item,Parent Detail docname,Bovenliggende Detail docname
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py,"Reference: {0}, Item Code: {1} and Customer: {2}","Referentie: {0}, Artikelcode: {1} en klant: {2}"
 apps/erpnext/erpnext/accounts/report/consolidated_financial_statement/consolidated_financial_statement.py,{0} {1} is not present in the parent company,{0} {1} is niet aanwezig in het moederbedrijf
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Supplier &gt; Supplier Type,Leverancier&gt; Type leverancier
 apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py,Trial Period End Date Cannot be before Trial Period Start Date,Einddatum van proefperiode Mag niet vóór Startdatum proefperiode zijn
 apps/erpnext/erpnext/utilities/user_progress.py,Kg,kg
 DocType: Tax Withholding Category,Tax Withholding Category,Belastinginhouding Categorie
@@ -319,6 +318,7 @@
 DocType: Quality Procedure Table,Responsible Individual,Verantwoordelijke persoon
 DocType: Naming Series,Prefix,Voorvoegsel
 apps/erpnext/erpnext/hr/notification/training_scheduled/training_scheduled.html,Event Location,Gebeurtenis Locatie
+apps/erpnext/erpnext/selling/report/customer_wise_item_price/customer_wise_item_price.py,Available Stock,Beschikbare voorraad
 DocType: Asset Settings,Asset Settings,Activuminstellingen
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py,Consumable,Verbruiksartikelen
 DocType: Student,B-,B-
@@ -352,6 +352,7 @@
 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 \
 				Serial No.",Kan niet garanderen dat levering via serienr. As \ Item {0} wordt toegevoegd met of zonder Zorgen voor levering per \ serienr.
+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/accounts/doctype/sales_invoice/sales_invoice.py,At least one mode of payment is required for POS invoice.,Ten minste één wijze van betaling is vereist voor POS factuur.
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py,Batch no is required for batched item {0},Batch-nummer is vereist voor batch-artikel {0}
 DocType: Bank Statement Transaction Invoice Item,Bank Statement Transaction Invoice Item,Rekeningoverzicht Transactie Rekening Item
@@ -878,7 +879,6 @@
 DocType: Vital Signs,Blood Pressure (systolic),Bloeddruk (systolisch)
 apps/erpnext/erpnext/controllers/buying_controller.py,{0} {1} is {2},{0} {1} is {2}
 DocType: Item Price,Valid Upto,Geldig Tot
-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: Training Event,Workshop,werkplaats
 DocType: Supplier Scorecard Scoring Standing,Warn Purchase Orders,Waarschuwing Aankooporders
 apps/erpnext/erpnext/utilities/user_progress.py,List a few of your customers. They could be organizations or individuals.,Lijst een paar van uw klanten. Ze kunnen organisaties of personen .
@@ -1687,7 +1687,6 @@
 DocType: Item Barcode,Item Barcode,Artikel Barcode
 DocType: Delivery Trip,In Transit,Onderweg
 DocType: Woocommerce Settings,Endpoints,Eindpunten
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Item Code &gt; Item Group &gt; Brand,Artikelcode&gt; Artikelgroep&gt; Merk
 DocType: Shopping Cart Settings,Show Configure Button,Knop Configureren weergeven
 DocType: Quality Inspection Reading,Reading 6,Meting 6
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js,Cannot {0} {1} {2} without any negative outstanding invoice,Kan niet {0} {1} {2} zonder negatieve openstaande factuur
@@ -2050,6 +2049,7 @@
 DocType: Cheque Print Template,Payer Settings,Payer Instellingen
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js,No pending Material Requests found to link for the given items.,Geen uitstaande artikelaanvragen gevonden om te linken voor de gegeven items.
 apps/erpnext/erpnext/public/js/utils/party.js,Select company first,Selecteer eerst een bedrijf
+apps/erpnext/erpnext/accounts/general_ledger.py,Account: <b>{0}</b> is capital Work in progress and can not be updated by Journal Entry,Account: <b>{0}</b> is hoofdletter onderhanden werk en kan niet worden bijgewerkt via journaalboeking
 apps/erpnext/erpnext/education/doctype/quiz/quiz.py,Compare List function takes on list arguments,De functie Lijst vergelijken neemt lijstargumenten aan
 DocType: Item Attribute Value,"This will be appended to the Item Code of the variant. For example, if your abbreviation is ""SM"", and the item code is ""T-SHIRT"", the item code of the variant will be ""T-SHIRT-SM""","Dit zal worden toegevoegd aan de Code van het punt van de variant. Bijvoorbeeld, als je de afkorting is ""SM"", en de artikelcode is ""T-SHIRT"", de artikelcode van de variant zal worden ""T-SHIRT-SM"""
 DocType: Salary Slip,Net Pay (in words) will be visible once you save the Salary Slip.,Nettoloon (in woorden) zal zichtbaar zijn zodra de Salarisstrook wordt opgeslagen.
@@ -2236,6 +2236,7 @@
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js,Item 2,Punt 2
 DocType: Pricing Rule,Validate Applied Rule,Toegepaste regel valideren
 DocType: QuickBooks Migrator,Authorization Endpoint,Autorisatie-eindpunt
+DocType: Employee Onboarding,Notify users by email,Gebruikers op de hoogte stellen via e-mail
 DocType: Travel Request,International,Internationale
 DocType: Training Event,Training Event,training Event
 DocType: Item,Auto re-order,Auto re-order
@@ -2849,7 +2850,6 @@
 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
-DocType: Contract,Inactive,Inactief
 apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.js,This will submit Salary Slips and create accrual Journal Entry. Do you want to proceed?,Dit zal loonstrookjes indienen en een periodedagboek aanmaken. Wil je doorgaan?
 DocType: Purchase Invoice,Total Net Weight,Totale netto gewicht
 DocType: Purchase Order,Order Confirmation No,Orderbevestiging Nee
@@ -3132,7 +3132,6 @@
 apps/erpnext/erpnext/accounts/party.py,Billing currency must be equal to either default company's currency or party account currency,Factuurvaluta moet gelijk zijn aan de valuta van het standaardbedrijf of de valuta van het partijaccount
 DocType: Packing Slip,Indicates that the package is a part of this delivery (Only Draft),Geeft aan dat het pakket een onderdeel is van deze levering (alleen ontwerp)
 apps/erpnext/erpnext/accounts/report/customer_ledger_summary/customer_ledger_summary.py,Closing Balance,Eindsaldo
-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}
 DocType: Soil Texture,Loam,Leem
 apps/erpnext/erpnext/controllers/accounts_controller.py,Row {0}: Due Date cannot be before posting date,Rij {0}: vervaldatum kan niet vóór de boekingsdatum zijn
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py,Quantity for Item {0} must be less than {1},Hoeveelheid voor artikel {0} moet kleiner zijn dan {1}
@@ -3660,7 +3659,6 @@
 DocType: Stock Settings,Raise Material Request when stock reaches re-order level,Maak Materiaal Aanvraag wanneer voorraad daalt tot onder het bestelniveau
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py,Full-time,Full-time
 DocType: Payroll Entry,Employees,werknemers
-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: Question,Single Correct Answer,Enkel correct antwoord
 DocType: Employee,Contact Details,Contactgegevens
 DocType: C-Form,Received Date,Ontvangstdatum
@@ -4294,6 +4292,7 @@
 DocType: Pricing Rule,Price or Product Discount,Prijs of productkorting
 apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.py,For row {0}: Enter planned qty,Voor rij {0}: Voer het geplande aantal in
 DocType: Account,Income Account,Inkomstenrekening
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Customer &gt; Customer Group &gt; Territory,Klant&gt; Klantengroep&gt; Gebied
 DocType: Payment Request,Amount in customer's currency,Bedrag in de valuta van de klant
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js,Delivery,Levering
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.py,Assigning Structures...,Structuren toewijzen ...
@@ -4343,7 +4342,6 @@
 DocType: HR Settings,Check Vacancies On Job Offer Creation,Bekijk vacatures bij het creëren van vacatures
 apps/erpnext/erpnext/utilities/user_progress.py,Go to Letterheads,Ga naar Briefhoofden
 DocType: Subscription,Cancel At End Of Period,Annuleer aan het einde van de periode
-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/hr/doctype/employee_promotion/employee_promotion.js,Property already added,Property is al toegevoegd
 DocType: Item Supplier,Item Supplier,Artikel Leverancier
 apps/erpnext/erpnext/public/js/controllers/transaction.js,Please enter Item Code to get batch no,Vul de artikelcode  in om batchnummer op te halen
@@ -4641,6 +4639,7 @@
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.js,Warning: Material Requested Qty is less than Minimum Order Qty,Waarschuwing: Materiaal Aanvraag Aantal is minder dan Minimum Bestelhoeveelheid
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py,Account {0} is frozen,Rekening {0} is bevroren
 DocType: Quiz Question,Quiz Question,Quizvraag
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Supplier &gt; Supplier Type,Leverancier&gt; Type leverancier
 DocType: Company,Legal Entity / Subsidiary with a separate Chart of Accounts belonging to the Organization.,Rechtspersoon / Dochteronderneming met een aparte Rekeningschema behoren tot de Organisatie.
 DocType: Payment Request,Mute Email,Mute-mail
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py,"Food, Beverage & Tobacco","Voeding, Drank en Tabak"
@@ -5156,7 +5155,6 @@
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py,Delivery warehouse required for stock item {0},Levering magazijn vereist voor voorraad artikel {0}
 DocType: Packing Slip,The gross weight of the package. Usually net weight + packaging material weight. (for print),Het bruto gewicht van het pakket. Meestal nettogewicht + verpakkingsmateriaal gewicht. (Voor afdrukken)
 DocType: Assessment Plan,Program,Programma
-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: Accounts Settings,Users with this role are allowed to set frozen accounts and create / modify accounting entries against frozen accounts,Users with this role are allowed to set frozen accounts and create / modify accounting entries against frozen accounts
 ,Project Billing Summary,Projectfactuuroverzicht
 DocType: Vital Signs,Cuts,Cuts
@@ -5407,6 +5405,7 @@
 apps/erpnext/erpnext/quality_management/doctype/quality_review/quality_review_list.js,No Action,Geen actie
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js,Valuation type charges can not marked as Inclusive,Soort waardering kosten kunnen niet zo Inclusive gemarkeerd
 DocType: POS Profile,Update Stock,Voorraad bijwerken
+apps/erpnext/erpnext/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/stock/doctype/packing_slip/packing_slip.js,Different UOM for items will lead to incorrect (Total) Net Weight value. Make sure that Net Weight of each item is in the same UOM.,Verschillende eenheden voor artikelen zal leiden tot een onjuiste (Totaal) Netto gewicht. Zorg ervoor dat Netto gewicht van elk artikel in dezelfde eenheid is.
 DocType: Certification Application,Payment Details,Betalingsdetails
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py,BOM Rate,Stuklijst tarief
@@ -5512,6 +5511,8 @@
 apps/erpnext/erpnext/accounts/doctype/monthly_distribution/monthly_distribution.py,Percentage Allocation should be equal to 100%,Percentage toewijzing moet gelijk zijn aan 100%
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js,Please select Posting Date before selecting Party,Selecteer Boekingsdatum voordat Party selecteren
 apps/erpnext/erpnext/config/accounting.py,Payment Terms based on conditions,Betalingsvoorwaarden op basis van voorwaarden
+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: Program Enrollment,School House,School House
 DocType: Serial No,Out of AMC,Uit AMC
 DocType: Opportunity,Opportunity Amount,Kansbedrag
@@ -5715,6 +5716,7 @@
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py,Order/Quot %,Order / Quot%
 apps/erpnext/erpnext/config/healthcare.py,Record Patient Vitals,Record Patient Vitals
 DocType: Fee Schedule,Institution,Instelling
+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}
 DocType: Asset,Partially Depreciated,gedeeltelijk afgeschreven
 DocType: Issue,Opening Time,Opening Tijd
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py,From and To dates required,Van en naar data vereist
@@ -5935,6 +5937,7 @@
 DocType: Quality Procedure Process,Link existing Quality Procedure.,Koppel bestaande kwaliteitsprocedures.
 apps/erpnext/erpnext/config/hr.py,Loans,Leningen
 DocType: Healthcare Service Unit,Healthcare Service Unit,Service-eenheid voor de gezondheidszorg
+,Customer-wise Item Price,Klantgewijs Artikelprijs
 apps/erpnext/erpnext/public/js/financial_statements.js,Cash Flow Statement,Kasstroomoverzicht
 apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.py,No material request created,Er is geen aanvraag voor een artikel gemaakt
 apps/erpnext/erpnext/hr/doctype/loan_application/loan_application.py,Loan Amount cannot exceed Maximum Loan Amount of {0},Geleende bedrag kan niet hoger zijn dan maximaal bedrag van de lening van {0}
@@ -6201,6 +6204,7 @@
 apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py,Opening Value,opening Value
 DocType: Salary Component,Formula,Formule
 apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py,Serial #,Serial #
+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: Material Request Plan Item,Required Quantity,Benodigde hoeveelheid
 DocType: Lab Test Template,Lab Test Template,Lab Test Template
 apps/erpnext/erpnext/accounts/doctype/accounting_period/accounting_period.py,Accounting Period overlaps with {0},Boekhoudperiode overlapt met {0}
@@ -6452,7 +6456,6 @@
 DocType: Request for Quotation Item,Project Name,Naam van het project
 apps/erpnext/erpnext/regional/italy/utils.py,Please set the Customer Address,Stel het klantadres in
 DocType: Customer,Mention if non-standard receivable account,Vermelden of niet-standaard te ontvangen rekening
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Customer &gt; Customer Group &gt; Territory,Klant&gt; Klantengroep&gt; Gebied
 DocType: Bank,Plaid Access Token,Plaid-toegangstoken
 apps/erpnext/erpnext/hr/doctype/employee_benefit_application/employee_benefit_application.py,Please add the remaining benefits {0} to any of the existing component,Voeg de resterende voordelen {0} toe aan een van de bestaande onderdelen
 DocType: Journal Entry Account,If Income or Expense,Indien Inkomsten (baten) of Uitgaven (lasten)
@@ -6714,8 +6717,6 @@
 apps/erpnext/erpnext/buying/utils.py,Please enter quantity for Item {0},Vul het aantal in voor artikel {0}
 DocType: Quality Procedure,Processes,Processen
 DocType: Shift Type,First Check-in and Last Check-out,Eerste check-in en laatste check-out
-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/regional/report/hsn_wise_summary_of_outward_supplies/hsn_wise_summary_of_outward_supplies.py,Total Taxable Amount,Totaal belastbaar bedrag
 DocType: Employee External Work History,Employee External Work History,Werknemer Externe Werk Geschiedenis
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.py,Job card {0} created,Taakkaart {0} gemaakt
@@ -6752,6 +6753,7 @@
 apps/erpnext/erpnext/accounts/doctype/payment_terms_template/payment_terms_template.py,Combined invoice portion must equal 100%,Gecombineerd factuurgedeelte moet 100% zijn
 DocType: Item Default,Default Expense Account,Standaard Kostenrekening
 DocType: GST Account,CGST Account,CGST-account
+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/education/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py,Student Email ID,Student Email ID
 DocType: Employee,Notice (days),Kennisgeving ( dagen )
 DocType: POS Closing Voucher Invoices,POS Closing Voucher Invoices,POS Closing Voucher Facturen
@@ -7394,6 +7396,7 @@
 DocType: Maintenance Visit,Maintenance Date,Onderhoud Datum
 DocType: Purchase Invoice Item,Rejected Serial No,Afgewezen Serienummer
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py,Year start date or end date is overlapping with {0}. To avoid please set company,Jaar begindatum of einddatum overlapt met {0}. Om te voorkomen dat stel bedrijf
+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/selling/doctype/customer/customer.py,Please mention the Lead Name in Lead {0},Vermeld alstublieft de naam van de lood in lood {0}
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py,Start date should be less than end date for Item {0},Startdatum moet kleiner zijn dan einddatum voor Artikel {0}
 DocType: Shift Type,Auto Attendance Settings,Instellingen voor automatische aanwezigheid
diff --git a/erpnext/translations/no.csv b/erpnext/translations/no.csv
index a13a881..5e0d53f 100644
--- a/erpnext/translations/no.csv
+++ b/erpnext/translations/no.csv
@@ -168,7 +168,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py,Accountant,Accountant
 apps/erpnext/erpnext/stock/report/item_price_stock/item_price_stock.py,Selling Price List,Selge prisliste
 DocType: Patient,Tobacco Current Use,Nåværende bruk av tobakk
-apps/erpnext/erpnext/stock/report/item_price_stock/item_price_stock.py,Selling Rate,Selgingsfrekvens
+apps/erpnext/erpnext/selling/report/customer_wise_item_price/customer_wise_item_price.py,Selling Rate,Selgingsfrekvens
 apps/erpnext/erpnext/erpnext_integrations/doctype/plaid_settings/plaid_settings.js,Please save your document before adding a new account,Lagre dokumentet før du legger til en ny konto
 DocType: Cost Center,Stock User,Stock User
 DocType: Soil Analysis,(Ca+Mg)/K,(Ca + Mg) / K
@@ -205,7 +205,6 @@
 DocType: Packed Item,Parent Detail docname,Parent Detail docname
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py,"Reference: {0}, Item Code: {1} and Customer: {2}","Henvisning: {0}, Varenummer: {1} og kunde: {2}"
 apps/erpnext/erpnext/accounts/report/consolidated_financial_statement/consolidated_financial_statement.py,{0} {1} is not present in the parent company,{0} {1} er ikke til stede i morselskapet
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Supplier &gt; Supplier Type,Leverandør&gt; Leverandørtype
 apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py,Trial Period End Date Cannot be before Trial Period Start Date,Prøveperiode Sluttdato kan ikke være før startdato for prøveperiode
 apps/erpnext/erpnext/utilities/user_progress.py,Kg,Kg
 DocType: Tax Withholding Category,Tax Withholding Category,Skattelettende kategori
@@ -319,6 +318,7 @@
 DocType: Quality Procedure Table,Responsible Individual,Ansvarlig person
 DocType: Naming Series,Prefix,Prefix
 apps/erpnext/erpnext/hr/notification/training_scheduled/training_scheduled.html,Event Location,Hendelsessted
+apps/erpnext/erpnext/selling/report/customer_wise_item_price/customer_wise_item_price.py,Available Stock,Tilgjengelig lager
 DocType: Asset Settings,Asset Settings,Asset Settings
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py,Consumable,Konsum
 DocType: Student,B-,B-
@@ -352,6 +352,7 @@
 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 \
 				Serial No.",Kan ikke garantere levering med serienummer som \ Item {0} er lagt til med og uten Sikre Levering med \ Serienr.
+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/accounts/doctype/sales_invoice/sales_invoice.py,At least one mode of payment is required for POS invoice.,I det minste én modus av betaling er nødvendig for POS faktura.
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py,Batch no is required for batched item {0},Batch-nr er nødvendig for batch-varen {0}
 DocType: Bank Statement Transaction Invoice Item,Bank Statement Transaction Invoice Item,Bankkonto Transaksjonsfaktura
@@ -880,7 +881,6 @@
 DocType: Vital Signs,Blood Pressure (systolic),Blodtrykk (systolisk)
 apps/erpnext/erpnext/controllers/buying_controller.py,{0} {1} is {2},{0} {1} er {2}
 DocType: Item Price,Valid Upto,Gyldig Opp
-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: Training Event,Workshop,Verksted
 DocType: Supplier Scorecard Scoring Standing,Warn Purchase Orders,Varsle innkjøpsordrer
 apps/erpnext/erpnext/utilities/user_progress.py,List a few of your customers. They could be organizations or individuals.,Liste noen av kundene dine. De kan være organisasjoner eller enkeltpersoner.
@@ -1672,7 +1672,6 @@
 DocType: Item Barcode,Item Barcode,Sak Barcode
 DocType: Delivery Trip,In Transit,I transitt
 DocType: Woocommerce Settings,Endpoints,endepunkter
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Item Code &gt; Item Group &gt; Brand,Varekode&gt; Varegruppe&gt; Merke
 DocType: Shopping Cart Settings,Show Configure Button,Vis Konfigurer-knapp
 DocType: Quality Inspection Reading,Reading 6,Reading 6
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js,Cannot {0} {1} {2} without any negative outstanding invoice,Kan ikke {0} {1} {2} uten noen negativ utestående faktura
@@ -2037,6 +2036,7 @@
 DocType: Cheque Print Template,Payer Settings,Payer Innstillinger
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js,No pending Material Requests found to link for the given items.,Ingen ventende materialeforespørsler funnet å lenke for de oppgitte elementene.
 apps/erpnext/erpnext/public/js/utils/party.js,Select company first,Velg firma først
+apps/erpnext/erpnext/accounts/general_ledger.py,Account: <b>{0}</b> is capital Work in progress and can not be updated by Journal Entry,Konto: <b>{0}</b> er kapital Arbeid pågår og kan ikke oppdateres av journalpost
 apps/erpnext/erpnext/education/doctype/quiz/quiz.py,Compare List function takes on list arguments,Sammenlign liste-funksjonen tar på seg listeargumenter
 DocType: Item Attribute Value,"This will be appended to the Item Code of the variant. For example, if your abbreviation is ""SM"", and the item code is ""T-SHIRT"", the item code of the variant will be ""T-SHIRT-SM""","Dette vil bli lagt til Element Code of varianten. For eksempel, hvis din forkortelsen er &quot;SM&quot;, og elementet kode er &quot;T-SHIRT&quot;, elementet koden til variant vil være &quot;T-SHIRT-SM&quot;"
 DocType: Salary Slip,Net Pay (in words) will be visible once you save the Salary Slip.,Nettolønn (i ord) vil være synlig når du lagrer Lønn Slip.
@@ -2223,6 +2223,7 @@
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js,Item 2,Sak 2
 DocType: Pricing Rule,Validate Applied Rule,Valider gjeldende regel
 DocType: QuickBooks Migrator,Authorization Endpoint,Autorisasjonsendepunkt
+DocType: Employee Onboarding,Notify users by email,Varsle brukere via e-post
 DocType: Travel Request,International,Internasjonal
 DocType: Training Event,Training Event,trening Hendelses
 DocType: Item,Auto re-order,Auto re-order
@@ -2836,7 +2837,6 @@
 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
-DocType: Contract,Inactive,inaktiv
 apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.js,This will submit Salary Slips and create accrual Journal Entry. Do you want to proceed?,Dette vil sende Lønnsslipp og opprette periodiseringstabell. Vil du fortsette?
 DocType: Purchase Invoice,Total Net Weight,Total nettovikt
 DocType: Purchase Order,Order Confirmation No,Bekreftelsesbekreftelse nr
@@ -3115,7 +3115,6 @@
 apps/erpnext/erpnext/accounts/party.py,Billing currency must be equal to either default company's currency or party account currency,Faktureringsvaluta må være lik enten selskapets valuta- eller partikonto-valuta
 DocType: Packing Slip,Indicates that the package is a part of this delivery (Only Draft),Indikerer at pakken er en del av denne leveransen (Kun Draft)
 apps/erpnext/erpnext/accounts/report/customer_ledger_summary/customer_ledger_summary.py,Closing Balance,Utgående balanse
-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}
 DocType: Soil Texture,Loam,leirjord
 apps/erpnext/erpnext/controllers/accounts_controller.py,Row {0}: Due Date cannot be before posting date,Row {0}: Forfallsdato kan ikke være før innleggsdato
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py,Quantity for Item {0} must be less than {1},Kvantum for Element {0} må være mindre enn {1}
@@ -3644,7 +3643,6 @@
 DocType: Stock Settings,Raise Material Request when stock reaches re-order level,Hev Material Request når aksjen når re-order nivå
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py,Full-time,Fulltid
 DocType: Payroll Entry,Employees,medarbeidere
-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: Question,Single Correct Answer,Enkelt riktig svar
 DocType: Employee,Contact Details,Kontaktinformasjon
 DocType: C-Form,Received Date,Mottatt dato
@@ -4259,6 +4257,7 @@
 DocType: Pricing Rule,Price or Product Discount,Pris eller produktrabatt
 apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.py,For row {0}: Enter planned qty,For rad {0}: Skriv inn planlagt antall
 DocType: Account,Income Account,Inntekt konto
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Customer &gt; Customer Group &gt; Territory,Kunde&gt; Kundegruppe&gt; Territorium
 DocType: Payment Request,Amount in customer's currency,Beløp i kundens valuta
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js,Delivery,Levering
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.py,Assigning Structures...,Tildeler strukturer ...
@@ -4308,7 +4307,6 @@
 DocType: HR Settings,Check Vacancies On Job Offer Creation,Sjekk ledige stillinger ved etablering av tilbud
 apps/erpnext/erpnext/utilities/user_progress.py,Go to Letterheads,Gå til Letterheads
 DocType: Subscription,Cancel At End Of Period,Avbryt ved slutten av perioden
-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/hr/doctype/employee_promotion/employee_promotion.js,Property already added,Eiendom allerede lagt til
 DocType: Item Supplier,Item Supplier,Sak Leverandør
 apps/erpnext/erpnext/public/js/controllers/transaction.js,Please enter Item Code to get batch no,Skriv inn Element kode for å få batch no
@@ -4594,6 +4592,7 @@
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.js,Warning: Material Requested Qty is less than Minimum Order Qty,Advarsel: Material Requested Antall er mindre enn Minimum Antall
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py,Account {0} is frozen,Konto {0} er frosset
 DocType: Quiz Question,Quiz Question,Quiz Spørsmål
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Supplier &gt; Supplier Type,Leverandør&gt; Leverandørtype
 DocType: Company,Legal Entity / Subsidiary with a separate Chart of Accounts belonging to the Organization.,Legal Entity / Datterselskap med en egen konto tilhørighet til organisasjonen.
 DocType: Payment Request,Mute Email,Demp Email
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py,"Food, Beverage & Tobacco","Mat, drikke og tobakk"
@@ -5108,7 +5107,6 @@
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py,Delivery warehouse required for stock item {0},Levering lager nødvendig for lagervare {0}
 DocType: Packing Slip,The gross weight of the package. Usually net weight + packaging material weight. (for print),Totalvekten av pakken. Vanligvis nettovekt + emballasjematerialet vekt. (For utskrift)
 DocType: Assessment Plan,Program,Program
-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: Accounts Settings,Users with this role are allowed to set frozen accounts and create / modify accounting entries against frozen accounts,Brukere med denne rollen har lov til å sette frosne kontoer og lage / endre regnskapspostene mot frosne kontoer
 ,Project Billing Summary,Prosjekt faktureringssammendrag
 DocType: Vital Signs,Cuts,cuts
@@ -5359,6 +5357,7 @@
 apps/erpnext/erpnext/quality_management/doctype/quality_review/quality_review_list.js,No Action,Ingen handling
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js,Valuation type charges can not marked as Inclusive,Verdsettelse typen kostnader kan ikke merket som Inclusive
 DocType: POS Profile,Update Stock,Oppdater Stock
+apps/erpnext/erpnext/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/stock/doctype/packing_slip/packing_slip.js,Different UOM for items will lead to incorrect (Total) Net Weight value. Make sure that Net Weight of each item is in the same UOM.,Ulik målenheter for elementer vil føre til feil (Total) Netto vekt verdi. Sørg for at nettovekt av hvert element er i samme målenheter.
 DocType: Certification Application,Payment Details,Betalingsinformasjon
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py,BOM Rate,BOM Rate
@@ -5464,6 +5463,8 @@
 apps/erpnext/erpnext/accounts/doctype/monthly_distribution/monthly_distribution.py,Percentage Allocation should be equal to 100%,Prosentvis Tildeling skal være lik 100%
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js,Please select Posting Date before selecting Party,Vennligst velg Publiseringsdato før du velger Partiet
 apps/erpnext/erpnext/config/accounting.py,Payment Terms based on conditions,Betalingsbetingelser basert på betingelser
+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: Program Enrollment,School House,school House
 DocType: Serial No,Out of AMC,Ut av AMC
 DocType: Opportunity,Opportunity Amount,Mulighetsbeløp
@@ -5667,6 +5668,7 @@
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py,Order/Quot %,Ordre / Quot%
 apps/erpnext/erpnext/config/healthcare.py,Record Patient Vitals,Opptak Pasient Vitals
 DocType: Fee Schedule,Institution,institusjon
+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}
 DocType: Asset,Partially Depreciated,delvis Avskrives
 DocType: Issue,Opening Time,Åpning Tid
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py,From and To dates required,Fra og Til dato kreves
@@ -5887,6 +5889,7 @@
 DocType: Quality Procedure Process,Link existing Quality Procedure.,Koble eksisterende kvalitetsprosedyre.
 apps/erpnext/erpnext/config/hr.py,Loans,lån
 DocType: Healthcare Service Unit,Healthcare Service Unit,Helsevesenethet
+,Customer-wise Item Price,Kundemessig varepris
 apps/erpnext/erpnext/public/js/financial_statements.js,Cash Flow Statement,Kontantstrømoppstilling
 apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.py,No material request created,Ingen materiell forespørsel opprettet
 apps/erpnext/erpnext/hr/doctype/loan_application/loan_application.py,Loan Amount cannot exceed Maximum Loan Amount of {0},Lånebeløp kan ikke overstige maksimalt lånebeløp på {0}
@@ -6153,6 +6156,7 @@
 apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py,Opening Value,åpning Verdi
 DocType: Salary Component,Formula,Formel
 apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py,Serial #,Serial #
+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: Material Request Plan Item,Required Quantity,Nødvendig mengde
 DocType: Lab Test Template,Lab Test Template,Lab Test Template
 apps/erpnext/erpnext/accounts/doctype/accounting_period/accounting_period.py,Accounting Period overlaps with {0},Regnskapsperioden overlapper med {0}
@@ -6403,7 +6407,6 @@
 DocType: Request for Quotation Item,Project Name,Prosjektnavn
 apps/erpnext/erpnext/regional/italy/utils.py,Please set the Customer Address,Angi kundeadresse
 DocType: Customer,Mention if non-standard receivable account,Nevn hvis ikke-standard fordring konto
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Customer &gt; Customer Group &gt; Territory,Kunde&gt; Kundegruppe&gt; Territorium
 DocType: Bank,Plaid Access Token,Token for rutet tilgang
 apps/erpnext/erpnext/hr/doctype/employee_benefit_application/employee_benefit_application.py,Please add the remaining benefits {0} to any of the existing component,Vennligst legg til de resterende fordelene {0} til en eksisterende komponent
 DocType: Journal Entry Account,If Income or Expense,Dersom inntekt eller kostnad
@@ -6666,8 +6669,6 @@
 apps/erpnext/erpnext/buying/utils.py,Please enter quantity for Item {0},Skriv inn antall for Element {0}
 DocType: Quality Procedure,Processes,prosesser
 DocType: Shift Type,First Check-in and Last Check-out,Første innsjekking og siste utsjekking
-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/regional/report/hsn_wise_summary_of_outward_supplies/hsn_wise_summary_of_outward_supplies.py,Total Taxable Amount,Sum skattepliktig beløp
 DocType: Employee External Work History,Employee External Work History,Ansatt Ekstern Work History
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.py,Job card {0} created,Jobbkort {0} opprettet
@@ -6703,6 +6704,7 @@
 apps/erpnext/erpnext/accounts/doctype/payment_terms_template/payment_terms_template.py,Combined invoice portion must equal 100%,Kombinert fakturaport må være 100%
 DocType: Item Default,Default Expense Account,Standard kostnadskonto
 DocType: GST Account,CGST Account,CGST-konto
+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/education/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py,Student Email ID,Student Email ID
 DocType: Employee,Notice (days),Varsel (dager)
 DocType: POS Closing Voucher Invoices,POS Closing Voucher Invoices,POS Closing Voucher Fakturaer
@@ -7343,6 +7345,7 @@
 DocType: Maintenance Visit,Maintenance Date,Vedlikehold Dato
 DocType: Purchase Invoice Item,Rejected Serial No,Avvist Serial No
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py,Year start date or end date is overlapping with {0}. To avoid please set company,År startdato eller sluttdato er overlappende med {0}. For å unngå vennligst sett selskap
+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/selling/doctype/customer/customer.py,Please mention the Lead Name in Lead {0},Vennligst nevne Lead Name in Lead {0}
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py,Start date should be less than end date for Item {0},Startdato skal være mindre enn sluttdato for Element {0}
 DocType: Shift Type,Auto Attendance Settings,Innstillinger for automatisk deltagelse
diff --git a/erpnext/translations/pl.csv b/erpnext/translations/pl.csv
index f6071b8..27ab4ff 100644
--- a/erpnext/translations/pl.csv
+++ b/erpnext/translations/pl.csv
@@ -168,7 +168,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py,Accountant,Księgowy
 apps/erpnext/erpnext/stock/report/item_price_stock/item_price_stock.py,Selling Price List,Cennik sprzedaży
 DocType: Patient,Tobacco Current Use,Obecne użycie tytoniu
-apps/erpnext/erpnext/stock/report/item_price_stock/item_price_stock.py,Selling Rate,Kurs sprzedaży
+apps/erpnext/erpnext/selling/report/customer_wise_item_price/customer_wise_item_price.py,Selling Rate,Kurs sprzedaży
 apps/erpnext/erpnext/erpnext_integrations/doctype/plaid_settings/plaid_settings.js,Please save your document before adding a new account,Zapisz dokument przed dodaniem nowego konta
 DocType: Cost Center,Stock User,Użytkownik magazynu
 DocType: Soil Analysis,(Ca+Mg)/K,(Ca + Mg) / K
@@ -205,7 +205,6 @@
 DocType: Packed Item,Parent Detail docname,Nazwa dokumentu ze szczegółami nadrzędnego rodzica
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py,"Reference: {0}, Item Code: {1} and Customer: {2}","Odniesienie: {0}, Kod pozycji: {1} i klient: {2}"
 apps/erpnext/erpnext/accounts/report/consolidated_financial_statement/consolidated_financial_statement.py,{0} {1} is not present in the parent company,{0} {1} nie występuje w firmie macierzystej
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Supplier &gt; Supplier Type,Dostawca&gt; Typ dostawcy
 apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py,Trial Period End Date Cannot be before Trial Period Start Date,Termin zakończenia okresu próbnego Nie może być przed datą rozpoczęcia okresu próbnego
 apps/erpnext/erpnext/utilities/user_progress.py,Kg,kg
 DocType: Tax Withholding Category,Tax Withholding Category,Kategoria odwrotnego obciążenia
@@ -319,6 +318,7 @@
 DocType: Quality Procedure Table,Responsible Individual,Osoba odpowiedzialna
 DocType: Naming Series,Prefix,Prefiks
 apps/erpnext/erpnext/hr/notification/training_scheduled/training_scheduled.html,Event Location,Lokalizacja wydarzenia
+apps/erpnext/erpnext/selling/report/customer_wise_item_price/customer_wise_item_price.py,Available Stock,Dostępne zapasy
 DocType: Asset Settings,Asset Settings,Ustawienia zasobów
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py,Consumable,Konsumpcyjny
 DocType: Student,B-,B-
@@ -352,6 +352,7 @@
 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 \
 				Serial No.","Nie można zagwarantować dostarczenia przez numer seryjny, ponieważ \ Pozycja {0} została dodana zi bez dostarczenia przez \ numer seryjny \"
+apps/erpnext/erpnext/education/doctype/instructor/instructor.py,Please setup Instructor Naming System in Education &gt; Education Settings,Ustaw Instructor Naming System w edukacji&gt; Ustawienia edukacji
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py,At least one mode of payment is required for POS invoice.,Co najmniej jeden tryb płatności POS jest wymagane dla faktury.
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py,Batch no is required for batched item {0},Nr partii jest wymagany dla pozycji wsadowej {0}
 DocType: Bank Statement Transaction Invoice Item,Bank Statement Transaction Invoice Item,Wyciąg z rachunku bankowego
@@ -880,7 +881,6 @@
 DocType: Vital Signs,Blood Pressure (systolic),Ciśnienie krwi (skurczowe)
 apps/erpnext/erpnext/controllers/buying_controller.py,{0} {1} is {2},{0} {1} to {2}
 DocType: Item Price,Valid Upto,Ważny do
-apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,Ustaw Naming Series dla {0} za pomocą Setup&gt; Settings&gt; Naming Series
 DocType: Training Event,Workshop,Warsztat
 DocType: Supplier Scorecard Scoring Standing,Warn Purchase Orders,Ostrzegaj Zamówienia Zakupu
 apps/erpnext/erpnext/utilities/user_progress.py,List a few of your customers. They could be organizations or individuals.,Krótka lista Twoich klientów. Mogą to być firmy lub osoby fizyczne.
@@ -1691,7 +1691,6 @@
 DocType: Item Barcode,Item Barcode,Kod kreskowy
 DocType: Delivery Trip,In Transit,W tranzycie
 DocType: Woocommerce Settings,Endpoints,Punkty końcowe
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Item Code &gt; Item Group &gt; Brand,Kod towaru&gt; Grupa produktów&gt; Marka
 DocType: Shopping Cart Settings,Show Configure Button,Pokaż przycisk konfiguracji
 DocType: Quality Inspection Reading,Reading 6,Odczyt 6
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js,Cannot {0} {1} {2} without any negative outstanding invoice,Nie można {0} {1} {2} bez negatywnego wybitne faktury
@@ -2055,6 +2054,7 @@
 DocType: Cheque Print Template,Payer Settings,Ustawienia płatnik
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js,No pending Material Requests found to link for the given items.,Nie znaleziono oczekujĘ ... cych żĘ ... danych żĘ ... danych w celu połĘ ... czenia dla podanych elementów.
 apps/erpnext/erpnext/public/js/utils/party.js,Select company first,Najpierw wybierz firmę
+apps/erpnext/erpnext/accounts/general_ledger.py,Account: <b>{0}</b> is capital Work in progress and can not be updated by Journal Entry,Konto: <b>{0}</b> to kapitał Trwają prace i nie można go zaktualizować za pomocą zapisu księgowego
 apps/erpnext/erpnext/education/doctype/quiz/quiz.py,Compare List function takes on list arguments,Funkcja listy porównawczej przyjmuje argumenty listy
 DocType: Item Attribute Value,"This will be appended to the Item Code of the variant. For example, if your abbreviation is ""SM"", and the item code is ""T-SHIRT"", the item code of the variant will be ""T-SHIRT-SM""","To będzie dołączany do Kodeksu poz wariantu. Na przykład, jeśli skrót to ""SM"", a kod element jest ""T-SHIRT"" Kod poz wariantu będzie ""T-SHIRT-SM"""
 DocType: Salary Slip,Net Pay (in words) will be visible once you save the Salary Slip.,Wynagrodzenie netto (słownie) będzie widoczna po zapisaniu na Liście Płac.
@@ -2241,6 +2241,7 @@
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js,Item 2,Pozycja 2
 DocType: Pricing Rule,Validate Applied Rule,Sprawdź poprawność zastosowanej reguły
 DocType: QuickBooks Migrator,Authorization Endpoint,Punkt końcowy autoryzacji
+DocType: Employee Onboarding,Notify users by email,Powiadom użytkowników pocztą e-mail
 DocType: Travel Request,International,Międzynarodowy
 DocType: Training Event,Training Event,Training Event
 DocType: Item,Auto re-order,Automatyczne ponowne zamówienie
@@ -2855,7 +2856,6 @@
 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
-DocType: Contract,Inactive,Nieaktywny
 apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.js,This will submit Salary Slips and create accrual Journal Entry. Do you want to proceed?,Spowoduje to wysłanie Salary Slips i utworzenie wpisu księgowego. Czy chcesz kontynuować?
 DocType: Purchase Invoice,Total Net Weight,Całkowita waga netto
 DocType: Purchase Order,Order Confirmation No,Potwierdzenie nr
@@ -3137,7 +3137,6 @@
 apps/erpnext/erpnext/accounts/party.py,Billing currency must be equal to either default company's currency or party account currency,Waluta rozliczeniowa musi być równa domyślnej walucie firmy lub walucie konta strony
 DocType: Packing Slip,Indicates that the package is a part of this delivery (Only Draft),"Wskazuje, że pakiet jest częścią tej dostawy (Tylko projektu)"
 apps/erpnext/erpnext/accounts/report/customer_ledger_summary/customer_ledger_summary.py,Closing Balance,Bilans zamknięcia
-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}
 DocType: Soil Texture,Loam,Ił
 apps/erpnext/erpnext/controllers/accounts_controller.py,Row {0}: Due Date cannot be before posting date,Wiersz {0}: termin płatności nie może być wcześniejszy niż data księgowania
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py,Quantity for Item {0} must be less than {1},Ilość dla Przedmiotu {0} musi być mniejsza niż {1}
@@ -3667,7 +3666,6 @@
 DocType: Stock Settings,Raise Material Request when stock reaches re-order level,"Wywołaj Prośbę Materiałową, gdy stan osiągnie próg ponowienia zlecenia"
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py,Full-time,Na cały etet
 DocType: Payroll Entry,Employees,Pracowników
-apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py,Please setup numbering series for Attendance via Setup &gt; Numbering Series,Proszę ustawić serię numeracji dla Obecności poprzez Ustawienia&gt; Seria numerowania
 DocType: Question,Single Correct Answer,Pojedyncza poprawna odpowiedź
 DocType: Employee,Contact Details,Szczegóły kontaktu
 DocType: C-Form,Received Date,Data Otrzymania
@@ -4303,6 +4301,7 @@
 DocType: Pricing Rule,Price or Product Discount,Rabat na cenę lub produkt
 apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.py,For row {0}: Enter planned qty,Dla wiersza {0}: wpisz planowaną liczbę
 DocType: Account,Income Account,Konto przychodów
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Customer &gt; Customer Group &gt; Territory,Klient&gt; Grupa klientów&gt; Terytorium
 DocType: Payment Request,Amount in customer's currency,Kwota w walucie klienta
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js,Delivery,Dostarczanie
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.py,Assigning Structures...,Przyporządkowywanie Struktur
@@ -4352,7 +4351,6 @@
 DocType: HR Settings,Check Vacancies On Job Offer Creation,Sprawdź oferty pracy w tworzeniu oferty pracy
 apps/erpnext/erpnext/utilities/user_progress.py,Go to Letterheads,Idź do Blankiety firmowe
 DocType: Subscription,Cancel At End Of Period,Anuluj na koniec okresu
-apps/erpnext/erpnext/education/doctype/instructor/instructor.py,Please setup Instructor Naming System in Education &gt; Education Settings,Ustaw Instructor Naming System w edukacji&gt; Ustawienia edukacji
 apps/erpnext/erpnext/hr/doctype/employee_promotion/employee_promotion.js,Property already added,Właściwość została już dodana
 DocType: Item Supplier,Item Supplier,Dostawca
 apps/erpnext/erpnext/public/js/controllers/transaction.js,Please enter Item Code to get batch no,Proszę wprowadzić Kod Produktu w celu przyporządkowania serii
@@ -4650,6 +4648,7 @@
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.js,Warning: Material Requested Qty is less than Minimum Order Qty,Ostrzeżenie: Ilość Zapotrzebowanego Materiału jest mniejsza niż minimalna ilość na zamówieniu
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py,Account {0} is frozen,Konto {0} jest zamrożone
 DocType: Quiz Question,Quiz Question,Pytanie do quizu
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Supplier &gt; Supplier Type,Dostawca&gt; Typ dostawcy
 DocType: Company,Legal Entity / Subsidiary with a separate Chart of Accounts belonging to the Organization.,Osobowość prawna / Filia w oddzielny planu kont należących do Organizacji.
 DocType: Payment Request,Mute Email,Wyciszenie email
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py,"Food, Beverage & Tobacco","Żywność, Trunki i Tytoń"
@@ -5166,7 +5165,6 @@
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py,Delivery warehouse required for stock item {0},Dostawa wymagane dla magazynu pozycji magazynie {0}
 DocType: Packing Slip,The gross weight of the package. Usually net weight + packaging material weight. (for print),Waga brutto opakowania. Zazwyczaj waga netto + waga materiału z jakiego jest wykonane opakowanie. (Do druku)
 DocType: Assessment Plan,Program,Program
-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 zasobów ludzkich&gt; Ustawienia HR
 DocType: Accounts Settings,Users with this role are allowed to set frozen accounts and create / modify accounting entries against frozen accounts,Użytkownicy z tą rolą mogą ustawiać zamrożone konta i tworzyć / modyfikować wpisy księgowe dla zamrożonych kont
 ,Project Billing Summary,Podsumowanie płatności za projekt
 DocType: Vital Signs,Cuts,Cięcia
@@ -5416,6 +5414,7 @@
 apps/erpnext/erpnext/quality_management/doctype/quality_review/quality_review_list.js,No Action,Bez akcji
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js,Valuation type charges can not marked as Inclusive,Opłaty typu Wycena nie oznaczone jako Inclusive
 DocType: POS Profile,Update Stock,Aktualizuj Stan
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,Ustaw Naming Series dla {0} za pomocą Setup&gt; Settings&gt; Naming Series
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js,Different UOM for items will lead to incorrect (Total) Net Weight value. Make sure that Net Weight of each item is in the same UOM.,
 DocType: Certification Application,Payment Details,Szczegóły płatności
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py,BOM Rate,BOM Kursy
@@ -5521,6 +5520,8 @@
 apps/erpnext/erpnext/accounts/doctype/monthly_distribution/monthly_distribution.py,Percentage Allocation should be equal to 100%,Przydział Procentowy powinien wynosić 100%
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js,Please select Posting Date before selecting Party,Proszę wybrać Data księgowania przed wybraniem Stronę
 apps/erpnext/erpnext/config/accounting.py,Payment Terms based on conditions,Warunki płatności oparte na warunkach
+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: Program Enrollment,School House,school House
 DocType: Serial No,Out of AMC,
 DocType: Opportunity,Opportunity Amount,Kwota możliwości
@@ -5724,6 +5725,7 @@
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py,Order/Quot %,Zamówienie / kwota%
 apps/erpnext/erpnext/config/healthcare.py,Record Patient Vitals,Zapisuj życiorysy pacjenta
 DocType: Fee Schedule,Institution,Instytucja
+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}
 DocType: Asset,Partially Depreciated,częściowo Zamortyzowany
 DocType: Issue,Opening Time,Czas Otwarcia
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py,From and To dates required,Daty Od i Do są wymagane
@@ -5944,6 +5946,7 @@
 DocType: Quality Procedure Process,Link existing Quality Procedure.,Połącz istniejącą procedurę jakości.
 apps/erpnext/erpnext/config/hr.py,Loans,Pożyczki
 DocType: Healthcare Service Unit,Healthcare Service Unit,Jednostka opieki zdrowotnej
+,Customer-wise Item Price,Cena przedmiotu pod względem klienta
 apps/erpnext/erpnext/public/js/financial_statements.js,Cash Flow Statement,Raport kasowy
 apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.py,No material request created,Nie utworzono żadnego żadnego materialnego wniosku
 apps/erpnext/erpnext/hr/doctype/loan_application/loan_application.py,Loan Amount cannot exceed Maximum Loan Amount of {0},Kwota kredytu nie może przekroczyć maksymalna kwota kredytu o {0}
@@ -6210,6 +6213,7 @@
 apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py,Opening Value,Wartość otwarcia
 DocType: Salary Component,Formula,Formuła
 apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py,Serial #,Seryjny #
+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 zasobów ludzkich&gt; Ustawienia HR
 DocType: Material Request Plan Item,Required Quantity,Wymagana ilość
 DocType: Lab Test Template,Lab Test Template,Szablon testu laboratoryjnego
 apps/erpnext/erpnext/accounts/doctype/accounting_period/accounting_period.py,Accounting Period overlaps with {0},Okres rozliczeniowy pokrywa się z {0}
@@ -6461,7 +6465,6 @@
 DocType: Request for Quotation Item,Project Name,Nazwa projektu
 apps/erpnext/erpnext/regional/italy/utils.py,Please set the Customer Address,Ustaw adres klienta
 DocType: Customer,Mention if non-standard receivable account,"Wskazać, jeśli niestandardowe konto należności"
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Customer &gt; Customer Group &gt; Territory,Klient&gt; Grupa klientów&gt; Terytorium
 DocType: Bank,Plaid Access Token,Token dostępu do kratki
 apps/erpnext/erpnext/hr/doctype/employee_benefit_application/employee_benefit_application.py,Please add the remaining benefits {0} to any of the existing component,Dodaj pozostałe korzyści {0} do dowolnego z istniejących komponentów
 DocType: Journal Entry Account,If Income or Expense,Jeśli przychód lub koszt
@@ -6725,8 +6728,6 @@
 apps/erpnext/erpnext/buying/utils.py,Please enter quantity for Item {0},Wprowadź ilość dla przedmiotu {0}
 DocType: Quality Procedure,Processes,Procesy
 DocType: Shift Type,First Check-in and Last Check-out,Pierwsze zameldowanie i ostatnie wymeldowanie
-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/regional/report/hsn_wise_summary_of_outward_supplies/hsn_wise_summary_of_outward_supplies.py,Total Taxable Amount,Całkowita kwota podlegająca opodatkowaniu
 DocType: Employee External Work History,Employee External Work History,Historia zatrudnienia pracownika poza firmą
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.py,Job card {0} created,Utworzono kartę zadania {0}
@@ -6763,6 +6764,7 @@
 apps/erpnext/erpnext/accounts/doctype/payment_terms_template/payment_terms_template.py,Combined invoice portion must equal 100%,Łączna kwota faktury musi wynosić 100%
 DocType: Item Default,Default Expense Account,Domyślne konto rozchodów
 DocType: GST Account,CGST Account,Konto CGST
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Item Code &gt; Item Group &gt; Brand,Kod towaru&gt; Grupa produktów&gt; Marka
 apps/erpnext/erpnext/education/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py,Student Email ID,Student ID email
 DocType: Employee,Notice (days),Wymówienie (dni)
 DocType: POS Closing Voucher Invoices,POS Closing Voucher Invoices,Faktury z zamknięciem kuponu
@@ -7406,6 +7408,7 @@
 DocType: Maintenance Visit,Maintenance Date,Data Konserwacji
 DocType: Purchase Invoice Item,Rejected Serial No,Odrzucony Nr Seryjny
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py,Year start date or end date is overlapping with {0}. To avoid please set company,data rozpoczęcia roku lub data końca pokrywa się z {0}. Aby uniknąć należy ustawić firmę
+apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py,Please setup numbering series for Attendance via Setup &gt; Numbering Series,Proszę ustawić serię numeracji dla Obecności poprzez Ustawienia&gt; Seria numerowania
 apps/erpnext/erpnext/selling/doctype/customer/customer.py,Please mention the Lead Name in Lead {0},Zapoznaj się z nazwą wiodącego wiodącego {0}
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py,Start date should be less than end date for Item {0},Data startu powinna być niższa od daty końca dla {0}
 DocType: Shift Type,Auto Attendance Settings,Ustawienia automatycznej obecności
diff --git a/erpnext/translations/ps.csv b/erpnext/translations/ps.csv
index 0897ab9..cfb7fea 100644
--- a/erpnext/translations/ps.csv
+++ b/erpnext/translations/ps.csv
@@ -164,7 +164,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py,Accountant,محاسب
 apps/erpnext/erpnext/stock/report/item_price_stock/item_price_stock.py,Selling Price List,د نرخ پلور لیست
 DocType: Patient,Tobacco Current Use,تمباکو اوسنی کارول
-apps/erpnext/erpnext/stock/report/item_price_stock/item_price_stock.py,Selling Rate,د پلور کچه
+apps/erpnext/erpnext/selling/report/customer_wise_item_price/customer_wise_item_price.py,Selling Rate,د پلور کچه
 apps/erpnext/erpnext/erpnext_integrations/doctype/plaid_settings/plaid_settings.js,Please save your document before adding a new account,مهرباني وکړئ د نوي حساب اضافه کولو دمخه خپل سند خوندي کړئ
 DocType: Cost Center,Stock User,دحمل کارن
 DocType: Soil Analysis,(Ca+Mg)/K,(Ca + Mg) / K
@@ -200,7 +200,6 @@
 DocType: Packed Item,Parent Detail docname,Parent تفصیلي docname
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py,"Reference: {0}, Item Code: {1} and Customer: {2}",ماخذ: {0}، شمیره کوډ: {1} او پيرودونکو: {2}
 apps/erpnext/erpnext/accounts/report/consolidated_financial_statement/consolidated_financial_statement.py,{0} {1} is not present in the parent company,{1}} {1} د پلار په شرکت کې حاضر نه دی
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Supplier &gt; Supplier Type,عرضه کونکي&gt; عرضه کونکي ډول
 apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py,Trial Period End Date Cannot be before Trial Period Start Date,د ازموینې دورې پای نیټه د آزموینې دوره د پیل نیټه نه شي کیدی
 apps/erpnext/erpnext/utilities/user_progress.py,Kg,کيلوګرام
 DocType: Tax Withholding Category,Tax Withholding Category,د مالیاتو مالیه کټګوري
@@ -311,6 +310,7 @@
 DocType: Quality Procedure Table,Responsible Individual,مسؤل فرد
 DocType: Naming Series,Prefix,هغه مختاړی
 apps/erpnext/erpnext/hr/notification/training_scheduled/training_scheduled.html,Event Location,د موقع ځای
+apps/erpnext/erpnext/selling/report/customer_wise_item_price/customer_wise_item_price.py,Available Stock,موجود سټاک
 DocType: Asset Settings,Asset Settings,د امستنې امستنې
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py,Consumable,د مصرف
 DocType: Student,B-,B-
@@ -344,6 +344,7 @@
 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 \
 				Serial No.",نشي کولی د سیریل نمبر لخوا د \ توکي {0} په حیث د انتقال تضمین او د سیریل نمبر
+apps/erpnext/erpnext/education/doctype/instructor/instructor.py,Please setup Instructor Naming System in Education &gt; Education Settings,مهرباني وکړئ د ښوونې او روزنې ترتیبات کې د ښوونکي نوم ورکولو سیسټم تنظیم کړئ
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py,At least one mode of payment is required for POS invoice.,د پیسو تر لږه یوه اکر لپاره POS صورتحساب ته اړتيا لري.
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py,Batch no is required for batched item {0},بیچ نمبر د بنډ شوي توکو لپاره اړین ندي {0}
 DocType: Bank Statement Transaction Invoice Item,Bank Statement Transaction Invoice Item,د بانک بیان پیسې د رسیدنې توکي
@@ -1641,7 +1642,6 @@
 DocType: Item Barcode,Item Barcode,د توکو بارکوډ
 DocType: Delivery Trip,In Transit,په لیږد کې
 DocType: Woocommerce Settings,Endpoints,د پای ټکی
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Item Code &gt; Item Group &gt; Brand,د توکو کوډ&gt; د توکي ګروپ&gt; نښه
 DocType: Shopping Cart Settings,Show Configure Button,د ساز ت Butۍ وښیه
 DocType: Quality Inspection Reading,Reading 6,لوستلو 6
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js,Cannot {0} {1} {2} without any negative outstanding invoice,نه شی کولای د {0} د {1} {2} کومه منفي بيالنس صورتحساب پرته
@@ -2000,6 +2000,7 @@
 DocType: Cheque Print Template,Payer Settings,د ورکوونکي امستنې
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js,No pending Material Requests found to link for the given items.,د ورکړل شويو توکو لپاره د تړلو لپاره د موادو پاتې غوښتنې شتون نلري.
 apps/erpnext/erpnext/public/js/utils/party.js,Select company first,لومړی شرکت غوره کړئ
+apps/erpnext/erpnext/accounts/general_ledger.py,Account: <b>{0}</b> is capital Work in progress and can not be updated by Journal Entry,ګ : <b>ون</b> : <b>{0}</b> سرمایه کار دی چې په پرمختګ کې دی او د ژورنال ننوتلو سره تازه کیدی نشي
 apps/erpnext/erpnext/education/doctype/quiz/quiz.py,Compare List function takes on list arguments,د پرتله کولو لیست فعالیت د لیست دلیلونه اخلي
 DocType: Item Attribute Value,"This will be appended to the Item Code of the variant. For example, if your abbreviation is ""SM"", and the item code is ""T-SHIRT"", the item code of the variant will be ""T-SHIRT-SM""",دا به د د variant د قالب کوډ appended شي. د بیلګې په توګه، که ستا اختصاري دی &quot;SM&quot;، او د توکي کوډ دی &quot;T-کميس&quot;، د variant توکی کوډ به &quot;T-کميس-SM&quot;
 DocType: Salary Slip,Net Pay (in words) will be visible once you save the Salary Slip.,خالص د معاشونو (په لفظ) به د ليدو وړ وي. هر کله چې تاسو د معاش ټوټه وژغوري.
@@ -2184,6 +2185,7 @@
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js,Item 2,د قالب 2
 DocType: Pricing Rule,Validate Applied Rule,تطبیق شوی قانون باوري کړئ
 DocType: QuickBooks Migrator,Authorization Endpoint,د واکمنۍ پایله
+DocType: Employee Onboarding,Notify users by email,کاروونکي د بریښنالیک له لارې خبر کړئ
 DocType: Travel Request,International,نړیوال
 DocType: Training Event,Training Event,د روزنې دکمپاینونو
 DocType: Item,Auto re-order,د موټرونو د بيا نظم
@@ -2225,6 +2227,7 @@
 apps/erpnext/erpnext/controllers/accounts_controller.py,Rows with duplicate due dates in other rows were found: {0},په نورو قطارونو کې د دوه ځله ټاکل شوي نیټې سره قطعونه وموندل شول: {0}
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py,"{0}: Employee email not found, hence email not sent",{0}: د کارګر ایمیل ونه موندل، نو برېښناليک نه استول
 apps/erpnext/erpnext/hr/doctype/leave_encashment/leave_encashment.py,No Salary Structure assigned for Employee {0} on given date {1},د معاش ورکولو جوړښت د کارمندانو لپاره ټاکل شوی نیټه {0} په ټاکل شوي نیټه {1}
+apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py,Shipping rule not applicable for country {0},د بار وړلو قانون په هیواد کې د تطبیق وړ ندي {0}
 DocType: Item,Foreign Trade Details,د بهرنیو چارو د سوداګرۍ نورولوله
 ,Assessment Plan Status,د ارزونې پلان حالت
 DocType: Email Digest,Annual Income,د کلني عايداتو
@@ -2788,7 +2791,6 @@
 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,یو ورته پیرود چې ورته نوم یې شتون لري لا دمخه لا شتون لري
-DocType: Contract,Inactive,غیر فعال
 apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.js,This will submit Salary Slips and create accrual Journal Entry. Do you want to proceed?,دا به د معاش سلپس وسپاري او د ثانوي ژورنال ننوتنې چمتو کړي. ایا تاسو غواړئ چې پرمختګ وکړئ؟
 DocType: Purchase Invoice,Total Net Weight,د ټول ټیټ وزن
 DocType: Purchase Order,Order Confirmation No,د تایید تصدیق
@@ -3066,7 +3068,6 @@
 apps/erpnext/erpnext/accounts/party.py,Billing currency must be equal to either default company's currency or party account currency,د بلې پیسو پیسې باید د یاغیانو د کمپنۍ یا د ګوند حساب حساب سره مساوي وي
 DocType: Packing Slip,Indicates that the package is a part of this delivery (Only Draft),ښيي چې د کڅوړه ده د دې د وړاندې کولو (یوازې مسوده) یوه برخه
 apps/erpnext/erpnext/accounts/report/customer_ledger_summary/customer_ledger_summary.py,Closing Balance,تړل شوی بیلانس
-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: Soil Texture,Loam,لوام
 apps/erpnext/erpnext/controllers/accounts_controller.py,Row {0}: Due Date cannot be before posting date,صف {0}: د تاریخ نیټه د نیټې نیټې څخه مخکې نشي کیدی
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py,Quantity for Item {0} must be less than {1},لپاره د قالب مقدار {0} بايد په پرتله کمه وي {1}
@@ -3587,7 +3588,6 @@
 DocType: Stock Settings,Raise Material Request when stock reaches re-order level,د موادو غوښتنه راپورته کړي کله سټاک بیا نظم درجی ته ورسیږي
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py,Full-time,پوره وخت
 DocType: Payroll Entry,Employees,د کارکوونکو
-apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py,Please setup numbering series for Attendance via Setup &gt; Numbering Series,مهرباني وکړئ د تنظیم کولو له لارې د شمیره ورکولو لړۍ له لارې د ګډون لپاره د شمېرنې لړۍ تنظیم کړئ
 DocType: Question,Single Correct Answer,یوازینی سم ځواب
 DocType: Employee,Contact Details,د اړیکو نیولو معلومات
 DocType: C-Form,Received Date,ترلاسه نېټه
@@ -4195,6 +4195,7 @@
 DocType: Pricing Rule,Price or Product Discount,قیمت یا د محصول تخفیف
 apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.py,For row {0}: Enter planned qty,د قطار لپاره {0}: پلان شوي مقدار درج کړئ
 DocType: Account,Income Account,پر عايداتو باندې حساب
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Customer &gt; Customer Group &gt; Territory,پیرودونکي&gt; د پیرودونکي ګروپ&gt; سیمه
 DocType: Payment Request,Amount in customer's currency,په مشتري د پيسو اندازه
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js,Delivery,د سپارنې پرمهال
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.py,Assigning Structures...,د جوړښتونو ټاکل ...
@@ -4242,7 +4243,6 @@
 DocType: HR Settings,Check Vacancies On Job Offer Creation,د دندې وړاندیز تخلیق کې خالي ځایونه چیک کړئ
 apps/erpnext/erpnext/utilities/user_progress.py,Go to Letterheads,ليټر هير ته لاړ شه
 DocType: Subscription,Cancel At End Of Period,د دورې په پاې کې رد کړئ
-apps/erpnext/erpnext/education/doctype/instructor/instructor.py,Please setup Instructor Naming System in Education &gt; Education Settings,مهرباني وکړئ د ښوونې او روزنې ترتیبات کې د ښوونکي نوم ورکولو سیسټم تنظیم کړئ
 apps/erpnext/erpnext/hr/doctype/employee_promotion/employee_promotion.js,Property already added,ملکیت لا دمخه زیات شوی
 DocType: Item Supplier,Item Supplier,د قالب عرضه
 apps/erpnext/erpnext/public/js/controllers/transaction.js,Please enter Item Code to get batch no,لطفا د قالب کوډ داخل ته داځکه تر لاسه نه
@@ -4527,6 +4527,7 @@
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.js,Warning: Material Requested Qty is less than Minimum Order Qty,خبرداری: مادي غوښتل Qty دی لږ تر لږه نظم Qty څخه کم
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py,Account {0} is frozen,ګڼون {0} ده کنګل
 DocType: Quiz Question,Quiz Question,پوښتنې
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Supplier &gt; Supplier Type,عرضه کونکي&gt; عرضه کونکي ډول
 DocType: Company,Legal Entity / Subsidiary with a separate Chart of Accounts belonging to the Organization.,قانوني نهاد / مستقلې سره د حسابونه د يو جلا چارت د سازمان پورې.
 DocType: Payment Request,Mute Email,ګونګ دبرېښنا ليک
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py,"Food, Beverage & Tobacco",د خوړو، او نوشابه &amp; تنباکو
@@ -5036,7 +5037,6 @@
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py,Delivery warehouse required for stock item {0},د سپارنې پرمهال ګودام لپاره سټاک توکی اړتیا {0}
 DocType: Packing Slip,The gross weight of the package. Usually net weight + packaging material weight. (for print),د بنډل خالص وزن. معمولا د خالص وزن + د بسته بندۍ مواد وزن. (د چاپي)
 DocType: Assessment Plan,Program,پروګرام
-apps/erpnext/erpnext/hr/doctype/employee/employee.py,Please setup Employee Naming System in Human Resource &gt; HR Settings,مهرباني وکړئ د بشري سرچینو&gt; HR ترتیبات کې د کارمند نوم ورکولو سیسټم تنظیم کړئ
 DocType: Accounts Settings,Users with this role are allowed to set frozen accounts and create / modify accounting entries against frozen accounts,سره د دغه رول د کاروونکو دي چې کنګل شوي حسابونه کنګل شوي حسابونه په وړاندې د محاسبې زياتونې جوړ او رامنځته / تعديلوي اجازه
 ,Project Billing Summary,د پروژې د بل بیلګه
 DocType: Vital Signs,Cuts,غوږونه
@@ -5382,6 +5382,8 @@
 apps/erpnext/erpnext/accounts/doctype/monthly_distribution/monthly_distribution.py,Percentage Allocation should be equal to 100%,سلنه تخصيص بايد مساوي له 100٪ وي
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js,Please select Posting Date before selecting Party,لطفا د ګوند په ټاکلو مخکې نوکرې نېټه وټاکئ
 apps/erpnext/erpnext/config/accounting.py,Payment Terms based on conditions,د شرایطو پر بنسټ د تادیې شرایط
+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: Program Enrollment,School House,د ښوونځي ماڼۍ
 DocType: Serial No,Out of AMC,د AMC له جملې څخه
 DocType: Opportunity,Opportunity Amount,د فرصت مقدار
@@ -5550,6 +5552,7 @@
 DocType: Purchase Invoice,Print Language,چاپ ژبه
 DocType: Salary Slip,Total Working Hours,Total کاري ساعتونه
 DocType: Sales Invoice,Customer PO Details,پیرودونکي پوټ جزئیات
+apps/erpnext/erpnext/education/utils.py,You are not enrolled in program {0},تاسو په پروګرام {0} کې شامل نه ياست
 DocType: Stock Entry,Including items for sub assemblies,په شمول د فرعي شوراګانو لپاره شیان
 DocType: Opening Invoice Creation Tool Item,Temporary Opening Account,د لنډ وخت پرانيستلو حساب
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry_list.js,Goods In Transit,په لیږد کې توکي
@@ -5584,6 +5587,7 @@
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py,Order/Quot %,نظم / Quot٪
 apps/erpnext/erpnext/config/healthcare.py,Record Patient Vitals,د ناروغ ناروغۍ ثبت کړئ
 DocType: Fee Schedule,Institution,د انستیتوت
+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: Asset,Partially Depreciated,تر یوه بریده راکم شو
 DocType: Issue,Opening Time,د پرانستلو په وخت
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py,From and To dates required,څخه او د خرما اړتیا
@@ -5801,6 +5805,7 @@
 DocType: Quality Procedure Process,Link existing Quality Procedure.,د کیفیت موجوده پروسیجر لینک کړئ.
 apps/erpnext/erpnext/config/hr.py,Loans,پورونه
 DocType: Healthcare Service Unit,Healthcare Service Unit,د روغتیایی خدماتو څانګه
+,Customer-wise Item Price,د پیرودونکي په حساب د توکو قیمت
 apps/erpnext/erpnext/public/js/financial_statements.js,Cash Flow Statement,نقدو پیسو د جریان اعلامیه
 apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.py,No material request created,د مادي غوښتنه نه جوړه شوې
 apps/erpnext/erpnext/hr/doctype/loan_application/loan_application.py,Loan Amount cannot exceed Maximum Loan Amount of {0},د پور مقدار نه شي کولای د اعظمي پور مقدار زیات {0}
@@ -6065,6 +6070,7 @@
 apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py,Opening Value,د پرانستلو په ارزښت
 DocType: Salary Component,Formula,فورمول
 apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py,Serial #,سریال #
+apps/erpnext/erpnext/hr/doctype/employee/employee.py,Please setup Employee Naming System in Human Resource &gt; HR Settings,مهرباني وکړئ د بشري سرچینو&gt; HR ترتیبات کې د کارمند نوم ورکولو سیسټم تنظیم کړئ
 DocType: Material Request Plan Item,Required Quantity,اړین مقدار
 DocType: Lab Test Template,Lab Test Template,د لابراتوار ازموینه
 apps/erpnext/erpnext/setup/doctype/company/company.py,Sales Account,د پلور حساب
@@ -6311,7 +6317,6 @@
 DocType: Request for Quotation Item,Project Name,د پروژې نوم
 apps/erpnext/erpnext/regional/italy/utils.py,Please set the Customer Address,مهرباني وکړئ د پیرودونکي پته تنظیم کړئ
 DocType: Customer,Mention if non-standard receivable account,یادونه که غیر معیاري ترلاسه حساب
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Customer &gt; Customer Group &gt; Territory,پیرودونکي&gt; د پیرودونکي ګروپ&gt; سیمه
 DocType: Bank,Plaid Access Token,د الوتکې لاسرسي ٹوکن
 apps/erpnext/erpnext/hr/doctype/employee_benefit_application/employee_benefit_application.py,Please add the remaining benefits {0} to any of the existing component,مهرباني وکړئ پاتې برخې ته {0} د اوسني برخې لپاره اضافه کړئ
 DocType: Journal Entry Account,If Income or Expense,که پر عايداتو او يا اخراجاتو
@@ -6571,8 +6576,6 @@
 apps/erpnext/erpnext/buying/utils.py,Please enter quantity for Item {0},لورينه وکړئ د قالب اندازه داخل {0}
 DocType: Quality Procedure,Processes,پروسې
 DocType: Shift Type,First Check-in and Last Check-out,لومړی چیک او وروستی چیک اپ
-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/regional/report/hsn_wise_summary_of_outward_supplies/hsn_wise_summary_of_outward_supplies.py,Total Taxable Amount,د مالیې وړ وړ ټولیز مقدار
 DocType: Employee External Work History,Employee External Work History,د کارګر د بهرنيو کار تاریخ
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.py,Job card {0} created,د کارت کارت {0} جوړ شوی
@@ -6609,6 +6612,7 @@
 apps/erpnext/erpnext/accounts/doctype/payment_terms_template/payment_terms_template.py,Combined invoice portion must equal 100%,د تادیې مشترکه برخه باید 100٪ مساوي وي
 DocType: Item Default,Default Expense Account,Default اخراجاتو اکانټ
 DocType: GST Account,CGST Account,CGST ګڼون
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Item Code &gt; Item Group &gt; Brand,د توکو کوډ&gt; د توکي ګروپ&gt; نښه
 apps/erpnext/erpnext/education/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py,Student Email ID,د زده کونکو د ليک ID
 DocType: Employee,Notice (days),خبرتیا (ورځې)
 DocType: POS Closing Voucher Invoices,POS Closing Voucher Invoices,د POS د وتلو واوډر انویسونه
@@ -7247,6 +7251,7 @@
 DocType: Maintenance Visit,Maintenance Date,د ساتنې او نېټه
 DocType: Purchase Invoice Item,Rejected Serial No,رد شعبه
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py,Year start date or end date is overlapping with {0}. To avoid please set company,کال د پيل نيټه او يا پای نیټه سره {0} تداخل. د مخنيوي لطفا شرکت جوړ
+apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py,Please setup numbering series for Attendance via Setup &gt; Numbering Series,مهرباني وکړئ د تنظیم کولو له لارې د شمیره ورکولو لړۍ له لارې د ګډون لپاره د شمېرنې لړۍ تنظیم کړئ
 apps/erpnext/erpnext/selling/doctype/customer/customer.py,Please mention the Lead Name in Lead {0},مهرباني وکړئ په لیډ {0} کې د لیډ نوم یاد کړئ
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py,Start date should be less than end date for Item {0},د پیل نیټه باید د قالب پای د نېټې په پرتله کمه وي {0}
 DocType: Shift Type,Auto Attendance Settings,د آٹو د ګډون تنظیمات
diff --git a/erpnext/translations/pt.csv b/erpnext/translations/pt.csv
index 63d8a77..22ecbd8 100644
--- a/erpnext/translations/pt.csv
+++ b/erpnext/translations/pt.csv
@@ -168,7 +168,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py,Accountant,Contabilista
 apps/erpnext/erpnext/stock/report/item_price_stock/item_price_stock.py,Selling Price List,Lista de preços de venda
 DocType: Patient,Tobacco Current Use,Uso atual do tabaco
-apps/erpnext/erpnext/stock/report/item_price_stock/item_price_stock.py,Selling Rate,Taxa de vendas
+apps/erpnext/erpnext/selling/report/customer_wise_item_price/customer_wise_item_price.py,Selling Rate,Taxa de vendas
 apps/erpnext/erpnext/erpnext_integrations/doctype/plaid_settings/plaid_settings.js,Please save your document before adding a new account,"Por favor, salve seu documento antes de adicionar uma nova conta"
 DocType: Cost Center,Stock User,Utilizador de Stock
 DocType: Soil Analysis,(Ca+Mg)/K,(Ca + Mg) / K
@@ -205,7 +205,6 @@
 DocType: Packed Item,Parent Detail docname,Dados Principais de docname
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py,"Reference: {0}, Item Code: {1} and Customer: {2}","Referência: {0}, Código do Item: {1} e Cliente: {2}"
 apps/erpnext/erpnext/accounts/report/consolidated_financial_statement/consolidated_financial_statement.py,{0} {1} is not present in the parent company,{0} {1} não está presente na empresa controladora
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Supplier &gt; Supplier Type,Fornecedor&gt; Tipo de Fornecedor
 apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py,Trial Period End Date Cannot be before Trial Period Start Date,Data de término do período de avaliação não pode ser anterior à data de início do período de avaliação
 apps/erpnext/erpnext/utilities/user_progress.py,Kg,Kg
 DocType: Tax Withholding Category,Tax Withholding Category,Categoria de Retenção Fiscal
@@ -319,6 +318,7 @@
 DocType: Quality Procedure Table,Responsible Individual,Indivíduo Responsável
 DocType: Naming Series,Prefix,Prefixo
 apps/erpnext/erpnext/hr/notification/training_scheduled/training_scheduled.html,Event Location,Local do evento
+apps/erpnext/erpnext/selling/report/customer_wise_item_price/customer_wise_item_price.py,Available Stock,Estoque disponível
 DocType: Asset Settings,Asset Settings,Configurações de ativos
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py,Consumable,Consumíveis
 DocType: Student,B-,B-
@@ -352,6 +352,7 @@
 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 \
 				Serial No.","Não é possível garantir a entrega por Nº de série, pois \ Item {0} é adicionado com e sem Garantir entrega por \ Nº de série"
+apps/erpnext/erpnext/education/doctype/instructor/instructor.py,Please setup Instructor Naming System in Education &gt; Education Settings,"Por favor, instale o Sistema de Nomes de Instrutores em Educação&gt; Configurações de Educação"
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py,At least one mode of payment is required for POS invoice.,É necessário pelo menos um modo de pagamento para a fatura POS.
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py,Batch no is required for batched item {0},Lote não é necessário para o item em lote {0}
 DocType: Bank Statement Transaction Invoice Item,Bank Statement Transaction Invoice Item,Item de fatura de transação de extrato bancário
@@ -880,7 +881,6 @@
 DocType: Vital Signs,Blood Pressure (systolic),Pressão sanguínea (sistólica)
 apps/erpnext/erpnext/controllers/buying_controller.py,{0} {1} is {2},{0} {1} é {2}
 DocType: Item Price,Valid Upto,Válido Até
-apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,"Por favor, defina a série de nomenclatura para {0} via Configuração&gt; Configurações&gt; Naming Series"
 DocType: Training Event,Workshop,Workshop
 DocType: Supplier Scorecard Scoring Standing,Warn Purchase Orders,Avisar ordens de compra
 apps/erpnext/erpnext/utilities/user_progress.py,List a few of your customers. They could be organizations or individuals.,Insira alguns dos seus clientes. Podem ser organizações ou indivíduos.
@@ -1685,7 +1685,6 @@
 DocType: Item Barcode,Item Barcode,Código de barras do item
 DocType: Delivery Trip,In Transit,Em trânsito
 DocType: Woocommerce Settings,Endpoints,Pontos de extremidade
-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
 DocType: Shopping Cart Settings,Show Configure Button,Mostrar botão Configurar
 DocType: Quality Inspection Reading,Reading 6,Leitura 6
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js,Cannot {0} {1} {2} without any negative outstanding invoice,Não é possível {0} {1} {2} sem qualquer fatura pendente negativa
@@ -2050,6 +2049,7 @@
 DocType: Cheque Print Template,Payer Settings,Definições de Pagador
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js,No pending Material Requests found to link for the given items.,Nenhuma solicitação de material pendente encontrada para vincular os itens fornecidos.
 apps/erpnext/erpnext/public/js/utils/party.js,Select company first,Selecione a empresa primeiro
+apps/erpnext/erpnext/accounts/general_ledger.py,Account: <b>{0}</b> is capital Work in progress and can not be updated by Journal Entry,Conta: <b>{0}</b> é capital em andamento e não pode ser atualizado pela entrada de diário
 apps/erpnext/erpnext/education/doctype/quiz/quiz.py,Compare List function takes on list arguments,A função de lista de comparação aceita argumentos da lista
 DocType: Item Attribute Value,"This will be appended to the Item Code of the variant. For example, if your abbreviation is ""SM"", and the item code is ""T-SHIRT"", the item code of the variant will be ""T-SHIRT-SM""","Isto será anexado ao Código do Item da variante. Por exemplo, se a sua abreviatura for ""SM"", e o código do item é ""T-SHIRT"", o código do item da variante será ""T-SHIRT-SM"""
 DocType: Salary Slip,Net Pay (in words) will be visible once you save the Salary Slip.,A Remuneração Líquida (por extenso) será visível assim que guardar a Folha de Vencimento.
@@ -2234,6 +2234,7 @@
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js,Item 2,Item 2
 DocType: Pricing Rule,Validate Applied Rule,Validar Regra Aplicada
 DocType: QuickBooks Migrator,Authorization Endpoint,Ponto final da autorização
+DocType: Employee Onboarding,Notify users by email,Notificar usuários por email
 DocType: Travel Request,International,Internacional
 DocType: Training Event,Training Event,Evento de Formação
 DocType: Item,Auto re-order,Voltar a Pedir Autom.
@@ -2847,7 +2848,6 @@
 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
-DocType: Contract,Inactive,Inativo
 apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.js,This will submit Salary Slips and create accrual Journal Entry. Do you want to proceed?,Isso enviará os Slides salariais e criará a entrada no diário de acumulação. Você quer prosseguir?
 DocType: Purchase Invoice,Total Net Weight,Peso líquido total
 DocType: Purchase Order,Order Confirmation No,Confirmação do Pedido Não
@@ -3130,7 +3130,6 @@
 apps/erpnext/erpnext/accounts/party.py,Billing currency must be equal to either default company's currency or party account currency,A moeda de faturamento deve ser igual à moeda da empresa padrão ou à moeda da conta do partido
 DocType: Packing Slip,Indicates that the package is a part of this delivery (Only Draft),Indica que o pacote é uma parte desta entrega (Só no Rascunho)
 apps/erpnext/erpnext/accounts/report/customer_ledger_summary/customer_ledger_summary.py,Closing Balance,Saldo final
-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}
 DocType: Soil Texture,Loam,Loam
 apps/erpnext/erpnext/controllers/accounts_controller.py,Row {0}: Due Date cannot be before posting date,Linha {0}: data de vencimento não pode ser antes da data de publicação
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py,Quantity for Item {0} must be less than {1},A Quantidade do Item {0} deve ser inferior a {1}
@@ -3660,7 +3659,6 @@
 DocType: Stock Settings,Raise Material Request when stock reaches re-order level,Levantar Solicitação de Material quando o stock atingir o nível de reencomenda
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py,Full-time,Tempo Integral
 DocType: Payroll Entry,Employees,Funcionários
-apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py,Please setup numbering series for Attendance via Setup &gt; Numbering Series,Por favor configure a série de numeração para Presenças via Configuração&gt; Série de Numeração
 DocType: Question,Single Correct Answer,Resposta Correta Única
 DocType: Employee,Contact Details,Dados de Contacto
 DocType: C-Form,Received Date,Data de Receção
@@ -4295,6 +4293,7 @@
 DocType: Pricing Rule,Price or Product Discount,Preço ou desconto do produto
 apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.py,For row {0}: Enter planned qty,Para a linha {0}: digite a quantidade planejada
 DocType: Account,Income Account,Conta de Rendimento
+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: Payment Request,Amount in customer's currency,Montante na moeda do cliente
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js,Delivery,Entrega
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.py,Assigning Structures...,Atribuindo Estruturas ...
@@ -4344,7 +4343,6 @@
 DocType: HR Settings,Check Vacancies On Job Offer Creation,Verifique as vagas na criação da oferta de emprego
 apps/erpnext/erpnext/utilities/user_progress.py,Go to Letterheads,Ir para cabeçalho
 DocType: Subscription,Cancel At End Of Period,Cancelar no final do período
-apps/erpnext/erpnext/education/doctype/instructor/instructor.py,Please setup Instructor Naming System in Education &gt; Education Settings,"Por favor, instale o Sistema de Nomes de Instrutores em Educação&gt; Configurações de Educação"
 apps/erpnext/erpnext/hr/doctype/employee_promotion/employee_promotion.js,Property already added,Propriedade já adicionada
 DocType: Item Supplier,Item Supplier,Fornecedor do Item
 apps/erpnext/erpnext/public/js/controllers/transaction.js,Please enter Item Code to get batch no,"Por favor, insira o Código do Item para obter o nr. de lote"
@@ -4642,6 +4640,7 @@
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.js,Warning: Material Requested Qty is less than Minimum Order Qty,Aviso: A Qtd do Material requisitado é menor que a Qtd de Pedido Mínima
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py,Account {0} is frozen,A conta {0} está congelada
 DocType: Quiz Question,Quiz Question,Quiz Question
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Supplier &gt; Supplier Type,Fornecedor&gt; Tipo de Fornecedor
 DocType: Company,Legal Entity / Subsidiary with a separate Chart of Accounts belonging to the Organization.,Entidade Legal / Subsidiária com um Gráfico de Contas separado pertencente à Organização.
 DocType: Payment Request,Mute Email,Email Sem Som
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py,"Food, Beverage & Tobacco","Comida, Bebidas e Tabaco"
@@ -5157,7 +5156,6 @@
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py,Delivery warehouse required for stock item {0},É necessário colocar o armazém de entrega para o item de stock {0}
 DocType: Packing Slip,The gross weight of the package. Usually net weight + packaging material weight. (for print),O peso bruto do pacote. Normalmente peso líquido + peso do material de embalagem. (Para impressão)
 DocType: Assessment Plan,Program,Programa
-apps/erpnext/erpnext/hr/doctype/employee/employee.py,Please setup Employee Naming System in Human Resource &gt; HR Settings,"Por favor, configure Employee Naming System em Recursos Humanos&gt; HR Settings"
 DocType: Accounts Settings,Users with this role are allowed to set frozen accounts and create / modify accounting entries against frozen accounts,Os utilizadores com esta função poderão definir contas congeladas e criar / modificar os registos contabilísticos em contas congeladas
 ,Project Billing Summary,Resumo de cobrança do projeto
 DocType: Vital Signs,Cuts,Cortes
@@ -5408,6 +5406,7 @@
 apps/erpnext/erpnext/quality_management/doctype/quality_review/quality_review_list.js,No Action,Nenhuma ação
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js,Valuation type charges can not marked as Inclusive,Os encargos do tipo de avaliação não podem ser marcados como Inclusivos
 DocType: POS Profile,Update Stock,Actualizar Stock
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,"Por favor, defina a série de nomenclatura para {0} via Configuração&gt; Configurações&gt; Naming Series"
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js,Different UOM for items will lead to incorrect (Total) Net Weight value. Make sure that Net Weight of each item is in the same UOM.,Uma UNID diferente para os itens levará a um Valor de Peso Líquido (Total) incorreto. Certifique-se de que o Peso Líquido de cada item está na mesma UNID.
 DocType: Certification Application,Payment Details,Detalhes do pagamento
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py,BOM Rate,Preço na LDM
@@ -5513,6 +5512,8 @@
 apps/erpnext/erpnext/accounts/doctype/monthly_distribution/monthly_distribution.py,Percentage Allocation should be equal to 100%,A Percentagem de Atribuição deve ser igual a 100%
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js,Please select Posting Date before selecting Party,"Por favor, selecione a Data de Lançamento antes de selecionar a Parte"
 apps/erpnext/erpnext/config/accounting.py,Payment Terms based on conditions,Termos de pagamento com base nas condições
+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, apague o empregado <a href=""#Form/Employee/{0}"">{0}</a> \ para cancelar este documento"
 DocType: Program Enrollment,School House,School House
 DocType: Serial No,Out of AMC,Sem CMA
 DocType: Opportunity,Opportunity Amount,Valor da oportunidade
@@ -5716,6 +5717,7 @@
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py,Order/Quot %,Ordem / Quot%
 apps/erpnext/erpnext/config/healthcare.py,Record Patient Vitals,Record Patient Vitals
 DocType: Fee Schedule,Institution,Instituição
+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}
 DocType: Asset,Partially Depreciated,Parcialmente Depreciados
 DocType: Issue,Opening Time,Tempo de Abertura
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py,From and To dates required,São necessárias as datas De e A
@@ -5935,6 +5937,7 @@
 DocType: Quality Procedure Process,Link existing Quality Procedure.,Vincule o Procedimento de Qualidade existente.
 apps/erpnext/erpnext/config/hr.py,Loans,Empréstimos
 DocType: Healthcare Service Unit,Healthcare Service Unit,Unidade de Atendimento de Saúde
+,Customer-wise Item Price,Preço de Item ao Consumidor
 apps/erpnext/erpnext/public/js/financial_statements.js,Cash Flow Statement,Demonstração dos Fluxos de Caixa
 apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.py,No material request created,Não foi criada nenhuma solicitação de material
 apps/erpnext/erpnext/hr/doctype/loan_application/loan_application.py,Loan Amount cannot exceed Maximum Loan Amount of {0},Valor do Empréstimo não pode exceder Máximo Valor do Empréstimo de {0}
@@ -6201,6 +6204,7 @@
 apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py,Opening Value,Valor Inicial
 DocType: Salary Component,Formula,Fórmula
 apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py,Serial #,Série #
+apps/erpnext/erpnext/hr/doctype/employee/employee.py,Please setup Employee Naming System in Human Resource &gt; HR Settings,"Por favor, configure Employee Naming System em Recursos Humanos&gt; HR Settings"
 DocType: Material Request Plan Item,Required Quantity,Quantidade requerida
 DocType: Lab Test Template,Lab Test Template,Modelo de teste de laboratório
 apps/erpnext/erpnext/accounts/doctype/accounting_period/accounting_period.py,Accounting Period overlaps with {0},Período de Contabilidade sobrepõe-se a {0}
@@ -6452,7 +6456,6 @@
 DocType: Request for Quotation Item,Project Name,Nome do Projeto
 apps/erpnext/erpnext/regional/italy/utils.py,Please set the Customer Address,"Por favor, defina o endereço do cliente"
 DocType: Customer,Mention if non-standard receivable account,Mencione se é uma conta a receber não padrão
-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: Bank,Plaid Access Token,Token de acesso xadrez
 apps/erpnext/erpnext/hr/doctype/employee_benefit_application/employee_benefit_application.py,Please add the remaining benefits {0} to any of the existing component,"Por favor, adicione os benefícios restantes {0} para qualquer um dos componentes existentes"
 DocType: Journal Entry Account,If Income or Expense,Se forem Rendimentos ou Despesas
@@ -6716,8 +6719,6 @@
 apps/erpnext/erpnext/buying/utils.py,Please enter quantity for Item {0},"Por favor, insira a quantidade para o Item {0}"
 DocType: Quality Procedure,Processes,Processos
 DocType: Shift Type,First Check-in and Last Check-out,Primeiro check-in e último check-out
-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, apague o empregado <a href=""#Form/Employee/{0}"">{0}</a> \ para cancelar este documento"
 apps/erpnext/erpnext/regional/report/hsn_wise_summary_of_outward_supplies/hsn_wise_summary_of_outward_supplies.py,Total Taxable Amount,Valor Total Tributável
 DocType: Employee External Work History,Employee External Work History,Historial de Trabalho Externo do Funcionário
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.py,Job card {0} created,Cartão de trabalho {0} criado
@@ -6754,6 +6755,7 @@
 apps/erpnext/erpnext/accounts/doctype/payment_terms_template/payment_terms_template.py,Combined invoice portion must equal 100%,A fração da fatura combinada deve ser igual a 100%
 DocType: Item Default,Default Expense Account,Conta de Despesas Padrão
 DocType: GST Account,CGST Account,Conta CGST
+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/education/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py,Student Email ID,Student E-mail ID
 DocType: Employee,Notice (days),Aviso (dias)
 DocType: POS Closing Voucher Invoices,POS Closing Voucher Invoices,Faturas de vouchers de fechamento de ponto de venda
@@ -7403,6 +7405,7 @@
 DocType: Maintenance Visit,Maintenance Date,Data de Manutenção
 DocType: Purchase Invoice Item,Rejected Serial No,Nr. de Série Rejeitado
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py,Year start date or end date is overlapping with {0}. To avoid please set company,A data de início do ano ou data de término está em sobreposição com {0}. Para evitar isto defina a empresa
+apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py,Please setup numbering series for Attendance via Setup &gt; Numbering Series,Por favor configure a série de numeração para Presenças via Configuração&gt; Série de Numeração
 apps/erpnext/erpnext/selling/doctype/customer/customer.py,Please mention the Lead Name in Lead {0},"Por favor, mencione o Nome do Líder no Lead {0}"
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py,Start date should be less than end date for Item {0},"A data de início deve ser anterior à data final, para o Item {0}"
 DocType: Shift Type,Auto Attendance Settings,Configurações de atendimento automático
diff --git a/erpnext/translations/ro.csv b/erpnext/translations/ro.csv
index 1d3af57..a770e73 100644
--- a/erpnext/translations/ro.csv
+++ b/erpnext/translations/ro.csv
@@ -168,7 +168,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py,Accountant,Contabil
 apps/erpnext/erpnext/stock/report/item_price_stock/item_price_stock.py,Selling Price List,Listă Prețuri de Vânzare
 DocType: Patient,Tobacco Current Use,Utilizarea curentă a tutunului
-apps/erpnext/erpnext/stock/report/item_price_stock/item_price_stock.py,Selling Rate,Rată de Vânzare
+apps/erpnext/erpnext/selling/report/customer_wise_item_price/customer_wise_item_price.py,Selling Rate,Rată de Vânzare
 apps/erpnext/erpnext/erpnext_integrations/doctype/plaid_settings/plaid_settings.js,Please save your document before adding a new account,Vă rugăm să salvați documentul înainte de a adăuga un cont nou
 DocType: Cost Center,Stock User,Stoc de utilizare
 DocType: Soil Analysis,(Ca+Mg)/K,(Ca + Mg) / K
@@ -205,7 +205,6 @@
 DocType: Packed Item,Parent Detail docname,Părinte Detaliu docname
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py,"Reference: {0}, Item Code: {1} and Customer: {2}","Referință: {0}, Cod articol: {1} și Client: {2}"
 apps/erpnext/erpnext/accounts/report/consolidated_financial_statement/consolidated_financial_statement.py,{0} {1} is not present in the parent company,{0} {1} nu este prezentă în compania mamă
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Supplier &gt; Supplier Type,Furnizor&gt; Tip furnizor
 apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py,Trial Period End Date Cannot be before Trial Period Start Date,Perioada de încheiere a perioadei de încercare nu poate fi înainte de data începerii perioadei de încercare
 apps/erpnext/erpnext/utilities/user_progress.py,Kg,Kg
 DocType: Tax Withholding Category,Tax Withholding Category,Categoria de reținere fiscală
@@ -319,6 +318,7 @@
 DocType: Quality Procedure Table,Responsible Individual,Individ responsabil
 DocType: Naming Series,Prefix,Prefix
 apps/erpnext/erpnext/hr/notification/training_scheduled/training_scheduled.html,Event Location,Locația evenimentului
+apps/erpnext/erpnext/selling/report/customer_wise_item_price/customer_wise_item_price.py,Available Stock,Stoc disponibil
 DocType: Asset Settings,Asset Settings,Setările activelor
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py,Consumable,Consumabile
 DocType: Student,B-,B-
@@ -352,6 +352,7 @@
 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 \
 				Serial No.",Nu se poate asigura livrarea prin numărul de serie după cum este adăugat articolul {0} cu și fără Asigurați livrarea prin \ Nr.
+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/accounts/doctype/sales_invoice/sales_invoice.py,At least one mode of payment is required for POS invoice.,Cel puțin un mod de plată este necesar factura POS.
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py,Batch no is required for batched item {0},Numărul lot nu este necesar pentru articol lot {0}
 DocType: Bank Statement Transaction Invoice Item,Bank Statement Transaction Invoice Item,Tranzacție de poziție bancară
@@ -880,7 +881,6 @@
 DocType: Vital Signs,Blood Pressure (systolic),Tensiunea arterială (sistolică)
 apps/erpnext/erpnext/controllers/buying_controller.py,{0} {1} is {2},{0} {1} este {2}
 DocType: Item Price,Valid Upto,Valid Până la
-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: Training Event,Workshop,Atelier
 DocType: Supplier Scorecard Scoring Standing,Warn Purchase Orders,Avertizați comenzile de cumpărare
 apps/erpnext/erpnext/utilities/user_progress.py,List a few of your customers. They could be organizations or individuals.,Listeaza cativa din clienții dvs. Ei ar putea fi organizații sau persoane fizice.
@@ -1690,7 +1690,6 @@
 DocType: Item Barcode,Item Barcode,Element de coduri de bare
 DocType: Delivery Trip,In Transit,În trecere
 DocType: Woocommerce Settings,Endpoints,Endpoints
-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ă
 DocType: Shopping Cart Settings,Show Configure Button,Afișați butonul Configurare
 DocType: Quality Inspection Reading,Reading 6,Lectura 6
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js,Cannot {0} {1} {2} without any negative outstanding invoice,Nu se poate {0} {1} {2} in lipsa unei facturi negative restante
@@ -2054,6 +2053,7 @@
 DocType: Cheque Print Template,Payer Settings,Setări plătitorilor
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js,No pending Material Requests found to link for the given items.,Nu au fost găsite solicitări de material în așteptare pentru link-ul pentru elementele date.
 apps/erpnext/erpnext/public/js/utils/party.js,Select company first,Selectați mai întâi compania
+apps/erpnext/erpnext/accounts/general_ledger.py,Account: <b>{0}</b> is capital Work in progress and can not be updated by Journal Entry,Cont: <b>{0}</b> este capital de lucru în desfășurare și nu poate fi actualizat de jurnalul de intrare
 apps/erpnext/erpnext/education/doctype/quiz/quiz.py,Compare List function takes on list arguments,Comparați funcția Listă ia argumentele listei
 DocType: Item Attribute Value,"This will be appended to the Item Code of the variant. For example, if your abbreviation is ""SM"", and the item code is ""T-SHIRT"", the item code of the variant will be ""T-SHIRT-SM""","Acest lucru va fi adăugat la Codul punctul de varianta. De exemplu, în cazul în care abrevierea este ""SM"", iar codul produs face ""T-SHIRT"", codul punctul de varianta va fi ""T-SHIRT-SM"""
 DocType: Salary Slip,Net Pay (in words) will be visible once you save the Salary Slip.,Pay net (în cuvinte) vor fi vizibile după ce salvați fluturasul de salariu.
@@ -2242,6 +2242,7 @@
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js,Item 2,Punctul 2
 DocType: Pricing Rule,Validate Applied Rule,Validați regula aplicată
 DocType: QuickBooks Migrator,Authorization Endpoint,Autorizație
+DocType: Employee Onboarding,Notify users by email,Notifica utilizatorii prin e-mail
 DocType: Travel Request,International,Internaţional
 DocType: Training Event,Training Event,Eveniment de formare
 DocType: Item,Auto re-order,Re-comandă automată
@@ -2856,7 +2857,6 @@
 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
-DocType: Contract,Inactive,Inactiv
 apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.js,This will submit Salary Slips and create accrual Journal Entry. Do you want to proceed?,Aceasta va trimite salariile de salarizare și va crea înregistrarea de înregistrare în jurnal. Doriți să continuați?
 DocType: Purchase Invoice,Total Net Weight,Greutatea totală netă
 DocType: Purchase Order,Order Confirmation No,Confirmarea nr
@@ -3139,7 +3139,6 @@
 apps/erpnext/erpnext/accounts/party.py,Billing currency must be equal to either default company's currency or party account currency,"Valuta de facturare trebuie să fie identica fie cu valuta implicită a companiei, fie cu moneda contului de partid"
 DocType: Packing Slip,Indicates that the package is a part of this delivery (Only Draft),Indică faptul că pachetul este o parte din această livrare (Proiect de numai)
 apps/erpnext/erpnext/accounts/report/customer_ledger_summary/customer_ledger_summary.py,Closing Balance,Soldul de încheiere
-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}
 DocType: Soil Texture,Loam,Lut
 apps/erpnext/erpnext/controllers/accounts_controller.py,Row {0}: Due Date cannot be before posting date,Rând {0}: data de scadență nu poate fi înainte de data postării
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py,Quantity for Item {0} must be less than {1},Cantitatea pentru postul {0} trebuie să fie mai mică de {1}
@@ -3667,7 +3666,6 @@
 DocType: Stock Settings,Raise Material Request when stock reaches re-order level,Creaza Cerere Material atunci când stocul ajunge la nivelul re-comandă
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py,Full-time,Permanent
 DocType: Payroll Entry,Employees,Numar de angajati
-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: Question,Single Correct Answer,Un singur răspuns corect
 DocType: Employee,Contact Details,Detalii Persoana de Contact
 DocType: C-Form,Received Date,Data primit
@@ -4301,6 +4299,7 @@
 DocType: Pricing Rule,Price or Product Discount,Preț sau reducere produs
 apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.py,For row {0}: Enter planned qty,Pentru rândul {0}: Introduceți cantitatea planificată
 DocType: Account,Income Account,Contul de venit
+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: Payment Request,Amount in customer's currency,Suma în moneda clientului
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js,Delivery,Livrare
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.py,Assigning Structures...,Alocarea structurilor ...
@@ -4350,7 +4349,6 @@
 DocType: HR Settings,Check Vacancies On Job Offer Creation,Verificați posturile vacante pentru crearea ofertei de locuri de muncă
 apps/erpnext/erpnext/utilities/user_progress.py,Go to Letterheads,Mergeți la Letterheads
 DocType: Subscription,Cancel At End Of Period,Anulați la sfârșitul perioadei
-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/hr/doctype/employee_promotion/employee_promotion.js,Property already added,Proprietățile deja adăugate
 DocType: Item Supplier,Item Supplier,Furnizor Articol
 apps/erpnext/erpnext/public/js/controllers/transaction.js,Please enter Item Code to get batch no,Va rugam sa introduceti codul articol pentru a obține lot nu
@@ -4647,6 +4645,7 @@
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.js,Warning: Material Requested Qty is less than Minimum Order Qty,Atenție: Materialul solicitat Cant este mai mică decât minima pentru comanda Cantitate
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py,Account {0} is frozen,Contul {0} este Blocat
 DocType: Quiz Question,Quiz Question,Întrebare întrebare
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Supplier &gt; Supplier Type,Furnizor&gt; Tip furnizor
 DocType: Company,Legal Entity / Subsidiary with a separate Chart of Accounts belonging to the Organization.,Entitate Juridică / Filială cu o Diagramă de Conturi separată aparținând Organizației.
 DocType: Payment Request,Mute Email,Mute Email
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py,"Food, Beverage & Tobacco","Produse Alimentare, Bauturi si Tutun"
@@ -5162,7 +5161,6 @@
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py,Delivery warehouse required for stock item {0},Depozit de livrare necesar pentru articol stoc {0}
 DocType: Packing Slip,The gross weight of the package. Usually net weight + packaging material weight. (for print),"Greutatea brută a pachetului. Greutate + ambalare, de obicei, greutate netă de material. (Pentru imprimare)"
 DocType: Assessment Plan,Program,Program
-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: Accounts Settings,Users with this role are allowed to set frozen accounts and create / modify accounting entries against frozen accounts,Utilizatorii cu acest rol li se permite să stabilească în conturile înghețate și de a crea / modifica intrări contabile împotriva conturile înghețate
 ,Project Billing Summary,Rezumatul facturării proiectului
 DocType: Vital Signs,Cuts,Bucăți
@@ -5413,6 +5411,7 @@
 apps/erpnext/erpnext/quality_management/doctype/quality_review/quality_review_list.js,No Action,Fara actiune
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js,Valuation type charges can not marked as Inclusive,Taxele de tip evaluare nu poate marcate ca Inclusive
 DocType: POS Profile,Update Stock,Actualizare stock
+apps/erpnext/erpnext/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/stock/doctype/packing_slip/packing_slip.js,Different UOM for items will lead to incorrect (Total) Net Weight value. Make sure that Net Weight of each item is in the same UOM.,Un UOM diferit pentru articole va conduce la o valoare incorecta pentru Greutate Neta (Total). Asigurați-vă că Greutatea Netă a fiecărui articol este în același UOM.
 DocType: Certification Application,Payment Details,Detalii de plata
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py,BOM Rate,Rată BOM
@@ -5517,6 +5516,8 @@
 apps/erpnext/erpnext/accounts/doctype/monthly_distribution/monthly_distribution.py,Percentage Allocation should be equal to 100%,Alocarea procent ar trebui să fie egală cu 100%
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js,Please select Posting Date before selecting Party,Vă rugăm să selectați Dată postare înainte de a selecta Parte
 apps/erpnext/erpnext/config/accounting.py,Payment Terms based on conditions,Termeni de plată în funcție de condiții
+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: Program Enrollment,School House,School House
 DocType: Serial No,Out of AMC,Din AMC
 DocType: Opportunity,Opportunity Amount,Oportunitate Sumă
@@ -5720,6 +5721,7 @@
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py,Order/Quot %,Ordine / Cotare%
 apps/erpnext/erpnext/config/healthcare.py,Record Patient Vitals,Înregistrați vitalii pacientului
 DocType: Fee Schedule,Institution,Instituţie
+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}
 DocType: Asset,Partially Depreciated,parțial Depreciata
 DocType: Issue,Opening Time,Timp de deschidere
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py,From and To dates required,Datele De La și Pana La necesare
@@ -5940,6 +5942,7 @@
 DocType: Quality Procedure Process,Link existing Quality Procedure.,Conectați procedura de calitate existentă.
 apps/erpnext/erpnext/config/hr.py,Loans,Credite
 DocType: Healthcare Service Unit,Healthcare Service Unit,Serviciul de asistență medicală
+,Customer-wise Item Price,Prețul articolului pentru clienți
 apps/erpnext/erpnext/public/js/financial_statements.js,Cash Flow Statement,Situația fluxurilor de trezorerie
 apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.py,No material request created,Nu a fost creată nicio solicitare materială
 apps/erpnext/erpnext/hr/doctype/loan_application/loan_application.py,Loan Amount cannot exceed Maximum Loan Amount of {0},Suma creditului nu poate depăși valoarea maximă a împrumutului de {0}
@@ -6206,6 +6209,7 @@
 apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py,Opening Value,Valoarea de deschidere
 DocType: Salary Component,Formula,Formulă
 apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py,Serial #,Serial #
+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: Material Request Plan Item,Required Quantity,Cantitatea necesară
 DocType: Lab Test Template,Lab Test Template,Lab Test Template
 apps/erpnext/erpnext/accounts/doctype/accounting_period/accounting_period.py,Accounting Period overlaps with {0},Perioada de contabilitate se suprapune cu {0}
@@ -6457,7 +6461,6 @@
 DocType: Request for Quotation Item,Project Name,Denumirea proiectului
 apps/erpnext/erpnext/regional/italy/utils.py,Please set the Customer Address,Vă rugăm să setați Adresa Clientului
 DocType: Customer,Mention if non-standard receivable account,Mentionati daca non-standard cont de primit
-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: Bank,Plaid Access Token,Token de acces la carouri
 apps/erpnext/erpnext/hr/doctype/employee_benefit_application/employee_benefit_application.py,Please add the remaining benefits {0} to any of the existing component,Vă rugăm să adăugați beneficiile rămase {0} la oricare dintre componentele existente
 DocType: Journal Entry Account,If Income or Expense,In cazul Veniturilor sau Cheltuielilor
@@ -6721,8 +6724,6 @@
 apps/erpnext/erpnext/buying/utils.py,Please enter quantity for Item {0},Va rugam sa introduceti cantitatea pentru postul {0}
 DocType: Quality Procedure,Processes,procese
 DocType: Shift Type,First Check-in and Last Check-out,Primul check-in și ultimul check-out
-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/regional/report/hsn_wise_summary_of_outward_supplies/hsn_wise_summary_of_outward_supplies.py,Total Taxable Amount,Sumă impozabilă totală
 DocType: Employee External Work History,Employee External Work History,Istoric Extern Locuri de Munca Angajat
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.py,Job card {0} created,Cartea de activitate {0} a fost creată
@@ -6759,6 +6760,7 @@
 apps/erpnext/erpnext/accounts/doctype/payment_terms_template/payment_terms_template.py,Combined invoice portion must equal 100%,Partea facturată combinată trebuie să fie egală cu 100%
 DocType: Item Default,Default Expense Account,Cont de Cheltuieli Implicit
 DocType: GST Account,CGST Account,Contul CGST
+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/education/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py,Student Email ID,ID-ul de student e-mail
 DocType: Employee,Notice (days),Preaviz (zile)
 DocType: POS Closing Voucher Invoices,POS Closing Voucher Invoices,Facturi pentru voucherele de închidere de la POS
@@ -7401,6 +7403,7 @@
 DocType: Maintenance Visit,Maintenance Date,Dată Mentenanță
 DocType: Purchase Invoice Item,Rejected Serial No,Respins de ordine
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py,Year start date or end date is overlapping with {0}. To avoid please set company,Anul Data de începere sau de încheiere este suprapunerea cu {0}. Pentru a evita vă rugăm să setați companie
+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/selling/doctype/customer/customer.py,Please mention the Lead Name in Lead {0},Menționați numele de plumb din plumb {0}
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py,Start date should be less than end date for Item {0},Data de începere trebuie să fie mai mică decât data de sfârșit pentru postul {0}
 DocType: Shift Type,Auto Attendance Settings,Setări de prezență automată
diff --git a/erpnext/translations/ru.csv b/erpnext/translations/ru.csv
index 7be4637..1512ad0 100644
--- a/erpnext/translations/ru.csv
+++ b/erpnext/translations/ru.csv
@@ -168,7 +168,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py,Accountant,Бухгалтер
 apps/erpnext/erpnext/stock/report/item_price_stock/item_price_stock.py,Selling Price List,Продажа прайс-листа
 DocType: Patient,Tobacco Current Use,Текущее потребление табака
-apps/erpnext/erpnext/stock/report/item_price_stock/item_price_stock.py,Selling Rate,Стоимость продажи
+apps/erpnext/erpnext/selling/report/customer_wise_item_price/customer_wise_item_price.py,Selling Rate,Стоимость продажи
 apps/erpnext/erpnext/erpnext_integrations/doctype/plaid_settings/plaid_settings.js,Please save your document before adding a new account,"Пожалуйста, сохраните ваш документ перед добавлением новой учетной записи"
 DocType: Cost Center,Stock User,Пользователь склада
 DocType: Soil Analysis,(Ca+Mg)/K,(Са + Mg) / К
@@ -205,7 +205,6 @@
 DocType: Packed Item,Parent Detail docname,Родитель Деталь DOCNAME
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py,"Reference: {0}, Item Code: {1} and Customer: {2}","Ссылка: {0}, Код товара: {1} и Заказчик: {2}"
 apps/erpnext/erpnext/accounts/report/consolidated_financial_statement/consolidated_financial_statement.py,{0} {1} is not present in the parent company,{0} {1} нет в материнской компании
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Supplier &gt; Supplier Type,Поставщик&gt; Тип поставщика
 apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py,Trial Period End Date Cannot be before Trial Period Start Date,Дата окончания пробного периода Не может быть до начала периода пробного периода
 apps/erpnext/erpnext/utilities/user_progress.py,Kg,кг
 DocType: Tax Withholding Category,Tax Withholding Category,Категория удержания налогов
@@ -319,6 +318,7 @@
 DocType: Quality Procedure Table,Responsible Individual,Ответственный человек
 DocType: Naming Series,Prefix,Префикс
 apps/erpnext/erpnext/hr/notification/training_scheduled/training_scheduled.html,Event Location,Место проведения мероприятия
+apps/erpnext/erpnext/selling/report/customer_wise_item_price/customer_wise_item_price.py,Available Stock,Доступный запас
 DocType: Asset Settings,Asset Settings,Настройки актива
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py,Consumable,Потребляемый
 DocType: Student,B-,B-
@@ -352,6 +352,7 @@
 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 \
 				Serial No.","Невозможно обеспечить доставку серийным номером, так как \ Item {0} добавляется с и без обеспечения доставки \ Серийным номером"
+apps/erpnext/erpnext/education/doctype/instructor/instructor.py,Please setup Instructor Naming System in Education &gt; Education Settings,"Пожалуйста, настройте систему имен инструкторов в «Образование»"
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py,At least one mode of payment is required for POS invoice.,По крайней мере один способ оплаты требуется для POS счета.
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py,Batch no is required for batched item {0},Для партии {0} не требуется номер партии
 DocType: Bank Statement Transaction Invoice Item,Bank Statement Transaction Invoice Item,Элемент счета транзакции банковского выписки
@@ -880,7 +881,6 @@
 DocType: Vital Signs,Blood Pressure (systolic),Кровяное давление (систолическое)
 apps/erpnext/erpnext/controllers/buying_controller.py,{0} {1} is {2},{0} {1} - это {2}
 DocType: Item Price,Valid Upto,Действительно До
-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: Training Event,Workshop,мастерская
 DocType: Supplier Scorecard Scoring Standing,Warn Purchase Orders,Предупреждать заказы на поставку
 apps/erpnext/erpnext/utilities/user_progress.py,List a few of your customers. They could be organizations or individuals.,Перечислите несколько ваших клиентов. Это могут быть как организации так и частные лица.
@@ -1690,7 +1690,6 @@
 DocType: Item Barcode,Item Barcode,Штрих-код продукта
 DocType: Delivery Trip,In Transit,Доставляется
 DocType: Woocommerce Settings,Endpoints,Endpoints
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Item Code &gt; Item Group &gt; Brand,Код товара&gt; Группа товаров&gt; Марка
 DocType: Shopping Cart Settings,Show Configure Button,Показать кнопку настройки
 DocType: Quality Inspection Reading,Reading 6,Чтение 6
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js,Cannot {0} {1} {2} without any negative outstanding invoice,Может не {0} {1} {2} без какого-либо отрицательного выдающийся счет-фактура
@@ -2053,6 +2052,7 @@
 DocType: Cheque Print Template,Payer Settings,Настройки плательщика
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js,No pending Material Requests found to link for the given items.,"Ожидается, что запросы материала не будут найдены для ссылок на данные предметы."
 apps/erpnext/erpnext/public/js/utils/party.js,Select company first,Выберите компанию сначала
+apps/erpnext/erpnext/accounts/general_ledger.py,Account: <b>{0}</b> is capital Work in progress and can not be updated by Journal Entry,Аккаунт: <b>{0}</b> является капитальным незавершенным и не может быть обновлен в журнале
 apps/erpnext/erpnext/education/doctype/quiz/quiz.py,Compare List function takes on list arguments,Функция сравнения списка принимает аргументы списка
 DocType: Item Attribute Value,"This will be appended to the Item Code of the variant. For example, if your abbreviation is ""SM"", and the item code is ""T-SHIRT"", the item code of the variant will be ""T-SHIRT-SM""","Это будет добавлена в Кодекс пункта варианте. Например, если ваш аббревиатура ""SM"", и код деталь ""Футболка"", код товара из вариантов будет ""T-Shirt-SM"""
 DocType: Salary Slip,Net Pay (in words) will be visible once you save the Salary Slip.,"Чистая Платное (прописью) будут видны, как только вы сохраните Зарплата Слип."
@@ -2238,6 +2238,7 @@
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js,Item 2,Пункт 2
 DocType: Pricing Rule,Validate Applied Rule,Утвердить примененное правило
 DocType: QuickBooks Migrator,Authorization Endpoint,Конечная точка авторизации
+DocType: Employee Onboarding,Notify users by email,Уведомить пользователей по электронной почте
 DocType: Travel Request,International,Международный
 DocType: Training Event,Training Event,Учебное мероприятие
 DocType: Item,Auto re-order,Автоматический перезаказ
@@ -2851,7 +2852,6 @@
 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,Клиент с тем же именем уже существует
-DocType: Contract,Inactive,Неактивный
 apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.js,This will submit Salary Slips and create accrual Journal Entry. Do you want to proceed?,Это предоставит декларации о зарплате и создаст запись в журнале начисления. Вы хотите продолжить?
 DocType: Purchase Invoice,Total Net Weight,Общий вес нетто
 DocType: Purchase Order,Order Confirmation No,Подтверждение заказа Нет
@@ -3134,7 +3134,6 @@
 apps/erpnext/erpnext/accounts/party.py,Billing currency must be equal to either default company's currency or party account currency,Валюта платежа должна быть равна валюте валюты дефолта или валюте счета участника
 DocType: Packing Slip,Indicates that the package is a part of this delivery (Only Draft),"Указывает, что пакет является частью этой поставки (только проект)"
 apps/erpnext/erpnext/accounts/report/customer_ledger_summary/customer_ledger_summary.py,Closing Balance,Конечное сальдо
-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: Soil Texture,Loam,суглинок
 apps/erpnext/erpnext/controllers/accounts_controller.py,Row {0}: Due Date cannot be before posting date,Строка {0}: дата выполнения не может быть до даты публикации
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py,Quantity for Item {0} must be less than {1},Количество по пункту {0} должно быть меньше {1}
@@ -3664,7 +3663,6 @@
 DocType: Stock Settings,Raise Material Request when stock reaches re-order level,Создавать запрос на материалы когда запасы достигают минимального заданного уровня
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py,Full-time,Полный рабочий день
 DocType: Payroll Entry,Employees,Сотрудники
-apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py,Please setup numbering series for Attendance via Setup &gt; Numbering Series,"Пожалуйста, настройте серию нумерации для Посещаемости через Настройка&gt; Серия нумерации"
 DocType: Question,Single Correct Answer,Единый правильный ответ
 DocType: Employee,Contact Details,Контактная информация
 DocType: C-Form,Received Date,Дата получения
@@ -4297,6 +4295,7 @@
 DocType: Pricing Rule,Price or Product Discount,Цена или скидка на продукт
 apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.py,For row {0}: Enter planned qty,Для строки {0}: введите запланированное количество
 DocType: Account,Income Account,Счет Доходов
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Customer &gt; Customer Group &gt; Territory,Клиент&gt; Группа клиентов&gt; Территория
 DocType: Payment Request,Amount in customer's currency,Сумма в валюте клиента
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js,Delivery,Доставка
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.py,Assigning Structures...,Назначение структур ...
@@ -4346,7 +4345,6 @@
 DocType: HR Settings,Check Vacancies On Job Offer Creation,Проверьте вакансии на создание предложения о работе
 apps/erpnext/erpnext/utilities/user_progress.py,Go to Letterheads,Перейти к бланкам
 DocType: Subscription,Cancel At End Of Period,Отмена на конец периода
-apps/erpnext/erpnext/education/doctype/instructor/instructor.py,Please setup Instructor Naming System in Education &gt; Education Settings,"Пожалуйста, настройте систему имен инструкторов в «Образование»&gt; «Настройки образования»"
 apps/erpnext/erpnext/hr/doctype/employee_promotion/employee_promotion.js,Property already added,Недвижимость уже добавлена
 DocType: Item Supplier,Item Supplier,Поставщик продукта
 apps/erpnext/erpnext/public/js/controllers/transaction.js,Please enter Item Code to get batch no,"Пожалуйста, введите Код товара, чтобы получить партию не"
@@ -4644,6 +4642,7 @@
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.js,Warning: Material Requested Qty is less than Minimum Order Qty,Внимание: Кол-во в запросе на материалы меньше минимального количества для заказа
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py,Account {0} is frozen,Счет {0} заморожен
 DocType: Quiz Question,Quiz Question,Контрольный вопрос
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Supplier &gt; Supplier Type,Поставщик&gt; Тип поставщика
 DocType: Company,Legal Entity / Subsidiary with a separate Chart of Accounts belonging to the Organization.,"Юридическое лицо / Вспомогательный с отдельным Планом счетов бухгалтерского учета, принадлежащего Организации."
 DocType: Payment Request,Mute Email,Отключить электронную почту
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py,"Food, Beverage & Tobacco","Продукты питания, напитки и табак"
@@ -5159,7 +5158,6 @@
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py,Delivery warehouse required for stock item {0},Склад Доставка требуется для фондового пункта {0}
 DocType: Packing Slip,The gross weight of the package. Usually net weight + packaging material weight. (for print),Общий вес пакета. Обычно вес нетто + вес упаковки. (Для печати)
 DocType: Assessment Plan,Program,Программа
-apps/erpnext/erpnext/hr/doctype/employee/employee.py,Please setup Employee Naming System in Human Resource &gt; HR Settings,"Пожалуйста, настройте систему имен сотрудников в разделе «Управление персоналом»&gt; «Настройки HR»"
 DocType: Accounts Settings,Users with this role are allowed to set frozen accounts and create / modify accounting entries against frozen accounts,"Пользователи с этой ролью могут замороживать счета, а также создавать / изменять бухгалтерские проводки замороженных счетов"
 ,Project Billing Summary,Сводка платежных данных по проекту
 DocType: Vital Signs,Cuts,Порезы
@@ -5410,6 +5408,7 @@
 apps/erpnext/erpnext/quality_management/doctype/quality_review/quality_review_list.js,No Action,Бездействие
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js,Valuation type charges can not marked as Inclusive,Обвинения типа Оценка не может отмечен как включено
 DocType: POS Profile,Update Stock,Обновить склад
+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/stock/doctype/packing_slip/packing_slip.js,Different UOM for items will lead to incorrect (Total) Net Weight value. Make sure that Net Weight of each item is in the same UOM.,"Различные единицы измерения (ЕИ) продуктов приведут к некорректному (общему) значению массы нетто. Убедитесь, что вес нетто каждого продукта находится в одной ЕИ."
 DocType: Certification Application,Payment Details,Детали оплаты
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py,BOM Rate,Цена спецификации
@@ -5515,6 +5514,8 @@
 apps/erpnext/erpnext/accounts/doctype/monthly_distribution/monthly_distribution.py,Percentage Allocation should be equal to 100%,Процент Распределение должно быть равно 100%
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js,Please select Posting Date before selecting Party,"Пожалуйста, выберите Дата публикации, прежде чем выбрать партию"
 apps/erpnext/erpnext/config/accounting.py,Payment Terms based on conditions,Условия оплаты на основе условий
+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: Program Enrollment,School House,Общежитие
 DocType: Serial No,Out of AMC,Из КУА
 DocType: Opportunity,Opportunity Amount,Количество Выявления
@@ -5717,6 +5718,7 @@
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py,Order/Quot %,Заказ / Котировка%
 apps/erpnext/erpnext/config/healthcare.py,Record Patient Vitals,Резервные пациенты
 DocType: Fee Schedule,Institution,учреждение
+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: Asset,Partially Depreciated,Частично амортизируется
 DocType: Issue,Opening Time,Открытие Время
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py,From and To dates required,"От и До даты, необходимых"
@@ -5937,6 +5939,7 @@
 DocType: Quality Procedure Process,Link existing Quality Procedure.,Ссылка существующей процедуры качества.
 apps/erpnext/erpnext/config/hr.py,Loans,кредитование
 DocType: Healthcare Service Unit,Healthcare Service Unit,Здравоохранение
+,Customer-wise Item Price,Цена товара для клиента
 apps/erpnext/erpnext/public/js/financial_statements.js,Cash Flow Statement,О движении денежных средств
 apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.py,No material request created,Нет созданных заявок на материал
 apps/erpnext/erpnext/hr/doctype/loan_application/loan_application.py,Loan Amount cannot exceed Maximum Loan Amount of {0},Сумма кредита не может превышать максимальный Сумма кредита {0}
@@ -6202,6 +6205,7 @@
 apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py,Opening Value,Начальное значение
 DocType: Salary Component,Formula,формула
 apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py,Serial #,Serial #
+apps/erpnext/erpnext/hr/doctype/employee/employee.py,Please setup Employee Naming System in Human Resource &gt; HR Settings,"Пожалуйста, настройте систему имен сотрудников в разделе «Управление персоналом»&gt; «Настройки HR»"
 DocType: Material Request Plan Item,Required Quantity,Необходимое количество
 DocType: Lab Test Template,Lab Test Template,Шаблон лабораторных тестов
 apps/erpnext/erpnext/accounts/doctype/accounting_period/accounting_period.py,Accounting Period overlaps with {0},Отчетный период перекрывается с {0}
@@ -6453,7 +6457,6 @@
 DocType: Request for Quotation Item,Project Name,Название проекта
 apps/erpnext/erpnext/regional/italy/utils.py,Please set the Customer Address,"Пожалуйста, установите адрес клиента"
 DocType: Customer,Mention if non-standard receivable account,Отметка при нестандартном счете
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Customer &gt; Customer Group &gt; Territory,Клиент&gt; Группа клиентов&gt; Территория
 DocType: Bank,Plaid Access Token,Жетон доступа к пледу
 apps/erpnext/erpnext/hr/doctype/employee_benefit_application/employee_benefit_application.py,Please add the remaining benefits {0} to any of the existing component,Добавьте оставшиеся преимущества {0} к любому из существующих компонентов
 DocType: Journal Entry Account,If Income or Expense,Если доходов или расходов
@@ -6717,8 +6720,6 @@
 apps/erpnext/erpnext/buying/utils.py,Please enter quantity for Item {0},"Пожалуйста, введите количество продукта {0}"
 DocType: Quality Procedure,Processes,Процессы
 DocType: Shift Type,First Check-in and Last Check-out,Первый заезд и Последний выезд
-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/regional/report/hsn_wise_summary_of_outward_supplies/hsn_wise_summary_of_outward_supplies.py,Total Taxable Amount,Общая сумма налогооблагаемой суммы
 DocType: Employee External Work History,Employee External Work History,Сотрудник Внешний Работа История
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.py,Job card {0} created,Карта работы {0} создана
@@ -6755,6 +6756,7 @@
 apps/erpnext/erpnext/accounts/doctype/payment_terms_template/payment_terms_template.py,Combined invoice portion must equal 100%,Комбинированная часть счета должна равняться 100%
 DocType: Item Default,Default Expense Account,Счет учета затрат по умолчанию
 DocType: GST Account,CGST Account,Учетная запись CGST
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Item Code &gt; Item Group &gt; Brand,Код товара&gt; Группа товаров&gt; Марка
 apps/erpnext/erpnext/education/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py,Student Email ID,Идентификация студента по электронной почте
 DocType: Employee,Notice (days),Уведомление (дней)
 DocType: POS Closing Voucher Invoices,POS Closing Voucher Invoices,Счета-фактуры закрытых ваучеров
@@ -7397,6 +7399,7 @@
 DocType: Maintenance Visit,Maintenance Date,Дата технического обслуживания
 DocType: Purchase Invoice Item,Rejected Serial No,Отклонен Серийный номер
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py,Year start date or end date is overlapping with {0}. To avoid please set company,"Год дата начала или дата окончания перекрывается с {0}. Чтобы избежать, пожалуйста, установите компанию"
+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/selling/doctype/customer/customer.py,Please mention the Lead Name in Lead {0},"Пожалуйста, укажите Имя в Обращении {0}"
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py,Start date should be less than end date for Item {0},Дата начала должна быть раньше даты окончания для продукта {0}
 DocType: Shift Type,Auto Attendance Settings,Настройки автоматической посещаемости
diff --git a/erpnext/translations/si.csv b/erpnext/translations/si.csv
index efdabc9..db8c5bd 100644
--- a/erpnext/translations/si.csv
+++ b/erpnext/translations/si.csv
@@ -163,7 +163,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py,Accountant,ගණකාධිකාරී
 apps/erpnext/erpnext/stock/report/item_price_stock/item_price_stock.py,Selling Price List,විකුණුම් මිල ලැයිස්තුව
 DocType: Patient,Tobacco Current Use,දුම්කොළ භාවිතය
-apps/erpnext/erpnext/stock/report/item_price_stock/item_price_stock.py,Selling Rate,විකුණුම් අනුපාතිකය
+apps/erpnext/erpnext/selling/report/customer_wise_item_price/customer_wise_item_price.py,Selling Rate,විකුණුම් අනුපාතිකය
 apps/erpnext/erpnext/erpnext_integrations/doctype/plaid_settings/plaid_settings.js,Please save your document before adding a new account,නව ගිණුමක් එක් කිරීමට පෙර කරුණාකර ඔබේ ලේඛනය සුරකින්න
 DocType: Cost Center,Stock User,කොටස් පරිශීලක
 DocType: Soil Analysis,(Ca+Mg)/K,(Ca + Mg) / K
@@ -199,7 +199,6 @@
 DocType: Packed Item,Parent Detail docname,මව් විස්තර docname
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py,"Reference: {0}, Item Code: {1} and Customer: {2}","මූලාශ්ර: {0}, අයිතමය සංකේතය: {1} සහ පාරිභෝගික: {2}"
 apps/erpnext/erpnext/accounts/report/consolidated_financial_statement/consolidated_financial_statement.py,{0} {1} is not present in the parent company,{0} {1} මව් සමාගමෙහි නොමැත
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Supplier &gt; Supplier Type,සැපයුම්කරු&gt; සැපයුම්කරු වර්ගය
 apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py,Trial Period End Date Cannot be before Trial Period Start Date,පරීක්ෂා කාලය අවසන් කළ දිනය ආරම්භක දිනයට පෙර දින ආරම්භ කළ නොහැක
 apps/erpnext/erpnext/utilities/user_progress.py,Kg,Kg
 DocType: Tax Withholding Category,Tax Withholding Category,බදු රඳවා ගැනීමේ වර්ගය
@@ -311,6 +310,7 @@
 DocType: Quality Procedure Table,Responsible Individual,වගකිව යුතු පුද්ගලයා
 DocType: Naming Series,Prefix,උපසර්ගය
 apps/erpnext/erpnext/hr/notification/training_scheduled/training_scheduled.html,Event Location,සිද්ධි ස්ථානය
+apps/erpnext/erpnext/selling/report/customer_wise_item_price/customer_wise_item_price.py,Available Stock,ලබා ගත හැකි තොගය
 DocType: Asset Settings,Asset Settings,වත්කම් සැකසුම්
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py,Consumable,පාරිෙභෝජන
 DocType: Student,B-,බී-
@@ -344,6 +344,7 @@
 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 \
 				Serial No.",\ Serial {0} සමඟ බෙදාහැරීම සහතික කිරීම සහතික කළ නොහැකි ය.
+apps/erpnext/erpnext/education/doctype/instructor/instructor.py,Please setup Instructor Naming System in Education &gt; Education Settings,කරුණාකර අධ්‍යාපනය&gt; අධ්‍යාපන සැකසුම් තුළ උපදේශක නම් කිරීමේ පද්ධතිය සකසන්න
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py,At least one mode of payment is required for POS invoice.,ගෙවීම් අවම වශයෙන් එක් මාදිලිය POS ඉන්වොයිසිය සඳහා අවශ්ය වේ.
 DocType: Bank Statement Transaction Invoice Item,Bank Statement Transaction Invoice Item,බැංකු ප්රකාශය ගණුදෙනු ඉන්වොයිස්තුව අයිතමය
 DocType: Salary Detail,Tax on flexible benefit,නම්යශීලී ප්රතිලාභ මත බදු
@@ -1638,7 +1639,6 @@
 DocType: Item Barcode,Item Barcode,අයිතමය Barcode
 DocType: Delivery Trip,In Transit,ප්රවාහනයේ
 DocType: Woocommerce Settings,Endpoints,අවසානය
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Item Code &gt; Item Group &gt; Brand,අයිතම කේතය&gt; අයිතම සමූහය&gt; වෙළඳ නාමය
 DocType: Shopping Cart Settings,Show Configure Button,වින්‍යාස බොත්තම පෙන්වන්න
 DocType: Quality Inspection Reading,Reading 6,කියවීම 6
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js,Cannot {0} {1} {2} without any negative outstanding invoice,{0} නොහැකි {1} {2} සෘණාත්මක කැපී පෙනෙන ඉන්වොයිස් තොරව
@@ -2182,6 +2182,7 @@
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js,Item 2,අංක 2
 DocType: Pricing Rule,Validate Applied Rule,ව්‍යවහාරික රීතිය වලංගු කරන්න
 DocType: QuickBooks Migrator,Authorization Endpoint,අවසර ලත් අන්තය
+DocType: Employee Onboarding,Notify users by email,විද්‍යුත් තැපෑලෙන් පරිශීලකයින්ට දැනුම් දෙන්න
 DocType: Travel Request,International,අන්තර්ජාතික
 DocType: Training Event,Training Event,පුහුණු EVENT
 DocType: Item,Auto re-order,වාහන නැවත අනුපිළිවෙලට
@@ -2785,7 +2786,6 @@
 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,එකම නමක් සහිත පාරිභෝගිකයෙක් දැනටමත් පවතී
-DocType: Contract,Inactive,අක්රියයි
 apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.js,This will submit Salary Slips and create accrual Journal Entry. Do you want to proceed?,මේ සඳහා වැටුප් ලේඛන ඉදිරිපත් කිරීම සහ උපචිත දේශන සටහන් ඉදිරිපත් කිරීම. ඉදිරියට යාමට අවශ්යද?
 DocType: Purchase Invoice,Total Net Weight,මුළු ශුද්ධ බර
 DocType: Purchase Order,Order Confirmation No,ඇනවුම් අංක
@@ -3066,7 +3066,6 @@
 apps/erpnext/erpnext/accounts/party.py,Billing currency must be equal to either default company's currency or party account currency,බිල්පත් මුදල් ගෙවීම් පැහැර හරින සමාගමක මුදලින් හෝ පාර්ශවීය ගිණුම් මුදලකට සමාන විය යුතුය
 DocType: Packing Slip,Indicates that the package is a part of this delivery (Only Draft),"මෙම පැකේජය මෙම බෙදාහැරීමේ කොටසක් බව පෙන්නුම් කරයි (පමණක් කෙටුම්පත),"
 apps/erpnext/erpnext/accounts/report/customer_ledger_summary/customer_ledger_summary.py,Closing Balance,සංවෘත ශේෂය
-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: Soil Texture,Loam,ලෝම්
 apps/erpnext/erpnext/controllers/accounts_controller.py,Row {0}: Due Date cannot be before posting date,පේළිය {0}: කල් ඉකුත්වන දිනයට පෙර දින නියමිත විය නොහැක
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py,Quantity for Item {0} must be less than {1},විෂය {0} සඳහා ප්රමාණ {1} වඩා අඩු විය යුතුය
@@ -3588,7 +3587,6 @@
 DocType: Stock Settings,Raise Material Request when stock reaches re-order level,කොටස් නැවත පිණිස මට්ටමේ වූ විට ද්රව්ය ඉල්ලීම් මතු
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py,Full-time,පූර්ණ කාලීන
 DocType: Payroll Entry,Employees,සේවක
-apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py,Please setup numbering series for Attendance via Setup &gt; Numbering Series,කරුණාකර පැමිණීම සඳහා අංකනය කිරීමේ ශ්‍රේණිය සැකසුම&gt; අංකනය මාලාව හරහා සකසන්න
 DocType: Question,Single Correct Answer,තනි නිවැරදි පිළිතුර
 DocType: Employee,Contact Details,ඇමතුම් විස්තර
 DocType: C-Form,Received Date,ලැබී දිනය
@@ -4197,6 +4195,7 @@
 DocType: Pricing Rule,Price or Product Discount,මිල හෝ නිෂ්පාදන වට්ටම්
 apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.py,For row {0}: Enter planned qty,පේළි {0} සඳහා: සැලසුම්ගත qty ඇතුල් කරන්න
 DocType: Account,Income Account,ආදායම් ගිණුම
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Customer &gt; Customer Group &gt; Territory,පාරිභෝගික&gt; පාරිභෝගික කණ්ඩායම&gt; ප්‍රදේශය
 DocType: Payment Request,Amount in customer's currency,පාරිභෝගික මුදල් ප්රමාණය
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js,Delivery,සැපයුම්
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.py,Assigning Structures...,ව්‍යුහයන් පැවරීම ...
@@ -4243,7 +4242,6 @@
 DocType: HR Settings,Check Vacancies On Job Offer Creation,රැකියා දීමනා නිර්මාණය කිරීමේදී පුරප්පාඩු පරීක්ෂා කරන්න
 apps/erpnext/erpnext/utilities/user_progress.py,Go to Letterheads,ලිපි වලට යන්න
 DocType: Subscription,Cancel At End Of Period,කාලය අවසානයේ අවලංගු කරන්න
-apps/erpnext/erpnext/education/doctype/instructor/instructor.py,Please setup Instructor Naming System in Education &gt; Education Settings,කරුණාකර අධ්‍යාපනය&gt; අධ්‍යාපන සැකසුම් තුළ උපදේශක නම් කිරීමේ පද්ධතිය සකසන්න
 apps/erpnext/erpnext/hr/doctype/employee_promotion/employee_promotion.js,Property already added,දේපල දැනටමත් එකතු කර ඇත
 DocType: Item Supplier,Item Supplier,අයිතමය සැපයුම්කරු
 apps/erpnext/erpnext/public/js/controllers/transaction.js,Please enter Item Code to get batch no,කිසිදු කණ්ඩායම ලබා ගැනීමට අයිතමය සංග්රහයේ ඇතුලත් කරන්න
@@ -4526,6 +4524,7 @@
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.js,Warning: Material Requested Qty is less than Minimum Order Qty,අවවාදයයි: යවන ලද ඉල්ලන ද්රව්ය අවම සාමය යවන ලද වඩා අඩු වේ
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py,Account {0} is frozen,ගිණුම {0} කැටි වේ
 DocType: Quiz Question,Quiz Question,ප්‍රශ්නාවලිය
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Supplier &gt; Supplier Type,සැපයුම්කරු&gt; සැපයුම්කරු වර්ගය
 DocType: Company,Legal Entity / Subsidiary with a separate Chart of Accounts belonging to the Organization.,සංවිධානය සතු ගිණුම් වෙනම සටහන සමග නීතිමය ආයතනයක් / පාලිත.
 DocType: Payment Request,Mute Email,ගොළු විද්යුත්
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py,"Food, Beverage & Tobacco","ආහාර, බීම වර්ග සහ දුම්කොළ"
@@ -5034,7 +5033,6 @@
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py,Delivery warehouse required for stock item {0},කොටස් අයිතමය {0} සඳහා අවශ්ය සැපයුම් ගබඩා සංකීර්ණය
 DocType: Packing Slip,The gross weight of the package. Usually net weight + packaging material weight. (for print),ඇසුරුම් දළ බර. ශුද්ධ බර + ඇසුරුම් ද්රව්ය බර සාමාන්යයෙන්. (මුද්රිත)
 DocType: Assessment Plan,Program,වැඩසටහන
-apps/erpnext/erpnext/hr/doctype/employee/employee.py,Please setup Employee Naming System in Human Resource &gt; HR Settings,කරුණාකර සේවක නම් කිරීමේ පද්ධතිය මානව සම්පත්&gt; මානව සම්පත් සැකසුම් තුළ සකසන්න
 DocType: Accounts Settings,Users with this role are allowed to set frozen accounts and create / modify accounting entries against frozen accounts,මෙම භූමිකාව ඇති පරිශීලකයන්ට ශීත කළ ගිණුම් සකස් කිරීම හා නිර්මාණ / ශීත කළ ගිණුම් එරෙහිව ගිණුම් සටහන් ඇතුළත් කිරීම් වෙනස් කිරීමට අවසර ඇත
 ,Project Billing Summary,ව්‍යාපෘති බිල් කිරීමේ සාරාංශය
 DocType: Vital Signs,Cuts,කපා
@@ -5384,6 +5382,8 @@
 apps/erpnext/erpnext/accounts/doctype/monthly_distribution/monthly_distribution.py,Percentage Allocation should be equal to 100%,ප්රතිශතයක් වෙන් කිරීම 100% ක් සමාන විය යුතුයි
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js,Please select Posting Date before selecting Party,"කරුණාකර පක්ෂය තෝරා ගැනීමට පෙර ගිය තැන, දිනය තෝරා"
 apps/erpnext/erpnext/config/accounting.py,Payment Terms based on conditions,කොන්දේසි මත පදනම්ව ගෙවීම් නියමයන්
+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: Program Enrollment,School House,ස්කූල් හවුස්
 DocType: Serial No,Out of AMC,විදේශ මුදල් හුවමාරු කරන්නන් අතරින්
 DocType: Opportunity,Opportunity Amount,අවස්ථා ප්රමාණය
@@ -5585,6 +5585,7 @@
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py,Order/Quot %,නියෝගයක් / quot%
 apps/erpnext/erpnext/config/healthcare.py,Record Patient Vitals,රෝගීන්ගේ වාර්තා සටහන් කරන්න
 DocType: Fee Schedule,Institution,ආයතනය
+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: Asset,Partially Depreciated,අර්ධ වශයෙන් අවප්රමාණය
 DocType: Issue,Opening Time,විවෘත වේලාව
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py,From and To dates required,හා අවශ්ය දිනයන් සඳහා
@@ -5802,6 +5803,7 @@
 DocType: Quality Procedure Process,Link existing Quality Procedure.,පවතින තත්ත්ව ක්‍රියා පටිපාටිය සම්බන්ධ කරන්න.
 apps/erpnext/erpnext/config/hr.py,Loans,ණය
 DocType: Healthcare Service Unit,Healthcare Service Unit,සෞඛ්ය සේවා ඒකකය
+,Customer-wise Item Price,පාරිභෝගිකයා අනුව අයිතමයේ මිල
 apps/erpnext/erpnext/public/js/financial_statements.js,Cash Flow Statement,මුදල් ප්රවාහ ප්රකාශය
 apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.py,No material request created,කිසිදු ද්රව්යමය ඉල්ලීමක් නිර්මාණය කර නැත
 apps/erpnext/erpnext/hr/doctype/loan_application/loan_application.py,Loan Amount cannot exceed Maximum Loan Amount of {0},ණය මුදල {0} උපරිම ණය මුදල ඉක්මවා නො හැකි
@@ -6067,6 +6069,7 @@
 apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py,Opening Value,විවෘත කළ අගය
 DocType: Salary Component,Formula,සූත්රය
 apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py,Serial #,අනු #
+apps/erpnext/erpnext/hr/doctype/employee/employee.py,Please setup Employee Naming System in Human Resource &gt; HR Settings,කරුණාකර සේවක නම් කිරීමේ පද්ධතිය මානව සම්පත්&gt; මානව සම්පත් සැකසුම් තුළ සකසන්න
 DocType: Material Request Plan Item,Required Quantity,අවශ්‍ය ප්‍රමාණය
 DocType: Lab Test Template,Lab Test Template,පරීක්ෂණ පරීක්ෂණ ආකෘතිය
 apps/erpnext/erpnext/setup/doctype/company/company.py,Sales Account,විකුණුම් ගිණුම
@@ -6310,7 +6313,6 @@
 DocType: Request for Quotation Item,Project Name,ව්යාපෘතියේ නම
 apps/erpnext/erpnext/regional/italy/utils.py,Please set the Customer Address,කරුණාකර පාරිභෝගික ලිපිනය සකසන්න
 DocType: Customer,Mention if non-standard receivable account,සම්මත නොවන ලැබිය නම් සඳහන්
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Customer &gt; Customer Group &gt; Territory,පාරිභෝගික&gt; පාරිභෝගික කණ්ඩායම&gt; ප්‍රදේශය
 DocType: Bank,Plaid Access Token,ප්ලයිඩ් ප්‍රවේශ ටෝකනය
 apps/erpnext/erpnext/hr/doctype/employee_benefit_application/employee_benefit_application.py,Please add the remaining benefits {0} to any of the existing component,කරුණාකර දැනට ඇති සංරචකය සඳහා ඉතිරි ප්රතිලාභ {0} එකතු කරන්න
 DocType: Journal Entry Account,If Income or Expense,ආදායම් හෝ වියදම් නම්
@@ -6570,8 +6572,6 @@
 apps/erpnext/erpnext/buying/utils.py,Please enter quantity for Item {0},විෂය {0} සඳහා ප්රමාණය ඇතුලත් කරන්න
 DocType: Quality Procedure,Processes,ක්‍රියාවලි
 DocType: Shift Type,First Check-in and Last Check-out,පළමු පිරික්සුම සහ අවසන් පිරික්සුම
-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/regional/report/hsn_wise_summary_of_outward_supplies/hsn_wise_summary_of_outward_supplies.py,Total Taxable Amount,මුළු බදු මුදල
 DocType: Employee External Work History,Employee External Work History,සේවක විදේශ රැකියා ඉතිහාසය
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.py,Job card {0} created,රැකියා කාඩ්පත {0} නිර්මාණය කරන ලදි
@@ -6608,6 +6608,7 @@
 apps/erpnext/erpnext/accounts/doctype/payment_terms_template/payment_terms_template.py,Combined invoice portion must equal 100%,ඒකාබද්ධ ඉන්වොයිස් කොටස 100%
 DocType: Item Default,Default Expense Account,පෙරනිමි ගෙවීමේ ගිණුම්
 DocType: GST Account,CGST Account,CGST ගිණුම
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Item Code &gt; Item Group &gt; Brand,අයිතම කේතය&gt; අයිතම සමූහය&gt; වෙළඳ නාමය
 apps/erpnext/erpnext/education/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py,Student Email ID,ශිෂ්ය විද්යුත් හැඳුනුම්පත
 DocType: Employee,Notice (days),නිවේදනය (දින)
 DocType: POS Closing Voucher Invoices,POS Closing Voucher Invoices,POS අවසාන වවුචර් ඉන්වොයිසි
@@ -7243,6 +7244,7 @@
 DocType: Maintenance Visit,Maintenance Date,නඩත්තු දිනය
 DocType: Purchase Invoice Item,Rejected Serial No,ප්රතික්ෂේප අනු අංකය
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py,Year start date or end date is overlapping with {0}. To avoid please set company,වසරේ ආරම්භක දිනය හෝ අවසන් දිනය {0} සමග අතිච්ඡාදනය වේ. වැළකී සමාගම පිහිටුවා කරුණාකර
+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/selling/doctype/customer/customer.py,Please mention the Lead Name in Lead {0},Lead Lead හි ප්රධාන නාමය සඳහන් කරන්න. {0}
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py,Start date should be less than end date for Item {0},දිනය අයිතමය {0} සඳහා අවසාන දිනය වඩා අඩු විය යුතුය ආරම්භ
 DocType: Shift Type,Auto Attendance Settings,ස්වයංක්‍රීය පැමිණීමේ සැකසුම්
diff --git a/erpnext/translations/sk.csv b/erpnext/translations/sk.csv
index 369323a..25dd3bb 100644
--- a/erpnext/translations/sk.csv
+++ b/erpnext/translations/sk.csv
@@ -167,7 +167,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py,Accountant,Účtovník
 apps/erpnext/erpnext/stock/report/item_price_stock/item_price_stock.py,Selling Price List,Cenník predaja
 DocType: Patient,Tobacco Current Use,Súčasné používanie tabaku
-apps/erpnext/erpnext/stock/report/item_price_stock/item_price_stock.py,Selling Rate,Predajná sadzba
+apps/erpnext/erpnext/selling/report/customer_wise_item_price/customer_wise_item_price.py,Selling Rate,Predajná sadzba
 apps/erpnext/erpnext/erpnext_integrations/doctype/plaid_settings/plaid_settings.js,Please save your document before adding a new account,Pred pridaním nového účtu uložte dokument
 DocType: Cost Center,Stock User,Používateľ skladu
 DocType: Soil Analysis,(Ca+Mg)/K,(Ca + Mg) / K
@@ -204,7 +204,6 @@
 DocType: Packed Item,Parent Detail docname,Parent Detail docname
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py,"Reference: {0}, Item Code: {1} and Customer: {2}","Odkaz: {0}, Kód položky: {1} a zákazník: {2}"
 apps/erpnext/erpnext/accounts/report/consolidated_financial_statement/consolidated_financial_statement.py,{0} {1} is not present in the parent company,{0} {1} nie je v materskej spoločnosti
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Supplier &gt; Supplier Type,Dodávateľ&gt; Typ dodávateľa
 apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py,Trial Period End Date Cannot be before Trial Period Start Date,Dátum ukončenia skúšobného obdobia nemôže byť pred začiatkom skúšobného obdobia
 apps/erpnext/erpnext/utilities/user_progress.py,Kg,Kg
 DocType: Tax Withholding Category,Tax Withholding Category,Daňová kategória
@@ -318,6 +317,7 @@
 DocType: Quality Procedure Table,Responsible Individual,Zodpovedná osoba
 DocType: Naming Series,Prefix,Prefix
 apps/erpnext/erpnext/hr/notification/training_scheduled/training_scheduled.html,Event Location,Umiestnenie udalosti
+apps/erpnext/erpnext/selling/report/customer_wise_item_price/customer_wise_item_price.py,Available Stock,K dispozícii na sklade
 DocType: Asset Settings,Asset Settings,Nastavenia majetku
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py,Consumable,Spotrebný materiál
 DocType: Student,B-,B-
@@ -351,6 +351,7 @@
 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 \
 				Serial No.","Nie je možné zabezpečiť doručenie sériovým číslom, pretože je pridaná položka {0} s alebo bez dodávky."
+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/accounts/doctype/sales_invoice/sales_invoice.py,At least one mode of payment is required for POS invoice.,pre POS faktúru je nutná aspoň jeden spôsob platby.
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py,Batch no is required for batched item {0},Šarža č. Sa vyžaduje pre dávkovú položku {0}
 DocType: Bank Statement Transaction Invoice Item,Bank Statement Transaction Invoice Item,Položka faktúry transakcie na bankový účet
@@ -879,7 +880,6 @@
 DocType: Vital Signs,Blood Pressure (systolic),Krvný tlak (systolický)
 apps/erpnext/erpnext/controllers/buying_controller.py,{0} {1} is {2},{0} {1} je {2}
 DocType: Item Price,Valid Upto,Valid aľ
-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: Training Event,Workshop,Dielňa
 DocType: Supplier Scorecard Scoring Standing,Warn Purchase Orders,Upozornenie na nákupné objednávky
 apps/erpnext/erpnext/utilities/user_progress.py,List a few of your customers. They could be organizations or individuals.,"Vypíšte zopár svojich zákazníkov. Môžu to byť organizácie, ale aj jednotlivci."
@@ -1688,7 +1688,6 @@
 DocType: Item Barcode,Item Barcode,Položka Barcode
 DocType: Delivery Trip,In Transit,V preprave
 DocType: Woocommerce Settings,Endpoints,Endpoints
-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
 DocType: Shopping Cart Settings,Show Configure Button,Zobraziť tlačidlo Konfigurovať
 DocType: Quality Inspection Reading,Reading 6,Čtení 6
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js,Cannot {0} {1} {2} without any negative outstanding invoice,Nemožno {0} {1} {2} bez negatívnych vynikajúce faktúra
@@ -2052,6 +2051,7 @@
 DocType: Cheque Print Template,Payer Settings,nastavenie platcu
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js,No pending Material Requests found to link for the given items.,"Žiadne prebiehajúce žiadosti o materiál, z ktorých sa zistilo, že odkazujú na dané položky."
 apps/erpnext/erpnext/public/js/utils/party.js,Select company first,Najprv vyberte spoločnosť
+apps/erpnext/erpnext/accounts/general_ledger.py,Account: <b>{0}</b> is capital Work in progress and can not be updated by Journal Entry,Účet: <b>{0}</b> je kapitál Prebieha spracovanie a nedá sa aktualizovať zápisom do denníka
 apps/erpnext/erpnext/education/doctype/quiz/quiz.py,Compare List function takes on list arguments,Funkcia Porovnanie zoznamu preberie argumenty zoznamu
 DocType: Item Attribute Value,"This will be appended to the Item Code of the variant. For example, if your abbreviation is ""SM"", and the item code is ""T-SHIRT"", the item code of the variant will be ""T-SHIRT-SM""","To bude připojen na položku zákoníku varianty. Například, pokud vaše zkratka je ""SM"", a položka je kód ""T-SHIRT"", položka kód varianty bude ""T-SHIRT-SM"""
 DocType: Salary Slip,Net Pay (in words) will be visible once you save the Salary Slip.,"Čistá Pay (slovy) budou viditelné, jakmile uložíte výplatní pásce."
@@ -2238,6 +2238,7 @@
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js,Item 2,Položka 2
 DocType: Pricing Rule,Validate Applied Rule,Potvrdiť použité pravidlo
 DocType: QuickBooks Migrator,Authorization Endpoint,Koncový bod autorizácie
+DocType: Employee Onboarding,Notify users by email,Upozorniť používateľov e-mailom
 DocType: Travel Request,International,medzinárodný
 DocType: Training Event,Training Event,Training Event
 DocType: Item,Auto re-order,Auto re-order
@@ -2852,7 +2853,6 @@
 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
-DocType: Contract,Inactive,neaktívne
 apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.js,This will submit Salary Slips and create accrual Journal Entry. Do you want to proceed?,Týmto sa odošlú výplatné pásky a vytvorí sa účtovníctvo časového rozlíšenia. Chcete pokračovať?
 DocType: Purchase Invoice,Total Net Weight,Celková čistá hmotnosť
 DocType: Purchase Order,Order Confirmation No,Potvrdenie objednávky č
@@ -3135,7 +3135,6 @@
 apps/erpnext/erpnext/accounts/party.py,Billing currency must be equal to either default company's currency or party account currency,Mena fakturácie sa musí rovnať mene menovej jednotky alebo účtovnej parity
 DocType: Packing Slip,Indicates that the package is a part of this delivery (Only Draft),"Označuje, že balíček je součástí této dodávky (Pouze návrhu)"
 apps/erpnext/erpnext/accounts/report/customer_ledger_summary/customer_ledger_summary.py,Closing Balance,Konečný zostatok
-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}
 DocType: Soil Texture,Loam,hlina
 apps/erpnext/erpnext/controllers/accounts_controller.py,Row {0}: Due Date cannot be before posting date,Riadok {0}: dátum splatnosti nemôže byť pred dátumom odoslania
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py,Quantity for Item {0} must be less than {1},Množství k bodu {0} musí být menší než {1}
@@ -3665,7 +3664,6 @@
 DocType: Stock Settings,Raise Material Request when stock reaches re-order level,Zvýšit Materiál vyžádání při stock dosáhne úrovně re-order
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py,Full-time,Na plný úvazek
 DocType: Payroll Entry,Employees,zamestnanci
-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: Question,Single Correct Answer,Jedna správna odpoveď
 DocType: Employee,Contact Details,Kontaktné údaje
 DocType: C-Form,Received Date,Dátum prijatia
@@ -4300,6 +4298,7 @@
 DocType: Pricing Rule,Price or Product Discount,Cena alebo zľava produktu
 apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.py,For row {0}: Enter planned qty,Pre riadok {0}: Zadajte naplánované množstvo
 DocType: Account,Income Account,Účet příjmů
+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: Payment Request,Amount in customer's currency,Čiastka v mene zákazníka
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js,Delivery,Dodávka
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.py,Assigning Structures...,Priradenie štruktúr ...
@@ -4349,7 +4348,6 @@
 DocType: HR Settings,Check Vacancies On Job Offer Creation,Skontrolujte voľné pracovné miesta pri vytváraní pracovných ponúk
 apps/erpnext/erpnext/utilities/user_progress.py,Go to Letterheads,Prejdite na Letterheads
 DocType: Subscription,Cancel At End Of Period,Zrušiť na konci obdobia
-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/hr/doctype/employee_promotion/employee_promotion.js,Property already added,Vlastnosti už boli pridané
 DocType: Item Supplier,Item Supplier,Položka Dodavatel
 apps/erpnext/erpnext/public/js/controllers/transaction.js,Please enter Item Code to get batch no,"Prosím, zadejte kód položky se dostat dávku no"
@@ -4647,6 +4645,7 @@
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.js,Warning: Material Requested Qty is less than Minimum Order Qty,Upozornění: Materiál Požadované množství je menší než minimální objednávka Množství
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py,Account {0} is frozen,Účet {0} je zmrazen
 DocType: Quiz Question,Quiz Question,Kvízová otázka
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Supplier &gt; Supplier Type,Dodávateľ&gt; Typ dodávateľa
 DocType: Company,Legal Entity / Subsidiary with a separate Chart of Accounts belonging to the Organization.,"Právní subjekt / dceřiná společnost s oddělenou Graf účtů, které patří do organizace."
 DocType: Payment Request,Mute Email,Stíšiť email
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py,"Food, Beverage & Tobacco","Potraviny, nápoje a tabák"
@@ -5163,7 +5162,6 @@
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py,Delivery warehouse required for stock item {0},Dodávka sklad potrebný pre živočíšnu položku {0}
 DocType: Packing Slip,The gross weight of the package. Usually net weight + packaging material weight. (for print),Celková hmotnost balení. Obvykle se čistá hmotnost + obalového materiálu hmotnosti. (Pro tisk)
 DocType: Assessment Plan,Program,Program
-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: Accounts Settings,Users with this role are allowed to set frozen accounts and create / modify accounting entries against frozen accounts,Uživatelé s touto rolí se mohou nastavit na zmrazené účty a vytvořit / upravit účetní zápisy proti zmrazených účtů
 ,Project Billing Summary,Súhrn fakturácie projektu
 DocType: Vital Signs,Cuts,rezy
@@ -5414,6 +5412,7 @@
 apps/erpnext/erpnext/quality_management/doctype/quality_review/quality_review_list.js,No Action,Žiadna akcia
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js,Valuation type charges can not marked as Inclusive,Poplatky typu ocenenie môže nie je označený ako Inclusive
 DocType: POS Profile,Update Stock,Aktualizace skladem
+apps/erpnext/erpnext/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/stock/doctype/packing_slip/packing_slip.js,Different UOM for items will lead to incorrect (Total) Net Weight value. Make sure that Net Weight of each item is in the same UOM.,"Různé UOM položky povede k nesprávné (celkem) Čistá hmotnost hodnoty. Ujistěte se, že čistá hmotnost každé položky je ve stejném nerozpuštěných."
 DocType: Certification Application,Payment Details,Platobné údaje
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py,BOM Rate,BOM Rate
@@ -5519,6 +5518,8 @@
 apps/erpnext/erpnext/accounts/doctype/monthly_distribution/monthly_distribution.py,Percentage Allocation should be equal to 100%,Podíl alokace by měla být ve výši 100%
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js,Please select Posting Date before selecting Party,"Prosím, vyberte Dátum zverejnenia pred výberom Party"
 apps/erpnext/erpnext/config/accounting.py,Payment Terms based on conditions,Platobné podmienky založené na podmienkach
+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: Program Enrollment,School House,School House
 DocType: Serial No,Out of AMC,Out of AMC
 DocType: Opportunity,Opportunity Amount,Príležitostná suma
@@ -5722,6 +5723,7 @@
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py,Order/Quot %,Objednávka / kvóta%
 apps/erpnext/erpnext/config/healthcare.py,Record Patient Vitals,Zaznamenajte vitálne hodnoty pacienta
 DocType: Fee Schedule,Institution,inštitúcie
+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}
 DocType: Asset,Partially Depreciated,čiastočne odpíše
 DocType: Issue,Opening Time,Otevírací doba
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py,From and To dates required,Data OD a DO jsou vyžadována
@@ -5942,6 +5944,7 @@
 DocType: Quality Procedure Process,Link existing Quality Procedure.,Prepojiť existujúci postup kvality.
 apps/erpnext/erpnext/config/hr.py,Loans,pôžičky
 DocType: Healthcare Service Unit,Healthcare Service Unit,Útvar zdravotníckej služby
+,Customer-wise Item Price,Cena tovaru podľa priania zákazníka
 apps/erpnext/erpnext/public/js/financial_statements.js,Cash Flow Statement,Prehľad o peňažných tokoch
 apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.py,No material request created,Žiadna materiálová žiadosť nebola vytvorená
 apps/erpnext/erpnext/hr/doctype/loan_application/loan_application.py,Loan Amount cannot exceed Maximum Loan Amount of {0},Výška úveru nesmie prekročiť maximálnu úveru Suma {0}
@@ -6206,6 +6209,7 @@
 apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py,Opening Value,otvorenie Value
 DocType: Salary Component,Formula,vzorec
 apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py,Serial #,Serial #
+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: Material Request Plan Item,Required Quantity,Požadované množstvo
 DocType: Lab Test Template,Lab Test Template,Šablóna testu laboratória
 apps/erpnext/erpnext/accounts/doctype/accounting_period/accounting_period.py,Accounting Period overlaps with {0},Účtovné obdobie sa prekrýva s {0}
@@ -6457,7 +6461,6 @@
 DocType: Request for Quotation Item,Project Name,Názov projektu
 apps/erpnext/erpnext/regional/italy/utils.py,Please set the Customer Address,Nastavte adresu zákazníka
 DocType: Customer,Mention if non-standard receivable account,Zmienka v prípade neštandardnej pohľadávky účet
-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: Bank,Plaid Access Token,Plaid Access Token
 apps/erpnext/erpnext/hr/doctype/employee_benefit_application/employee_benefit_application.py,Please add the remaining benefits {0} to any of the existing component,Pridajte zvyšné výhody {0} k ľubovoľnému existujúcemu komponentu
 DocType: Journal Entry Account,If Income or Expense,Pokud je výnos nebo náklad
@@ -6721,8 +6724,6 @@
 apps/erpnext/erpnext/buying/utils.py,Please enter quantity for Item {0},Zadajte prosím množstvo pre Položku {0}
 DocType: Quality Procedure,Processes,Procesy
 DocType: Shift Type,First Check-in and Last Check-out,Prvé prihlásenie a posledné prihlásenie
-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/regional/report/hsn_wise_summary_of_outward_supplies/hsn_wise_summary_of_outward_supplies.py,Total Taxable Amount,Celková zdaniteľná suma
 DocType: Employee External Work History,Employee External Work History,Externá pracovná história zamestnanca
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.py,Job card {0} created,Vytvorila sa pracovná karta {0}
@@ -6759,6 +6760,7 @@
 apps/erpnext/erpnext/accounts/doctype/payment_terms_template/payment_terms_template.py,Combined invoice portion must equal 100%,Kombinovaná časť faktúry sa musí rovnať 100%
 DocType: Item Default,Default Expense Account,Výchozí výdajového účtu
 DocType: GST Account,CGST Account,CGST účet
+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/education/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py,Student Email ID,Študent ID e-mailu
 DocType: Employee,Notice (days),Oznámenie (dni)
 DocType: POS Closing Voucher Invoices,POS Closing Voucher Invoices,Faktúry POS uzatváracieho dokladu
@@ -7402,6 +7404,7 @@
 DocType: Maintenance Visit,Maintenance Date,Datum údržby
 DocType: Purchase Invoice Item,Rejected Serial No,Zamítnuto Serial No
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py,Year start date or end date is overlapping with {0}. To avoid please set company,Rok dátum začatia alebo ukončenia sa prekrýva s {0}. Aby sa zabránilo nastavte firmu
+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/selling/doctype/customer/customer.py,Please mention the Lead Name in Lead {0},Označte vedúci názov vo vedúcej {0}
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py,Start date should be less than end date for Item {0},Datum zahájení by měla být menší než konečné datum pro bod {0}
 DocType: Shift Type,Auto Attendance Settings,Nastavenia automatickej dochádzky
diff --git a/erpnext/translations/sl.csv b/erpnext/translations/sl.csv
index caced14..4b71fe0 100644
--- a/erpnext/translations/sl.csv
+++ b/erpnext/translations/sl.csv
@@ -168,7 +168,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py,Accountant,Računovodja
 apps/erpnext/erpnext/stock/report/item_price_stock/item_price_stock.py,Selling Price List,Prodajni cenik
 DocType: Patient,Tobacco Current Use,Trenutna uporaba tobaka
-apps/erpnext/erpnext/stock/report/item_price_stock/item_price_stock.py,Selling Rate,Prodajna cena
+apps/erpnext/erpnext/selling/report/customer_wise_item_price/customer_wise_item_price.py,Selling Rate,Prodajna cena
 apps/erpnext/erpnext/erpnext_integrations/doctype/plaid_settings/plaid_settings.js,Please save your document before adding a new account,"Prosimo, shranite dokument, preden dodate nov račun"
 DocType: Cost Center,Stock User,Stock Uporabnik
 DocType: Soil Analysis,(Ca+Mg)/K,(Ca+Mg)/K
@@ -205,7 +205,6 @@
 DocType: Packed Item,Parent Detail docname,Parent Detail docname
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py,"Reference: {0}, Item Code: {1} and Customer: {2}",Referenca: {0} Oznaka: {1} in stranke: {2}
 apps/erpnext/erpnext/accounts/report/consolidated_financial_statement/consolidated_financial_statement.py,{0} {1} is not present in the parent company,{0} {1} ni v matični družbi
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Supplier &gt; Supplier Type,Dobavitelj&gt; Vrsta dobavitelja
 apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py,Trial Period End Date Cannot be before Trial Period Start Date,Datum konca poskusnega obdobja ne more biti pred začetkom začetnega poskusnega obdobja
 apps/erpnext/erpnext/utilities/user_progress.py,Kg,Kg
 DocType: Tax Withholding Category,Tax Withholding Category,Kategorija pobiranja davkov
@@ -319,6 +318,7 @@
 DocType: Quality Procedure Table,Responsible Individual,Odgovorni posameznik
 DocType: Naming Series,Prefix,Predpona
 apps/erpnext/erpnext/hr/notification/training_scheduled/training_scheduled.html,Event Location,Lokacija dogodka
+apps/erpnext/erpnext/selling/report/customer_wise_item_price/customer_wise_item_price.py,Available Stock,Na zalogi
 DocType: Asset Settings,Asset Settings,Nastavitve sredstva
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py,Consumable,Potrošni
 DocType: Student,B-,B-
@@ -352,6 +352,7 @@
 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 \
 				Serial No.","Dostava ni mogoče zagotoviti s serijsko številko, ker se \ Item {0} doda z in brez Zagotoviti dostavo z \ Serial No."
+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 izobraževanja
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py,At least one mode of payment is required for POS invoice.,za POS računa je potreben vsaj en način plačila.
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py,Batch no is required for batched item {0},Za serijsko postavko {0} ni potrebna nobena serija
 DocType: Bank Statement Transaction Invoice Item,Bank Statement Transaction Invoice Item,Postavka računa za transakcijo banke
@@ -880,7 +881,6 @@
 DocType: Vital Signs,Blood Pressure (systolic),Krvni tlak (sistolični)
 apps/erpnext/erpnext/controllers/buying_controller.py,{0} {1} is {2},{0} {1} je {2}
 DocType: Item Price,Valid Upto,Valid Stanuje
-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: Training Event,Workshop,Delavnica
 DocType: Supplier Scorecard Scoring Standing,Warn Purchase Orders,Opozori na naročila za nakup
 apps/erpnext/erpnext/utilities/user_progress.py,List a few of your customers. They could be organizations or individuals.,Naštejte nekaj vaših strank. Ti bi se lahko organizacije ali posamezniki.
@@ -1671,7 +1671,6 @@
 DocType: Item Barcode,Item Barcode,Postavka Barcode
 DocType: Delivery Trip,In Transit,V tranzitu
 DocType: Woocommerce Settings,Endpoints,Končne točke
-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
 DocType: Shopping Cart Settings,Show Configure Button,Pokaži gumb Konfiguriraj
 DocType: Quality Inspection Reading,Reading 6,Branje 6
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js,Cannot {0} {1} {2} without any negative outstanding invoice,"Ne more {0} {1} {2}, brez kakršne koli negativne izjemno račun"
@@ -2034,6 +2033,7 @@
 DocType: Cheque Print Template,Payer Settings,Nastavitve plačnik
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js,No pending Material Requests found to link for the given items.,"Nobenih čakajočih materialnih zahtevkov, za katere je bilo ugotovljeno, da so povezani za določene predmete."
 apps/erpnext/erpnext/public/js/utils/party.js,Select company first,Najprej izberite podjetje
+apps/erpnext/erpnext/accounts/general_ledger.py,Account: <b>{0}</b> is capital Work in progress and can not be updated by Journal Entry,Račun: <b>{0}</b> je kapital Delo v teku in ga vnos v časopis ne more posodobiti
 apps/erpnext/erpnext/education/doctype/quiz/quiz.py,Compare List function takes on list arguments,Funkcija Primerjanje seznama prevzame argumente seznama
 DocType: Item Attribute Value,"This will be appended to the Item Code of the variant. For example, if your abbreviation is ""SM"", and the item code is ""T-SHIRT"", the item code of the variant will be ""T-SHIRT-SM""","To bo dodan Točka Kodeksa variante. Na primer, če je vaša kratica je &quot;SM&quot;, in oznaka postavka je &quot;T-shirt&quot;, postavka koda varianto bo &quot;T-SHIRT-SM&quot;"
 DocType: Salary Slip,Net Pay (in words) will be visible once you save the Salary Slip.,"Neto Pay (z besedami), bo viden, ko boste shranite plačilnega lista."
@@ -2220,6 +2220,7 @@
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js,Item 2,Postavka 2
 DocType: Pricing Rule,Validate Applied Rule,Preverjanje veljavnega pravila
 DocType: QuickBooks Migrator,Authorization Endpoint,Končna točka avtorizacije
+DocType: Employee Onboarding,Notify users by email,Uporabnike obvestite po e-pošti
 DocType: Travel Request,International,Mednarodni
 DocType: Training Event,Training Event,Dogodek usposabljanje
 DocType: Item,Auto re-order,Auto re-order
@@ -2833,7 +2834,6 @@
 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
-DocType: Contract,Inactive,Neaktivno
 apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.js,This will submit Salary Slips and create accrual Journal Entry. Do you want to proceed?,To bo poslalo plačne liste in ustvarilo časovni razpored poročanja. Želite nadaljevati?
 DocType: Purchase Invoice,Total Net Weight,Skupna neto teža
 DocType: Purchase Order,Order Confirmation No,Potrditev št
@@ -3115,7 +3115,6 @@
 apps/erpnext/erpnext/accounts/party.py,Billing currency must be equal to either default company's currency or party account currency,Valuta za obračun mora biti enaka valuti podjetja ali valuti stranke
 DocType: Packing Slip,Indicates that the package is a part of this delivery (Only Draft),"Kaže, da je paket del tega dostave (samo osnutka)"
 apps/erpnext/erpnext/accounts/report/customer_ledger_summary/customer_ledger_summary.py,Closing Balance,Zaključni saldo
-apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.py,UOM Conversion factor ({0} -&gt; {1}) not found for item: {2},Faktor konverzije za UOM ({0} -&gt; {1}) za element: {2}
 DocType: Soil Texture,Loam,Loam
 apps/erpnext/erpnext/controllers/accounts_controller.py,Row {0}: Due Date cannot be before posting date,Vrstica {0}: Datum roka ne more biti pred datumom objavljanja
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py,Quantity for Item {0} must be less than {1},Količina za postavko {0} sme biti manjša od {1}
@@ -3643,7 +3642,6 @@
 DocType: Stock Settings,Raise Material Request when stock reaches re-order level,Dvignite Material Zahtevaj ko stock doseže stopnjo ponovnega naročila
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py,Full-time,Polni delovni čas
 DocType: Payroll Entry,Employees,zaposleni
-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: Question,Single Correct Answer,Enotni pravilen odgovor
 DocType: Employee,Contact Details,Kontaktni podatki
 DocType: C-Form,Received Date,Prejela Datum
@@ -4258,6 +4256,7 @@
 DocType: Pricing Rule,Price or Product Discount,Cena ali popust na izdelke
 apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.py,For row {0}: Enter planned qty,Za vrstico {0}: vnesite načrtovani qty
 DocType: Account,Income Account,Prihodki račun
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Customer &gt; Customer Group &gt; Territory,Stranka&gt; Skupina kupcev&gt; Ozemlje
 DocType: Payment Request,Amount in customer's currency,Znesek v valuti stranke
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js,Delivery,Dostava
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.py,Assigning Structures...,Dodeljujem strukture...
@@ -4307,7 +4306,6 @@
 DocType: HR Settings,Check Vacancies On Job Offer Creation,Preverite prosta delovna mesta pri ustvarjanju ponudbe delovnih mest
 apps/erpnext/erpnext/utilities/user_progress.py,Go to Letterheads,Pojdite v Letterheads
 DocType: Subscription,Cancel At End Of Period,Prekliči ob koncu obdobja
-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/hr/doctype/employee_promotion/employee_promotion.js,Property already added,Lastnost že dodana
 DocType: Item Supplier,Item Supplier,Postavka Dobavitelj
 apps/erpnext/erpnext/public/js/controllers/transaction.js,Please enter Item Code to get batch no,Vnesite Koda dobiti serijo no
@@ -4593,6 +4591,7 @@
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.js,Warning: Material Requested Qty is less than Minimum Order Qty,"Opozorilo: Material Zahtevana Količina je manj kot minimalna, da Kol"
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py,Account {0} is frozen,Račun {0} je zamrznjen
 DocType: Quiz Question,Quiz Question,Vprašanje za kviz
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Supplier &gt; Supplier Type,Dobavitelj&gt; Vrsta dobavitelja
 DocType: Company,Legal Entity / Subsidiary with a separate Chart of Accounts belonging to the Organization.,Pravna oseba / Hčerinska družba z ločenim računom ki pripada organizaciji.
 DocType: Payment Request,Mute Email,Mute Email
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py,"Food, Beverage & Tobacco","Hrana, pijača, tobak"
@@ -5107,7 +5106,6 @@
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py,Delivery warehouse required for stock item {0},Dostava skladišče potreben za postavko parka {0}
 DocType: Packing Slip,The gross weight of the package. Usually net weight + packaging material weight. (for print),Bruto teža paketa. Ponavadi neto teža + embalaža teže. (za tisk)
 DocType: Assessment Plan,Program,Program
-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: Accounts Settings,Users with this role are allowed to set frozen accounts and create / modify accounting entries against frozen accounts,Uporabniki s to vlogo dovoljeno postaviti na zamrznjene račune in ustvariti / spreminjanje vknjižbe zoper zamrznjenih računih
 ,Project Billing Summary,Povzetek obračunavanja za projekt
 DocType: Vital Signs,Cuts,Kosi
@@ -5357,6 +5355,7 @@
 apps/erpnext/erpnext/quality_management/doctype/quality_review/quality_review_list.js,No Action,Brez akcije
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js,Valuation type charges can not marked as Inclusive,Stroški Tip vrednotenje ni mogoče označiti kot Inclusive
 DocType: POS Profile,Update Stock,Posodobi zalogo
+apps/erpnext/erpnext/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/stock/doctype/packing_slip/packing_slip.js,Different UOM for items will lead to incorrect (Total) Net Weight value. Make sure that Net Weight of each item is in the same UOM.,"Drugačna UOM za artikle bo privedlo do napačne (skupno) Neto teža vrednosti. Prepričajte se, da je neto teža vsake postavke v istem UOM."
 DocType: Certification Application,Payment Details,Podatki o plačilu
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py,BOM Rate,BOM Rate
@@ -5462,6 +5461,8 @@
 apps/erpnext/erpnext/accounts/doctype/monthly_distribution/monthly_distribution.py,Percentage Allocation should be equal to 100%,Odstotek dodelitve mora biti enaka 100%
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js,Please select Posting Date before selecting Party,Izberite datum objave pred izbiro stranko
 apps/erpnext/erpnext/config/accounting.py,Payment Terms based on conditions,Plačilni pogoji glede na pogoje
+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: Program Enrollment,School House,šola House
 DocType: Serial No,Out of AMC,Od AMC
 DocType: Opportunity,Opportunity Amount,Znesek priložnosti
@@ -5665,6 +5666,7 @@
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py,Order/Quot %,Naročilo / quot%
 apps/erpnext/erpnext/config/healthcare.py,Record Patient Vitals,Zapišite bolnike vitale
 DocType: Fee Schedule,Institution,ustanova
+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}
 DocType: Asset,Partially Depreciated,delno amortiziranih
 DocType: Issue,Opening Time,Otvoritev čas
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py,From and To dates required,Od in Do datumov zahtevanih
@@ -5884,6 +5886,7 @@
 DocType: Quality Procedure Process,Link existing Quality Procedure.,Povezati obstoječi postopek kakovosti.
 apps/erpnext/erpnext/config/hr.py,Loans,Posojila
 DocType: Healthcare Service Unit,Healthcare Service Unit,Enota za zdravstveno varstvo
+,Customer-wise Item Price,Cena izdelka za kupce
 apps/erpnext/erpnext/public/js/financial_statements.js,Cash Flow Statement,Izkaz denarnih tokov
 apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.py,No material request created,Ni ustvarjeno nobeno materialno zahtevo
 apps/erpnext/erpnext/hr/doctype/loan_application/loan_application.py,Loan Amount cannot exceed Maximum Loan Amount of {0},Kredita vrednosti ne sme preseči najvišji možen kredit znesku {0}
@@ -6150,6 +6153,7 @@
 apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py,Opening Value,Otvoritev Vrednost
 DocType: Salary Component,Formula,Formula
 apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py,Serial #,Serial #
+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: Material Request Plan Item,Required Quantity,Zahtevana količina
 DocType: Lab Test Template,Lab Test Template,Lab Test Template
 apps/erpnext/erpnext/accounts/doctype/accounting_period/accounting_period.py,Accounting Period overlaps with {0},Računovodsko obdobje se prekriva z {0}
@@ -6400,7 +6404,6 @@
 DocType: Request for Quotation Item,Project Name,Ime projekta
 apps/erpnext/erpnext/regional/italy/utils.py,Please set the Customer Address,"Prosimo, nastavite naslov stranke"
 DocType: Customer,Mention if non-standard receivable account,Omemba če nestandardno terjatve račun
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Customer &gt; Customer Group &gt; Territory,Stranka&gt; Skupina kupcev&gt; Ozemlje
 DocType: Bank,Plaid Access Token,Plaid Access Token
 apps/erpnext/erpnext/hr/doctype/employee_benefit_application/employee_benefit_application.py,Please add the remaining benefits {0} to any of the existing component,"Prosimo, dodajte preostale ugodnosti {0} v katero koli obstoječo komponento"
 DocType: Journal Entry Account,If Income or Expense,Če prihodek ali odhodek
@@ -6664,8 +6667,6 @@
 apps/erpnext/erpnext/buying/utils.py,Please enter quantity for Item {0},Vnesite količino za postavko {0}
 DocType: Quality Procedure,Processes,Procesi
 DocType: Shift Type,First Check-in and Last Check-out,Prva prijava in Zadnja odjava
-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/regional/report/hsn_wise_summary_of_outward_supplies/hsn_wise_summary_of_outward_supplies.py,Total Taxable Amount,Skupaj obdavčljiv znesek
 DocType: Employee External Work History,Employee External Work History,Delavec Zunanji Delo Zgodovina
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.py,Job card {0} created,Kartica za delo {0} je bila ustvarjena
@@ -6702,6 +6703,7 @@
 apps/erpnext/erpnext/accounts/doctype/payment_terms_template/payment_terms_template.py,Combined invoice portion must equal 100%,Kombinirani del na računu mora biti enak 100%
 DocType: Item Default,Default Expense Account,Privzeto Expense račun
 DocType: GST Account,CGST Account,Račun CGST
+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/education/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py,Student Email ID,Študent Email ID
 DocType: Employee,Notice (days),Obvestilo (dni)
 DocType: POS Closing Voucher Invoices,POS Closing Voucher Invoices,POS računi z zaprtimi računi
@@ -7345,6 +7347,7 @@
 DocType: Maintenance Visit,Maintenance Date,Vzdrževanje Datum
 DocType: Purchase Invoice Item,Rejected Serial No,Zavrnjeno Zaporedna številka
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py,Year start date or end date is overlapping with {0}. To avoid please set company,"Leto datum začetka oziroma prenehanja se prekrivajo z {0}. Da bi se izognili prosim, da podjetje"
+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/selling/doctype/customer/customer.py,Please mention the Lead Name in Lead {0},"Prosimo, navedite vodilno ime v vodniku {0}"
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py,Start date should be less than end date for Item {0},Začetni datum mora biti manjša od končnega datuma za postavko {0}
 DocType: Shift Type,Auto Attendance Settings,Nastavitve samodejne udeležbe
diff --git a/erpnext/translations/sq.csv b/erpnext/translations/sq.csv
index 085be3b..21031c6 100644
--- a/erpnext/translations/sq.csv
+++ b/erpnext/translations/sq.csv
@@ -166,7 +166,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py,Accountant,Llogaritar
 apps/erpnext/erpnext/stock/report/item_price_stock/item_price_stock.py,Selling Price List,Lista e Çmimeve të Shitjes
 DocType: Patient,Tobacco Current Use,Përdorimi aktual i duhanit
-apps/erpnext/erpnext/stock/report/item_price_stock/item_price_stock.py,Selling Rate,Shitja e normës
+apps/erpnext/erpnext/selling/report/customer_wise_item_price/customer_wise_item_price.py,Selling Rate,Shitja e normës
 apps/erpnext/erpnext/erpnext_integrations/doctype/plaid_settings/plaid_settings.js,Please save your document before adding a new account,Ju lutemi ruani dokumentin tuaj përpara se të shtoni një llogari të re
 DocType: Cost Center,Stock User,Stock User
 DocType: Soil Analysis,(Ca+Mg)/K,(Ca + Mg) / K
@@ -202,7 +202,6 @@
 DocType: Packed Item,Parent Detail docname,Docname prind Detail
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py,"Reference: {0}, Item Code: {1} and Customer: {2}",Referenca: {0} Artikull Code: {1} dhe klientit: {2}
 apps/erpnext/erpnext/accounts/report/consolidated_financial_statement/consolidated_financial_statement.py,{0} {1} is not present in the parent company,{0} {1} nuk është i pranishëm në kompaninë mëmë
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Supplier &gt; Supplier Type,Furnizuesi&gt; Lloji i furnizuesit
 apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py,Trial Period End Date Cannot be before Trial Period Start Date,Data e përfundimit të periudhës së gjykimit nuk mund të jetë përpara datës së fillimit të periudhës së gjykimit
 apps/erpnext/erpnext/utilities/user_progress.py,Kg,Kg
 DocType: Tax Withholding Category,Tax Withholding Category,Kategori e Mbajtjes së Tatimit
@@ -315,6 +314,7 @@
 DocType: Quality Procedure Table,Responsible Individual,Individ i përgjegjshëm
 DocType: Naming Series,Prefix,Parashtesë
 apps/erpnext/erpnext/hr/notification/training_scheduled/training_scheduled.html,Event Location,Vendi i ngjarjes
+apps/erpnext/erpnext/selling/report/customer_wise_item_price/customer_wise_item_price.py,Available Stock,Stoku i disponueshëm
 DocType: Asset Settings,Asset Settings,Cilësimet e Aseteve
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py,Consumable,Harxhuese
 DocType: Student,B-,B-
@@ -348,6 +348,7 @@
 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 \
 				Serial No.",Nuk mund të garantojë shpërndarjen nga Serial No si \ Item {0} shtohet me dhe pa sigurimin e dorëzimit nga \ Serial No.
+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/accounts/doctype/sales_invoice/sales_invoice.py,At least one mode of payment is required for POS invoice.,Të paktën një mënyra e pagesës është e nevojshme për POS faturë.
 DocType: Bank Statement Transaction Invoice Item,Bank Statement Transaction Invoice Item,Çështja e faturës së transaksionit të bankës
 DocType: Salary Detail,Tax on flexible benefit,Tatimi mbi përfitimet fleksibël
@@ -870,7 +871,6 @@
 DocType: Vital Signs,Blood Pressure (systolic),Presioni i gjakut (systolic)
 apps/erpnext/erpnext/controllers/buying_controller.py,{0} {1} is {2},{0} {1} është {2}
 DocType: Item Price,Valid Upto,Valid Upto
-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: Training Event,Workshop,punishte
 DocType: Supplier Scorecard Scoring Standing,Warn Purchase Orders,Paralajmëroni Urdhërat e Blerjes
 apps/erpnext/erpnext/utilities/user_progress.py,List a few of your customers. They could be organizations or individuals.,Lista disa nga klientët tuaj. Ata mund të jenë organizata ose individë.
@@ -1651,7 +1651,6 @@
 DocType: Item Barcode,Item Barcode,Item Barkodi
 DocType: Delivery Trip,In Transit,Në tranzit
 DocType: Woocommerce Settings,Endpoints,endpoints
-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
 DocType: Shopping Cart Settings,Show Configure Button,Shfaq butonin e konfigurimit
 DocType: Quality Inspection Reading,Reading 6,Leximi 6
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js,Cannot {0} {1} {2} without any negative outstanding invoice,"Nuk mund {0} {1} {2}, pa asnjë faturë negative shquar"
@@ -2013,6 +2012,7 @@
 DocType: Cheque Print Template,Payer Settings,Cilësimet paguesit
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js,No pending Material Requests found to link for the given items.,Nuk ka kërkesa materiale në pritje që lidhen për artikujt e dhënë.
 apps/erpnext/erpnext/public/js/utils/party.js,Select company first,Zgjidhni kompaninë e parë
+apps/erpnext/erpnext/accounts/general_ledger.py,Account: <b>{0}</b> is capital Work in progress and can not be updated by Journal Entry,Llogaria: <b>{0}</b> është kapital Puna në zhvillim e sipër dhe nuk mund të azhurnohet nga Journal Entry
 apps/erpnext/erpnext/education/doctype/quiz/quiz.py,Compare List function takes on list arguments,Funksioni i krahasimit të listës merr argumentet e listës
 DocType: Item Attribute Value,"This will be appended to the Item Code of the variant. For example, if your abbreviation is ""SM"", and the item code is ""T-SHIRT"", the item code of the variant will be ""T-SHIRT-SM""","Kjo do t&#39;i bashkëngjitet Kodit Pika e variant. Për shembull, në qoftë se shkurtim juaj është &quot;SM&quot;, dhe kodin pika është &quot;T-shirt&quot;, kodi pika e variantit do të jetë &quot;T-shirt-SM&quot;"
 DocType: Salary Slip,Net Pay (in words) will be visible once you save the Salary Slip.,Neto Pay (me fjalë) do të jetë i dukshëm një herë ju ruani gabim pagave.
@@ -2198,6 +2198,7 @@
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js,Item 2,Item 2
 DocType: Pricing Rule,Validate Applied Rule,Vleresoni rregullin e aplikuar
 DocType: QuickBooks Migrator,Authorization Endpoint,Përfundimi i autorizimit
+DocType: Employee Onboarding,Notify users by email,Njoftoni përdoruesit me email
 DocType: Travel Request,International,ndërkombëtar
 DocType: Training Event,Training Event,Event Training
 DocType: Item,Auto re-order,Auto ri-qëllim
@@ -2802,7 +2803,6 @@
 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
-DocType: Contract,Inactive,joaktiv
 apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.js,This will submit Salary Slips and create accrual Journal Entry. Do you want to proceed?,Kjo do të paraqesë Slipin e Pagave dhe do të krijojë regjistrimin e përhershëm të ditarit. A doni të vazhdoni?
 DocType: Purchase Invoice,Total Net Weight,Pesha totale neto
 DocType: Purchase Order,Order Confirmation No,Konfirmimi i Urdhrit Nr
@@ -3605,7 +3605,6 @@
 DocType: Stock Settings,Raise Material Request when stock reaches re-order level,Ngritja materiale Kërkesë kur bursës arrin nivel të ri-rendit
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py,Full-time,Me kohë të plotë
 DocType: Payroll Entry,Employees,punonjësit
-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: Question,Single Correct Answer,Përgjigje e saktë e vetme
 DocType: Employee,Contact Details,Detajet Kontakt
 DocType: C-Form,Received Date,Data e marra
@@ -4215,6 +4214,7 @@
 DocType: Pricing Rule,Price or Product Discount,Pricemimi ose zbritja e produkteve
 apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.py,For row {0}: Enter planned qty,Për rresht {0}: Shkruani Qty planifikuar
 DocType: Account,Income Account,Llogaria ardhurat
+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: Payment Request,Amount in customer's currency,Shuma në monedhë të klientit
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js,Delivery,Ofrimit të
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.py,Assigning Structures...,Caktimi i strukturave ...
@@ -4261,7 +4261,6 @@
 DocType: HR Settings,Check Vacancies On Job Offer Creation,Kontrolloni vendet e lira të punës për krijimin e ofertës për punë
 apps/erpnext/erpnext/utilities/user_progress.py,Go to Letterheads,Shkoni te Letrat me Letër
 DocType: Subscription,Cancel At End Of Period,Anulo në fund të periudhës
-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/hr/doctype/employee_promotion/employee_promotion.js,Property already added,Prona tashmë është shtuar
 DocType: Item Supplier,Item Supplier,Item Furnizuesi
 apps/erpnext/erpnext/public/js/controllers/transaction.js,Please enter Item Code to get batch no,Ju lutemi shkruani Kodin artikull për të marrë grumbull asnjë
@@ -4543,6 +4542,7 @@
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.js,Warning: Material Requested Qty is less than Minimum Order Qty,Warning: Materiali kërkuar Qty është më pak se minimale Rendit Qty
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py,Account {0} is frozen,Llogaria {0} është ngrirë
 DocType: Quiz Question,Quiz Question,Pyetje kuizi
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Supplier &gt; Supplier Type,Furnizuesi&gt; Lloji i furnizuesit
 DocType: Company,Legal Entity / Subsidiary with a separate Chart of Accounts belonging to the Organization.,Personit juridik / subsidiare me një tabelë të veçantë e llogarive i përkasin Organizatës.
 DocType: Payment Request,Mute Email,Mute Email
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py,"Food, Beverage & Tobacco","Ushqim, Pije &amp; Duhani"
@@ -5054,7 +5054,6 @@
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py,Delivery warehouse required for stock item {0},Depo ofrimit të nevojshme për pikën e aksioneve {0}
 DocType: Packing Slip,The gross weight of the package. Usually net weight + packaging material weight. (for print),Pesha bruto e paketës. Zakonisht pesha neto + paketimin pesha materiale. (Për shtyp)
 DocType: Assessment Plan,Program,program
-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: Accounts Settings,Users with this role are allowed to set frozen accounts and create / modify accounting entries against frozen accounts,Përdoruesit me këtë rol janë të lejuara për të ngritur llogaritë ngrirë dhe për të krijuar / modifikuar shënimet e kontabilitetit kundrejt llogarive të ngrira
 ,Project Billing Summary,Përmbledhja e faturimit të projektit
 DocType: Vital Signs,Cuts,Cuts
@@ -5299,6 +5298,7 @@
 apps/erpnext/erpnext/quality_management/doctype/quality_review/quality_review_list.js,No Action,Asnjë veprim
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js,Valuation type charges can not marked as Inclusive,Akuzat lloj vlerësimi nuk mund të shënuar si gjithëpërfshirës
 DocType: POS Profile,Update Stock,Update Stock
+apps/erpnext/erpnext/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/stock/doctype/packing_slip/packing_slip.js,Different UOM for items will lead to incorrect (Total) Net Weight value. Make sure that Net Weight of each item is in the same UOM.,UOM ndryshme për sendet do të çojë në të gabuar (Total) vlerën neto Pesha. Sigurohuni që pesha neto e çdo send është në të njëjtën UOM.
 DocType: Certification Application,Payment Details,Detajet e pagesës
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py,BOM Rate,Bom Rate
@@ -5401,6 +5401,8 @@
 apps/erpnext/erpnext/accounts/doctype/monthly_distribution/monthly_distribution.py,Percentage Allocation should be equal to 100%,Alokimi përqindje duhet të jetë e barabartë me 100%
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js,Please select Posting Date before selecting Party,"Ju lutem, përzgjidhni datën e postimit para se të zgjedhur Partinë"
 apps/erpnext/erpnext/config/accounting.py,Payment Terms based on conditions,Kushtet e pagesës bazuar në kushtet
+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: Program Enrollment,School House,School House
 DocType: Serial No,Out of AMC,Nga AMC
 DocType: Opportunity,Opportunity Amount,Shuma e Mundësive
@@ -5808,10 +5810,12 @@
 apps/erpnext/erpnext/accounts/doctype/exchange_rate_revaluation/exchange_rate_revaluation.py,Please set Unrealized Exchange Gain/Loss Account in Company {0},Ju lutemi përcaktoni Llogarinë e Realizuar të Fitimit / Shpërdorimit në Shoqëri {0}
 apps/erpnext/erpnext/utilities/user_progress.py,"Add users to your organization, other than yourself.","Shtojini përdoruesit në organizatën tuaj, përveç vetes."
 DocType: Customer Group,Customer Group Name,Emri Grupi Klientit
+apps/erpnext/erpnext/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}),Rreshti {0}: Sasia nuk është e disponueshme për {4} në depo {1} në kohën e postimit të hyrjes ({2} {3})
 apps/erpnext/erpnext/public/js/pos/pos.html,No Customers yet!,Nuk ka Konsumatorët akoma!
 DocType: Quality Procedure Process,Link existing Quality Procedure.,Lidh procedurën ekzistuese të cilësisë.
 apps/erpnext/erpnext/config/hr.py,Loans,Loans
 DocType: Healthcare Service Unit,Healthcare Service Unit,Njësia e Shëndetit
+,Customer-wise Item Price,Pricemimi i artikullit të mençur nga klienti
 apps/erpnext/erpnext/public/js/financial_statements.js,Cash Flow Statement,Pasqyra Cash Flow
 apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.py,No material request created,Asnjë kërkesë materiale nuk është krijuar
 apps/erpnext/erpnext/hr/doctype/loan_application/loan_application.py,Loan Amount cannot exceed Maximum Loan Amount of {0},Sasia huaja nuk mund të kalojë sasi maksimale huazimin e {0}
@@ -6073,6 +6077,7 @@
 apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py,Opening Value,Vlera e hapjes
 DocType: Salary Component,Formula,formulë
 apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py,Serial #,Serial #
+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: Material Request Plan Item,Required Quantity,Sasia e kërkuar
 DocType: Lab Test Template,Lab Test Template,Modeli i testimit të laboratorit
 apps/erpnext/erpnext/setup/doctype/company/company.py,Sales Account,Llogaria e Shitjes
@@ -6316,7 +6321,6 @@
 DocType: Request for Quotation Item,Project Name,Emri i Projektit
 apps/erpnext/erpnext/regional/italy/utils.py,Please set the Customer Address,Ju lutemi vendosni Adresën e Konsumatorit
 DocType: Customer,Mention if non-standard receivable account,Përmend në qoftë se jo-standarde llogari të arkëtueshme
-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: Bank,Plaid Access Token,Shenjë e hyrjes në pllakë
 apps/erpnext/erpnext/hr/doctype/employee_benefit_application/employee_benefit_application.py,Please add the remaining benefits {0} to any of the existing component,Ju lutemi shtoni përfitimet e mbetura {0} në ndonjë nga përbërësit ekzistues
 DocType: Journal Entry Account,If Income or Expense,Nëse të ardhura ose shpenzime
@@ -6576,8 +6580,6 @@
 apps/erpnext/erpnext/buying/utils.py,Please enter quantity for Item {0},Ju lutemi shkruani sasine e artikullit {0}
 DocType: Quality Procedure,Processes,proceset
 DocType: Shift Type,First Check-in and Last Check-out,Kontrolli i parë dhe check-out i fundit
-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/regional/report/hsn_wise_summary_of_outward_supplies/hsn_wise_summary_of_outward_supplies.py,Total Taxable Amount,Shuma Totale e Tatueshme
 DocType: Employee External Work History,Employee External Work History,Punonjës historia e jashtme
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.py,Job card {0} created,Kartë të punës {0} është krijuar
@@ -6613,6 +6615,7 @@
 apps/erpnext/erpnext/accounts/doctype/payment_terms_template/payment_terms_template.py,Combined invoice portion must equal 100%,Pjesa e kombinuar e faturës duhet të jetë e barabartë me 100%
 DocType: Item Default,Default Expense Account,Llogaria e albumit shpenzimeve
 DocType: GST Account,CGST Account,Llogaria CGST
+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/education/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py,Student Email ID,Student Email ID
 DocType: Employee,Notice (days),Njoftim (ditë)
 DocType: POS Closing Voucher Invoices,POS Closing Voucher Invoices,Faturat e mbylljes së kuponit të POS
@@ -7247,6 +7250,7 @@
 DocType: Maintenance Visit,Maintenance Date,Mirëmbajtja Data
 DocType: Purchase Invoice Item,Rejected Serial No,Refuzuar Nuk Serial
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py,Year start date or end date is overlapping with {0}. To avoid please set company,Viti data e fillimit ose data fundi mbivendosje me {0}. Për të shmangur ju lutem kompaninë vendosur
+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/selling/doctype/customer/customer.py,Please mention the Lead Name in Lead {0},Ju lutemi të përmendni Emrin Lead në Lead {0}
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py,Start date should be less than end date for Item {0},Data e fillimit duhet të jetë më pak se data përfundimtare e artikullit {0}
 DocType: Shift Type,Auto Attendance Settings,Cilësimet e frekuentimit automatik
diff --git a/erpnext/translations/sr.csv b/erpnext/translations/sr.csv
index d0afabb..f178733 100644
--- a/erpnext/translations/sr.csv
+++ b/erpnext/translations/sr.csv
@@ -168,7 +168,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py,Accountant,рачуновођа
 apps/erpnext/erpnext/stock/report/item_price_stock/item_price_stock.py,Selling Price List,Продајна цена
 DocType: Patient,Tobacco Current Use,Употреба дувана
-apps/erpnext/erpnext/stock/report/item_price_stock/item_price_stock.py,Selling Rate,Продајна стопа
+apps/erpnext/erpnext/selling/report/customer_wise_item_price/customer_wise_item_price.py,Selling Rate,Продајна стопа
 apps/erpnext/erpnext/erpnext_integrations/doctype/plaid_settings/plaid_settings.js,Please save your document before adding a new account,Сачувајте свој документ пре додавања новог налога
 DocType: Cost Center,Stock User,Сток Корисник
 DocType: Soil Analysis,(Ca+Mg)/K,(Ца + Мг) / К
@@ -205,7 +205,6 @@
 DocType: Packed Item,Parent Detail docname,Родитељ Детаљ доцнаме
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py,"Reference: {0}, Item Code: {1} and Customer: {2}","Референца: {0}, Код товара: {1} Цустомер: {2}"
 apps/erpnext/erpnext/accounts/report/consolidated_financial_statement/consolidated_financial_statement.py,{0} {1} is not present in the parent company,{0} {1} није присутан у матичној компанији
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Supplier &gt; Supplier Type,Добављач&gt; врста добављача
 apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py,Trial Period End Date Cannot be before Trial Period Start Date,Датум завршетка пробног периода не може бити пре почетка пробног периода
 apps/erpnext/erpnext/utilities/user_progress.py,Kg,кг
 DocType: Tax Withholding Category,Tax Withholding Category,Категорија опозивања пореза
@@ -319,6 +318,7 @@
 DocType: Quality Procedure Table,Responsible Individual,Одговорно лице
 DocType: Naming Series,Prefix,Префикс
 apps/erpnext/erpnext/hr/notification/training_scheduled/training_scheduled.html,Event Location,Локација догађаја
+apps/erpnext/erpnext/selling/report/customer_wise_item_price/customer_wise_item_price.py,Available Stock,Доступне залихе
 DocType: Asset Settings,Asset Settings,Поставке средстава
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py,Consumable,потребляемый
 DocType: Student,B-,Б-
@@ -352,7 +352,9 @@
 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 \
 				Serial No.",Не може се осигурати испорука помоћу Серијског бр. Као \ Итем {0} додат је са и без Осигурање испоруке од \ Серијски број
+apps/erpnext/erpnext/education/doctype/instructor/instructor.py,Please setup Instructor Naming System in Education &gt; Education Settings,Поставите систем именовања инструктора у Образовање&gt; Подешавања образовања
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py,At least one mode of payment is required for POS invoice.,Најмање један начин плаћања је потребно за ПОС рачуна.
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py,Batch no is required for batched item {0},За серијски артикал није потребан број серије {0}
 DocType: Bank Statement Transaction Invoice Item,Bank Statement Transaction Invoice Item,Ставка фактуре за трансакцију из банке
 DocType: Salary Detail,Tax on flexible benefit,Порез на флексибилну корист
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py,Item {0} is not active or end of life has been reached,Пункт {0} не является активным или конец жизни был достигнут
@@ -878,7 +880,6 @@
 DocType: Vital Signs,Blood Pressure (systolic),Крвни притисак (систолни)
 apps/erpnext/erpnext/controllers/buying_controller.py,{0} {1} is {2},{0} {1} је {2}
 DocType: Item Price,Valid Upto,Важи до
-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: Training Event,Workshop,радионица
 DocType: Supplier Scorecard Scoring Standing,Warn Purchase Orders,Упозоравај наруџбенице
 apps/erpnext/erpnext/utilities/user_progress.py,List a few of your customers. They could be organizations or individuals.,Листанеколико ваших клијената . Они могу бити организације и појединци .
@@ -1688,7 +1689,6 @@
 DocType: Item Barcode,Item Barcode,Ставка Баркод
 DocType: Delivery Trip,In Transit,У пролазу
 DocType: Woocommerce Settings,Endpoints,Ендпоинтс
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Item Code &gt; Item Group &gt; Brand,Код артикла&gt; Група артикала&gt; Марка
 DocType: Shopping Cart Settings,Show Configure Button,Прикажи дугме Конфигурирај
 DocType: Quality Inspection Reading,Reading 6,Читање 6
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js,Cannot {0} {1} {2} without any negative outstanding invoice,Цан нот {0} {1} {2} без негативних изузетан фактура
@@ -2053,6 +2053,7 @@
 DocType: Cheque Print Template,Payer Settings,обвезник Подешавања
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js,No pending Material Requests found to link for the given items.,Нема тражених материјала који су пронађени за повезивање за дате ставке.
 apps/erpnext/erpnext/public/js/utils/party.js,Select company first,Изабери компанију прво
+apps/erpnext/erpnext/accounts/general_ledger.py,Account: <b>{0}</b> is capital Work in progress and can not be updated by Journal Entry,Рачун: <b>{0}</b> је капитал Не ради се и не може га ажурирати унос у часопис
 apps/erpnext/erpnext/education/doctype/quiz/quiz.py,Compare List function takes on list arguments,Функција Упореди листу преузима аргументе листе
 DocType: Item Attribute Value,"This will be appended to the Item Code of the variant. For example, if your abbreviation is ""SM"", and the item code is ""T-SHIRT"", the item code of the variant will be ""T-SHIRT-SM""","Ово ће бити прикључена на Кодекса тачка на варијанте. На пример, ако је ваш скраћеница је ""СМ"", а код ставка је ""МАЈИЦА"", ставка код варијанте ће бити ""МАЈИЦА-СМ"""
 DocType: Salary Slip,Net Pay (in words) will be visible once you save the Salary Slip.,Нето плата (у речи) ће бити видљив када сачувате Слип плату.
@@ -2239,6 +2240,7 @@
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js,Item 2,Тачка 2
 DocType: Pricing Rule,Validate Applied Rule,Потврдите примењено правило
 DocType: QuickBooks Migrator,Authorization Endpoint,Ауторизација Ендпоинт
+DocType: Employee Onboarding,Notify users by email,Обавештавајте кориснике путем е-маила
 DocType: Travel Request,International,Интернатионал
 DocType: Training Event,Training Event,тренинг догађај
 DocType: Item,Auto re-order,Ауто поново реда
@@ -2852,7 +2854,6 @@
 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,Клијент са истим именом већ постоји
-DocType: Contract,Inactive,Неактиван
 apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.js,This will submit Salary Slips and create accrual Journal Entry. Do you want to proceed?,Ово ће доставити накнаде за плате и креирати обрачунски дневник. Да ли желите да наставите?
 DocType: Purchase Invoice,Total Net Weight,Укупна нето тежина
 DocType: Purchase Order,Order Confirmation No,Потврда о поруџбини бр
@@ -3133,7 +3134,6 @@
 apps/erpnext/erpnext/accounts/party.py,Billing currency must be equal to either default company's currency or party account currency,Валута за обрачун мора бити једнака валути валуте компаније или валуте партијског рачуна
 DocType: Packing Slip,Indicates that the package is a part of this delivery (Only Draft),Указује на то да пакет је део ове испоруке (само нацрт)
 apps/erpnext/erpnext/accounts/report/customer_ledger_summary/customer_ledger_summary.py,Closing Balance,Завршно стање
-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: Soil Texture,Loam,Лоам
 apps/erpnext/erpnext/controllers/accounts_controller.py,Row {0}: Due Date cannot be before posting date,Ред {0}: Дуе Дате не може бити пре датума објављивања
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py,Quantity for Item {0} must be less than {1},Количество по пункту {0} должно быть меньше {1}
@@ -3662,7 +3662,6 @@
 DocType: Stock Settings,Raise Material Request when stock reaches re-order level,Подигните захтев залиха материјала када достигне ниво поновно наручивање
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py,Full-time,Пуно радно време
 DocType: Payroll Entry,Employees,zaposleni
-apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py,Please setup numbering series for Attendance via Setup &gt; Numbering Series,Молимо вас да подесите серију нумерирања за Аттенданце путем Подешавање&gt; Серија бројања
 DocType: Question,Single Correct Answer,Један тачан одговор
 DocType: Employee,Contact Details,Контакт Детаљи
 DocType: C-Form,Received Date,Примљени Датум
@@ -4296,6 +4295,7 @@
 DocType: Pricing Rule,Price or Product Discount,Цена или попуст на производ
 apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.py,For row {0}: Enter planned qty,За ред {0}: Унесите планирани број
 DocType: Account,Income Account,Приходи рачуна
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Customer &gt; Customer Group &gt; Territory,Купац&gt; Група купаца&gt; Територија
 DocType: Payment Request,Amount in customer's currency,Износ у валути купца
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js,Delivery,Испорука
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.py,Assigning Structures...,Додела структура ...
@@ -4345,7 +4345,6 @@
 DocType: HR Settings,Check Vacancies On Job Offer Creation,Проверите конкурсе за креирање понуде за посао
 apps/erpnext/erpnext/utilities/user_progress.py,Go to Letterheads,Идите у Леттерхеадс
 DocType: Subscription,Cancel At End Of Period,Откажи на крају периода
-apps/erpnext/erpnext/education/doctype/instructor/instructor.py,Please setup Instructor Naming System in Education &gt; Education Settings,Поставите систем именовања инструктора у Образовање&gt; Подешавања образовања
 apps/erpnext/erpnext/hr/doctype/employee_promotion/employee_promotion.js,Property already added,Имовина је већ додата
 DocType: Item Supplier,Item Supplier,Ставка Снабдевач
 apps/erpnext/erpnext/public/js/controllers/transaction.js,Please enter Item Code to get batch no,Унесите Шифра добити пакет не
@@ -4643,6 +4642,7 @@
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.js,Warning: Material Requested Qty is less than Minimum Order Qty,Упозорење : Материјал Тражени Кол је мање од Минимална количина за поручивање
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py,Account {0} is frozen,Счет {0} заморожен
 DocType: Quiz Question,Quiz Question,Питање за квиз
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Supplier &gt; Supplier Type,Добављач&gt; врста добављача
 DocType: Company,Legal Entity / Subsidiary with a separate Chart of Accounts belonging to the Organization.,Правно лице / Подружница са посебном контном припада организацији.
 DocType: Payment Request,Mute Email,Муте-маил
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py,"Food, Beverage & Tobacco","Храна , пиће и дуван"
@@ -5159,7 +5159,6 @@
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py,Delivery warehouse required for stock item {0},Испорука складиште потребно за лагеру предмета {0}
 DocType: Packing Slip,The gross weight of the package. Usually net weight + packaging material weight. (for print),Бруто тежина пакета. Обично нето тежина + амбалаже тежина. (За штампу)
 DocType: Assessment Plan,Program,програм
-apps/erpnext/erpnext/hr/doctype/employee/employee.py,Please setup Employee Naming System in Human Resource &gt; HR Settings,Молимо поставите систем именовања запосленика у људским ресурсима&gt; ХР подешавања
 DocType: Accounts Settings,Users with this role are allowed to set frozen accounts and create / modify accounting entries against frozen accounts,Корисници са овом улогом је дозвољено да подесите замрзнуте рачуне и створити / модификује рачуноводствене уносе против замрзнутим рачунима
 ,Project Billing Summary,Резиме обрачуна пројеката
 DocType: Vital Signs,Cuts,Рез
@@ -5409,6 +5408,7 @@
 apps/erpnext/erpnext/quality_management/doctype/quality_review/quality_review_list.js,No Action,Нема акције
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js,Valuation type charges can not marked as Inclusive,Тип Процена трошкови не могу означити као инцлусиве
 DocType: POS Profile,Update Stock,Упдате Стоцк
+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/stock/doctype/packing_slip/packing_slip.js,Different UOM for items will lead to incorrect (Total) Net Weight value. Make sure that Net Weight of each item is in the same UOM.,"Различные Единица измерения для элементов приведет к некорректному (Всего) значение массы нетто . Убедитесь, что вес нетто каждого элемента находится в том же UOM ."
 DocType: Certification Application,Payment Details,Podaci o plaćanju
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py,BOM Rate,БОМ курс
@@ -5514,6 +5514,8 @@
 apps/erpnext/erpnext/accounts/doctype/monthly_distribution/monthly_distribution.py,Percentage Allocation should be equal to 100%,Процент Распределение должно быть равно 100%
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js,Please select Posting Date before selecting Party,Молимо одаберите датум постања пре избора Парти
 apps/erpnext/erpnext/config/accounting.py,Payment Terms based on conditions,Услови плаћања на основу услова
+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: Program Enrollment,School House,Школа Кућа
 DocType: Serial No,Out of AMC,Од АМЦ
 DocType: Opportunity,Opportunity Amount,Могућност Износ
@@ -5717,6 +5719,7 @@
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py,Order/Quot %,Ордер / куот%
 apps/erpnext/erpnext/config/healthcare.py,Record Patient Vitals,Снимите витале пацијента
 DocType: Fee Schedule,Institution,Институција
+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: Asset,Partially Depreciated,делимично амортизује
 DocType: Issue,Opening Time,Радно време
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py,From and To dates required,"От и До даты , необходимых"
@@ -5937,6 +5940,7 @@
 DocType: Quality Procedure Process,Link existing Quality Procedure.,Повежите постојећу процедуру квалитета
 apps/erpnext/erpnext/config/hr.py,Loans,Кредити
 DocType: Healthcare Service Unit,Healthcare Service Unit,Јединица за здравствену заштиту
+,Customer-wise Item Price,Цена предмета за купце
 apps/erpnext/erpnext/public/js/financial_statements.js,Cash Flow Statement,Извештај о токовима готовине
 apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.py,No material request created,Није направљен материјални захтев
 apps/erpnext/erpnext/hr/doctype/loan_application/loan_application.py,Loan Amount cannot exceed Maximum Loan Amount of {0},Износ кредита не може бити већи од максимални износ кредита {0}
@@ -6203,6 +6207,7 @@
 apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py,Opening Value,Отварање Вредност
 DocType: Salary Component,Formula,формула
 apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py,Serial #,Сериал #
+apps/erpnext/erpnext/hr/doctype/employee/employee.py,Please setup Employee Naming System in Human Resource &gt; HR Settings,Молимо поставите систем именовања запосленика у људским ресурсима&gt; ХР подешавања
 DocType: Material Request Plan Item,Required Quantity,Потребна количина
 DocType: Lab Test Template,Lab Test Template,Лаб тест шаблон
 apps/erpnext/erpnext/accounts/doctype/accounting_period/accounting_period.py,Accounting Period overlaps with {0},Рачуноводствени период се преклапа са {0}
@@ -6454,7 +6459,6 @@
 DocType: Request for Quotation Item,Project Name,Назив пројекта
 apps/erpnext/erpnext/regional/italy/utils.py,Please set the Customer Address,Молимо вас да подесите адресу купца
 DocType: Customer,Mention if non-standard receivable account,Спомените ако нестандардни потраживања рачуна
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Customer &gt; Customer Group &gt; Territory,Купац&gt; Група купаца&gt; Територија
 DocType: Bank,Plaid Access Token,Плаид Аццесс Токен
 apps/erpnext/erpnext/hr/doctype/employee_benefit_application/employee_benefit_application.py,Please add the remaining benefits {0} to any of the existing component,Додајте преостале погодности {0} било којој од постојећих компоненти
 DocType: Journal Entry Account,If Income or Expense,Ако прихода или расхода
@@ -6718,8 +6722,6 @@
 apps/erpnext/erpnext/buying/utils.py,Please enter quantity for Item {0},"Пожалуйста, введите количество для Пункт {0}"
 DocType: Quality Procedure,Processes,Процеси
 DocType: Shift Type,First Check-in and Last Check-out,Прва пријава и последња одјава
-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/regional/report/hsn_wise_summary_of_outward_supplies/hsn_wise_summary_of_outward_supplies.py,Total Taxable Amount,Укупан износ опорезивања
 DocType: Employee External Work History,Employee External Work History,Запослени Спољни Рад Историја
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.py,Job card {0} created,Картица за посао {0} креирана
@@ -6755,6 +6757,7 @@
 apps/erpnext/erpnext/accounts/doctype/payment_terms_template/payment_terms_template.py,Combined invoice portion must equal 100%,Комбиновани део рачуна мора бити 100%
 DocType: Item Default,Default Expense Account,Уобичајено Трошкови налога
 DocType: GST Account,CGST Account,ЦГСТ налог
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Item Code &gt; Item Group &gt; Brand,Код артикла&gt; Група артикала&gt; Марка
 apps/erpnext/erpnext/education/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py,Student Email ID,Студент-маил ИД
 DocType: Employee,Notice (days),Обавештење ( дана )
 DocType: POS Closing Voucher Invoices,POS Closing Voucher Invoices,ПОС закључавање ваучера
@@ -7397,6 +7400,7 @@
 DocType: Maintenance Visit,Maintenance Date,Одржавање Датум
 DocType: Purchase Invoice Item,Rejected Serial No,Одбијен Серијски број
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py,Year start date or end date is overlapping with {0}. To avoid please set company,Године датум почетка или датум завршетка се преклапа са {0}. Да бисте избегли молим поставили компанију
+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/selling/doctype/customer/customer.py,Please mention the Lead Name in Lead {0},Молим вас да наведете Леад Леад у Леад-у {0}
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py,Start date should be less than end date for Item {0},Дата начала должна быть меньше даты окончания для Пункт {0}
 DocType: Shift Type,Auto Attendance Settings,Подешавања аутоматске посете
diff --git a/erpnext/translations/sr_sp.csv b/erpnext/translations/sr_sp.csv
index 100cde2..af130af 100644
--- a/erpnext/translations/sr_sp.csv
+++ b/erpnext/translations/sr_sp.csv
@@ -704,7 +704,7 @@
 DocType: Announcement,Student,Student
 apps/erpnext/erpnext/accounts/report/purchase_order_items_to_be_billed/purchase_order_items_to_be_billed.py,Suplier Name,Naziv dobavljača
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py,In Qty,Prijem količine
-apps/erpnext/erpnext/stock/report/item_price_stock/item_price_stock.py,Selling Rate,Prodajna cijena
+apps/erpnext/erpnext/selling/report/customer_wise_item_price/customer_wise_item_price.py,Selling Rate,Prodajna cijena
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py,Stock cannot be updated against Delivery Note {0},Zaliha se ne može promijeniti jer je vezana sa otpremnicom {0}
 apps/erpnext/erpnext/accounts/page/pos/pos.js,You are in offline mode. You will not be able to reload until you have network.,Радите без интернета. Нећете моћи да учитате страницу док се не повежете.
 apps/erpnext/erpnext/selling/page/point_of_sale/point_of_sale.js,Form View,Prikaži kao formu
diff --git a/erpnext/translations/sv.csv b/erpnext/translations/sv.csv
index c4f8c4b..90d026f 100644
--- a/erpnext/translations/sv.csv
+++ b/erpnext/translations/sv.csv
@@ -168,7 +168,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py,Accountant,Revisor
 apps/erpnext/erpnext/stock/report/item_price_stock/item_price_stock.py,Selling Price List,Försäljningsprislista
 DocType: Patient,Tobacco Current Use,Tobaks nuvarande användning
-apps/erpnext/erpnext/stock/report/item_price_stock/item_price_stock.py,Selling Rate,Försäljningsfrekvens
+apps/erpnext/erpnext/selling/report/customer_wise_item_price/customer_wise_item_price.py,Selling Rate,Försäljningsfrekvens
 apps/erpnext/erpnext/erpnext_integrations/doctype/plaid_settings/plaid_settings.js,Please save your document before adding a new account,Spara ditt dokument innan du lägger till ett nytt konto
 DocType: Cost Center,Stock User,Lager Användar
 DocType: Soil Analysis,(Ca+Mg)/K,(Ca+Mg) / K
@@ -205,7 +205,6 @@
 DocType: Packed Item,Parent Detail docname,Överordnat Detalj doknamn
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py,"Reference: {0}, Item Code: {1} and Customer: {2}","Referens: {0}, Artikelnummer: {1} och Kund: {2}"
 apps/erpnext/erpnext/accounts/report/consolidated_financial_statement/consolidated_financial_statement.py,{0} {1} is not present in the parent company,{0} {1} finns inte i moderbolaget
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Supplier &gt; Supplier Type,Leverantör&gt; Leverantörstyp
 apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py,Trial Period End Date Cannot be before Trial Period Start Date,Pröva period Slutdatum kan inte vara före startdatum för prövningsperiod
 apps/erpnext/erpnext/utilities/user_progress.py,Kg,Kg
 DocType: Tax Withholding Category,Tax Withholding Category,Skatteavdragskategori
@@ -319,6 +318,7 @@
 DocType: Quality Procedure Table,Responsible Individual,Ansvarig individ
 DocType: Naming Series,Prefix,Prefix
 apps/erpnext/erpnext/hr/notification/training_scheduled/training_scheduled.html,Event Location,Plats för evenemang
+apps/erpnext/erpnext/selling/report/customer_wise_item_price/customer_wise_item_price.py,Available Stock,Tillgängligt lager
 DocType: Asset Settings,Asset Settings,Tillgångsinställningar
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py,Consumable,Förbrukningsartiklar
 DocType: Student,B-,B-
@@ -352,6 +352,7 @@
 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 \
 				Serial No.",Kan inte garantera leverans med serienummer som \ Item {0} läggs till med och utan Se till att leverans med \ Serienummer
+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/accounts/doctype/sales_invoice/sales_invoice.py,At least one mode of payment is required for POS invoice.,Minst ett läge av betalning krävs för POS faktura.
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py,Batch no is required for batched item {0},Bunt nr krävs för batchföremål {0}
 DocType: Bank Statement Transaction Invoice Item,Bank Statement Transaction Invoice Item,Bankräkning Transaktionsfaktura
@@ -879,7 +880,6 @@
 DocType: Vital Signs,Blood Pressure (systolic),Blodtryck (systolisk)
 apps/erpnext/erpnext/controllers/buying_controller.py,{0} {1} is {2},{0} {1} är {2}
 DocType: Item Price,Valid Upto,Giltig upp till
-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: Training Event,Workshop,Verkstad
 DocType: Supplier Scorecard Scoring Standing,Warn Purchase Orders,Varna inköpsorder
 apps/erpnext/erpnext/utilities/user_progress.py,List a few of your customers. They could be organizations or individuals.,Lista några av dina kunder. De kunde vara organisationer eller privatpersoner.
@@ -1669,7 +1669,6 @@
 DocType: Item Barcode,Item Barcode,Produkt Streckkod
 DocType: Delivery Trip,In Transit,I transit
 DocType: Woocommerce Settings,Endpoints,endpoints
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Item Code &gt; Item Group &gt; Brand,Produktkod&gt; Produktgrupp&gt; Märke
 DocType: Shopping Cart Settings,Show Configure Button,Visa inställningsknapp
 DocType: Quality Inspection Reading,Reading 6,Avläsning 6
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js,Cannot {0} {1} {2} without any negative outstanding invoice,Kan inte {0} {1} {2} utan någon negativ enastående faktura
@@ -2034,6 +2033,7 @@
 DocType: Cheque Print Template,Payer Settings,Payer Inställningar
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js,No pending Material Requests found to link for the given items.,Inga pågående materialförfrågningar hittades för att länka för de angivna objekten.
 apps/erpnext/erpnext/public/js/utils/party.js,Select company first,Välj företag först
+apps/erpnext/erpnext/accounts/general_ledger.py,Account: <b>{0}</b> is capital Work in progress and can not be updated by Journal Entry,Konto: <b>{0}</b> är kapital Arbetet pågår och kan inte uppdateras av Journal Entry
 apps/erpnext/erpnext/education/doctype/quiz/quiz.py,Compare List function takes on list arguments,Funktionen Jämför lista tar listargument
 DocType: Item Attribute Value,"This will be appended to the Item Code of the variant. For example, if your abbreviation is ""SM"", and the item code is ""T-SHIRT"", the item code of the variant will be ""T-SHIRT-SM""","Detta kommer att läggas till den punkt koden varianten. Till exempel, om din förkortning är &quot;SM&quot;, och försändelsekoden är &quot;T-TRÖJA&quot;, posten kod varianten kommer att vara &quot;T-Shirt-SM&quot;"
 DocType: Salary Slip,Net Pay (in words) will be visible once you save the Salary Slip.,Nettolön (i ord) kommer att vara synliga när du sparar lönebeskedet.
@@ -2220,6 +2220,7 @@
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js,Item 2,Produkt  2
 DocType: Pricing Rule,Validate Applied Rule,Validera tillämpad regel
 DocType: QuickBooks Migrator,Authorization Endpoint,Godkännande slutpunkt
+DocType: Employee Onboarding,Notify users by email,Meddela användare via e-post
 DocType: Travel Request,International,Internationell
 DocType: Training Event,Training Event,utbildning Händelse
 DocType: Item,Auto re-order,Auto återbeställning
@@ -2832,7 +2833,6 @@
 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
-DocType: Contract,Inactive,Inaktiv
 apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.js,This will submit Salary Slips and create accrual Journal Entry. Do you want to proceed?,Detta kommer att skicka löneglister och skapa periodiseringsjournalen. Vill du fortsätta?
 DocType: Purchase Invoice,Total Net Weight,Total nettovikt
 DocType: Purchase Order,Order Confirmation No,Orderbekräftelse nr
@@ -3115,7 +3115,6 @@
 apps/erpnext/erpnext/accounts/party.py,Billing currency must be equal to either default company's currency or party account currency,Faktureringsvaluta måste vara lika med antingen standardbolagets valuta eller parti konto konto valuta
 DocType: Packing Slip,Indicates that the package is a part of this delivery (Only Draft),Anger att paketet är en del av denna leverans (endast utkast)
 apps/erpnext/erpnext/accounts/report/customer_ledger_summary/customer_ledger_summary.py,Closing Balance,Avslutande balans
-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}
 DocType: Soil Texture,Loam,Lerjord
 apps/erpnext/erpnext/controllers/accounts_controller.py,Row {0}: Due Date cannot be before posting date,Rad {0}: Förfallodatum kan inte vara innan bokningsdatum
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py,Quantity for Item {0} must be less than {1},Kvantitet för artikel {0} måste vara mindre än {1}
@@ -3643,7 +3642,6 @@
 DocType: Stock Settings,Raise Material Request when stock reaches re-order level,Höj material Begäran när lager når ombeställningsnivåer
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py,Full-time,Heltid
 DocType: Payroll Entry,Employees,Anställda
-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: Question,Single Correct Answer,Enstaka korrekt svar
 DocType: Employee,Contact Details,Kontaktuppgifter
 DocType: C-Form,Received Date,Mottaget Datum
@@ -4259,6 +4257,7 @@
 DocType: Pricing Rule,Price or Product Discount,Pris eller produktrabatt
 apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.py,For row {0}: Enter planned qty,För rad {0}: Ange planerad mängd
 DocType: Account,Income Account,Inkomst konto
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Customer &gt; Customer Group &gt; Territory,Kund&gt; Kundgrupp&gt; Territorium
 DocType: Payment Request,Amount in customer's currency,Belopp i kundens valuta
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js,Delivery,Leverans
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.py,Assigning Structures...,Tilldelandestrukturer...
@@ -4308,7 +4307,6 @@
 DocType: HR Settings,Check Vacancies On Job Offer Creation,Kolla lediga jobb vid skapande av jobb
 apps/erpnext/erpnext/utilities/user_progress.py,Go to Letterheads,Gå till Letterheads
 DocType: Subscription,Cancel At End Of Period,Avbryt vid slutet av perioden
-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/hr/doctype/employee_promotion/employee_promotion.js,Property already added,Egenskapen är redan tillagd
 DocType: Item Supplier,Item Supplier,Produkt Leverantör
 apps/erpnext/erpnext/public/js/controllers/transaction.js,Please enter Item Code to get batch no,Ange Artikelkod att få batchnr
@@ -4594,6 +4592,7 @@
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.js,Warning: Material Requested Qty is less than Minimum Order Qty,Varning: Material Begärt Antal är mindre än Minimum Antal
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py,Account {0} is frozen,Kontot {0} är fruset
 DocType: Quiz Question,Quiz Question,Frågesportfråga
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Supplier &gt; Supplier Type,Leverantör&gt; Leverantörstyp
 DocType: Company,Legal Entity / Subsidiary with a separate Chart of Accounts belonging to the Organization.,Juridisk person / Dotterbolag med en separat kontoplan som tillhör organisationen.
 DocType: Payment Request,Mute Email,Mute E
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py,"Food, Beverage & Tobacco","Mat, dryck och tobak"
@@ -5110,7 +5109,6 @@
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py,Delivery warehouse required for stock item {0},Leverans lager som krävs för Beställningsvara {0}
 DocType: Packing Slip,The gross weight of the package. Usually net weight + packaging material weight. (for print),Bruttovikten på paketet. Vanligtvis nettovikt + förpackningsmaterial vikt. (För utskrift)
 DocType: Assessment Plan,Program,Program
-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: Accounts Settings,Users with this role are allowed to set frozen accounts and create / modify accounting entries against frozen accounts,Användare med den här rollen får ställa frysta konton och skapa / ändra bokföringsposter mot frysta konton
 ,Project Billing Summary,Projekt faktureringsöversikt
 DocType: Vital Signs,Cuts,Cuts
@@ -5361,6 +5359,7 @@
 apps/erpnext/erpnext/quality_management/doctype/quality_review/quality_review_list.js,No Action,Ingen action
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js,Valuation type charges can not marked as Inclusive,Värderingsavgifter kan inte markerats som inklusive
 DocType: POS Profile,Update Stock,Uppdatera lager
+apps/erpnext/erpnext/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/stock/doctype/packing_slip/packing_slip.js,Different UOM for items will lead to incorrect (Total) Net Weight value. Make sure that Net Weight of each item is in the same UOM.,Olika UOM för produkter kommer att leda till felaktiga (Total) Nettovikts värden. Se till att Nettovikt för varje post är i samma UOM.
 DocType: Certification Application,Payment Details,Betalningsinformation
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py,BOM Rate,BOM betyg
@@ -5466,6 +5465,8 @@
 apps/erpnext/erpnext/accounts/doctype/monthly_distribution/monthly_distribution.py,Percentage Allocation should be equal to 100%,Procentuell Fördelning bör vara lika med 100%
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js,Please select Posting Date before selecting Party,Välj bokningsdatum innan du väljer Party
 apps/erpnext/erpnext/config/accounting.py,Payment Terms based on conditions,Betalningsvillkor baserade på villkor
+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: Program Enrollment,School House,School House
 DocType: Serial No,Out of AMC,Slut på AMC
 DocType: Opportunity,Opportunity Amount,Opportunity Amount
@@ -5669,6 +5670,7 @@
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py,Order/Quot %,Order / Quot%
 apps/erpnext/erpnext/config/healthcare.py,Record Patient Vitals,Spela in Patient Vitals
 DocType: Fee Schedule,Institution,Institution
+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}
 DocType: Asset,Partially Depreciated,delvis avskrivna
 DocType: Issue,Opening Time,Öppnings Tid
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py,From and To dates required,Från och Till datum krävs
@@ -5888,6 +5890,7 @@
 DocType: Quality Procedure Process,Link existing Quality Procedure.,Länka befintligt kvalitetsförfarande.
 apps/erpnext/erpnext/config/hr.py,Loans,lån
 DocType: Healthcare Service Unit,Healthcare Service Unit,Hälso- och sjukvårdsservice
+,Customer-wise Item Price,Kundmässigt artikelpris
 apps/erpnext/erpnext/public/js/financial_statements.js,Cash Flow Statement,Kassaflödesanalys
 apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.py,No material request created,Ingen materiell förfrågan skapad
 apps/erpnext/erpnext/hr/doctype/loan_application/loan_application.py,Loan Amount cannot exceed Maximum Loan Amount of {0},Lånebeloppet kan inte överstiga Maximal låne Mängd {0}
@@ -6154,6 +6157,7 @@
 apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py,Opening Value,öppnings Värde
 DocType: Salary Component,Formula,Formel
 apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py,Serial #,Seriell #
+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: Material Request Plan Item,Required Quantity,Mängd som krävs
 DocType: Lab Test Template,Lab Test Template,Lab Test Template
 apps/erpnext/erpnext/accounts/doctype/accounting_period/accounting_period.py,Accounting Period overlaps with {0},Redovisningsperioden överlappar med {0}
@@ -6404,7 +6408,6 @@
 DocType: Request for Quotation Item,Project Name,Projektnamn
 apps/erpnext/erpnext/regional/italy/utils.py,Please set the Customer Address,Ange kundadress
 DocType: Customer,Mention if non-standard receivable account,Nämn om icke-standardiserade fordran konto
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Customer &gt; Customer Group &gt; Territory,Kund&gt; Kundgrupp&gt; Territorium
 DocType: Bank,Plaid Access Token,Plaid Access Token
 apps/erpnext/erpnext/hr/doctype/employee_benefit_application/employee_benefit_application.py,Please add the remaining benefits {0} to any of the existing component,Lägg till de övriga fördelarna {0} till någon av befintliga komponenter
 DocType: Journal Entry Account,If Income or Expense,Om intäkter eller kostnader
@@ -6668,8 +6671,6 @@
 apps/erpnext/erpnext/buying/utils.py,Please enter quantity for Item {0},Vänligen ange antal förpackningar för artikel {0}
 DocType: Quality Procedure,Processes,processer
 DocType: Shift Type,First Check-in and Last Check-out,Första incheckning och sista utcheckning
-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/regional/report/hsn_wise_summary_of_outward_supplies/hsn_wise_summary_of_outward_supplies.py,Total Taxable Amount,Totala skattepliktiga beloppet
 DocType: Employee External Work History,Employee External Work History,Anställd Extern Arbetserfarenhet
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.py,Job card {0} created,Jobbkort {0} skapat
@@ -6706,6 +6707,7 @@
 apps/erpnext/erpnext/accounts/doctype/payment_terms_template/payment_terms_template.py,Combined invoice portion must equal 100%,Kombinerad fakturahandel måste vara lika med 100%
 DocType: Item Default,Default Expense Account,Standardutgiftskonto
 DocType: GST Account,CGST Account,CGST-konto
+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/education/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py,Student Email ID,Student E ID
 DocType: Employee,Notice (days),Observera (dagar)
 DocType: POS Closing Voucher Invoices,POS Closing Voucher Invoices,POS Closing Voucher Fakturor
@@ -7346,6 +7348,7 @@
 DocType: Maintenance Visit,Maintenance Date,Underhållsdatum
 DocType: Purchase Invoice Item,Rejected Serial No,Avvisat Serienummer
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py,Year start date or end date is overlapping with {0}. To avoid please set company,År startdatum eller slutdatum överlappar med {0}. För att undvika ställ företag
+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/selling/doctype/customer/customer.py,Please mention the Lead Name in Lead {0},Vänligen ange lednamnet i bly {0}
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py,Start date should be less than end date for Item {0},Startdatum bör vara mindre än slutdatumet för punkt {0}
 DocType: Shift Type,Auto Attendance Settings,Inställningar för automatisk deltagande
diff --git a/erpnext/translations/sw.csv b/erpnext/translations/sw.csv
index bd1f000..6890b27 100644
--- a/erpnext/translations/sw.csv
+++ b/erpnext/translations/sw.csv
@@ -167,7 +167,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py,Accountant,Mhasibu
 apps/erpnext/erpnext/stock/report/item_price_stock/item_price_stock.py,Selling Price List,Orodha ya Bei ya Kuuza
 DocType: Patient,Tobacco Current Use,Tabibu Matumizi ya Sasa
-apps/erpnext/erpnext/stock/report/item_price_stock/item_price_stock.py,Selling Rate,Kiwango cha Mauzo
+apps/erpnext/erpnext/selling/report/customer_wise_item_price/customer_wise_item_price.py,Selling Rate,Kiwango cha Mauzo
 apps/erpnext/erpnext/erpnext_integrations/doctype/plaid_settings/plaid_settings.js,Please save your document before adding a new account,Tafadhali hifadhi hati yako kabla ya kuongeza akaunti mpya
 DocType: Cost Center,Stock User,Mtumiaji wa hisa
 DocType: Soil Analysis,(Ca+Mg)/K,(Ca + Mg) / K
@@ -203,7 +203,6 @@
 DocType: Packed Item,Parent Detail docname,Jina la jina la Mzazi
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py,"Reference: {0}, Item Code: {1} and Customer: {2}","Rejea: {0}, Msimbo wa Item: {1} na Wateja: {2}"
 apps/erpnext/erpnext/accounts/report/consolidated_financial_statement/consolidated_financial_statement.py,{0} {1} is not present in the parent company,{0} {1} haipo katika kampuni ya mzazi
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Supplier &gt; Supplier Type,Mtoaji&gt; Aina ya wasambazaji
 apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py,Trial Period End Date Cannot be before Trial Period Start Date,Tarehe ya mwisho ya kipindi cha majaribio Haiwezi kuwa kabla ya Tarehe ya Kuanza ya Kipindi
 apps/erpnext/erpnext/utilities/user_progress.py,Kg,Kilo
 DocType: Tax Withholding Category,Tax Withholding Category,Jamii ya Kuzuia Ushuru
@@ -317,6 +316,7 @@
 DocType: Quality Procedure Table,Responsible Individual,Kuwajibika Mtu mmoja mmoja
 DocType: Naming Series,Prefix,Kiambatisho
 apps/erpnext/erpnext/hr/notification/training_scheduled/training_scheduled.html,Event Location,Eneo la Tukio
+apps/erpnext/erpnext/selling/report/customer_wise_item_price/customer_wise_item_price.py,Available Stock,Inapatikana Duka
 DocType: Asset Settings,Asset Settings,Mipangilio ya Mali
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py,Consumable,Inatumiwa
 DocType: Student,B-,B-
@@ -349,6 +349,7 @@
 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 \
 				Serial No.",Haiwezi kuhakikisha utoaji wa Serial Hakuna kama \ Item {0} imeongezwa na bila ya Kuhakikisha Utoaji kwa \ Nambari ya Serial
+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/accounts/doctype/sales_invoice/sales_invoice.py,At least one mode of payment is required for POS invoice.,Angalau mode moja ya malipo inahitajika kwa ankara za POS.
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py,Batch no is required for batched item {0},Batch hapana inahitajika kwa bidhaa iliyopigwa {0}
 DocType: Bank Statement Transaction Invoice Item,Bank Statement Transaction Invoice Item,Taarifa ya Benki ya Invoice Item
@@ -872,7 +873,6 @@
 DocType: Vital Signs,Blood Pressure (systolic),Shinikizo la damu (systolic)
 apps/erpnext/erpnext/controllers/buying_controller.py,{0} {1} is {2},{0} {1} ni {2}
 DocType: Item Price,Valid Upto,Halafu Upto
-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: Training Event,Workshop,Warsha
 DocType: Supplier Scorecard Scoring Standing,Warn Purchase Orders,Angalia Amri za Ununuzi
 apps/erpnext/erpnext/utilities/user_progress.py,List a few of your customers. They could be organizations or individuals.,Andika orodha ya wateja wako wachache. Wanaweza kuwa mashirika au watu binafsi.
@@ -1656,7 +1656,6 @@
 DocType: Item Barcode,Item Barcode,Msimbo wa Barcode
 DocType: Delivery Trip,In Transit,Katika usafiri
 DocType: Woocommerce Settings,Endpoints,Mwisho
-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
 DocType: Shopping Cart Settings,Show Configure Button,Onyesha Kitufe cha Usanidi
 DocType: Quality Inspection Reading,Reading 6,Kusoma 6
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js,Cannot {0} {1} {2} without any negative outstanding invoice,Haiwezi {0} {1} {2} bila ankara yoyote mbaya
@@ -2016,6 +2015,7 @@
 DocType: Cheque Print Template,Payer Settings,Mipangilio ya Payer
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js,No pending Material Requests found to link for the given items.,Hakuna Maombi ya Nyenzo yaliyotumiwa yaliyopatikana ili kuunganishwa kwa vitu vyenye.
 apps/erpnext/erpnext/public/js/utils/party.js,Select company first,Chagua kampuni kwanza
+apps/erpnext/erpnext/accounts/general_ledger.py,Account: <b>{0}</b> is capital Work in progress and can not be updated by Journal Entry,Akaunti: <b>{0}</b> ni mtaji wa Kazi unaendelea na hauwezi kusasishwa na Ingizo la Jarida
 apps/erpnext/erpnext/education/doctype/quiz/quiz.py,Compare List function takes on list arguments,Linganisha kazi ya Orodha inachukua hoja za orodha
 DocType: Item Attribute Value,"This will be appended to the Item Code of the variant. For example, if your abbreviation is ""SM"", and the item code is ""T-SHIRT"", the item code of the variant will be ""T-SHIRT-SM""","Hii itaongezwa kwenye Kanuni ya Nambari ya Mchapishaji. Kwa mfano, ikiwa kichwa chako ni &quot;SM&quot;, na msimbo wa kipengee ni &quot;T-SHIRT&quot;, msimbo wa kipengee wa kipengee utakuwa &quot;T-SHIRT-SM&quot;"
 DocType: Salary Slip,Net Pay (in words) will be visible once you save the Salary Slip.,Net Pay (kwa maneno) itaonekana baada ya kuokoa Slip ya Mshahara.
@@ -2200,6 +2200,7 @@
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js,Item 2,Kipengee 2
 DocType: Pricing Rule,Validate Applied Rule,Thibitisha Sheria iliyotumiwa
 DocType: QuickBooks Migrator,Authorization Endpoint,Mwisho wa Hati miliki
+DocType: Employee Onboarding,Notify users by email,Waarifu watumiaji kwa barua pepe
 DocType: Travel Request,International,Kimataifa
 DocType: Training Event,Training Event,Tukio la Mafunzo
 DocType: Item,Auto re-order,Rejesha upya
@@ -2808,7 +2809,6 @@
 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
-DocType: Contract,Inactive,Haikufanya kazi
 apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.js,This will submit Salary Slips and create accrual Journal Entry. Do you want to proceed?,Hii itawasilisha Slips za Mshahara na kuunda Usajili wa Majarida. Je! Unataka kuendelea?
 DocType: Purchase Invoice,Total Net Weight,Jumla ya uzito wa Net
 DocType: Purchase Order,Order Confirmation No,Uthibitisho wa Uagizo No
@@ -3085,7 +3085,6 @@
 apps/erpnext/erpnext/accounts/party.py,Billing currency must be equal to either default company's currency or party account currency,Fedha ya kulipia lazima iwe sawa na sarafu au kampuni ya sarafu ya kampuni
 DocType: Packing Slip,Indicates that the package is a part of this delivery (Only Draft),Inaonyesha kwamba mfuko ni sehemu ya utoaji huu (Tu Rasimu)
 apps/erpnext/erpnext/accounts/report/customer_ledger_summary/customer_ledger_summary.py,Closing Balance,Kufunga Mizani
-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}
 DocType: Soil Texture,Loam,Loam
 apps/erpnext/erpnext/controllers/accounts_controller.py,Row {0}: Due Date cannot be before posting date,Row {0}: Tarehe ya Tuzo haiwezi kuwa kabla ya kutuma tarehe
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py,Quantity for Item {0} must be less than {1},Wingi wa Bidhaa {0} lazima iwe chini ya {1}
@@ -3607,7 +3606,6 @@
 DocType: Stock Settings,Raise Material Request when stock reaches re-order level,Ongeza Ombi la Nyenzo wakati hisa inakaribia ngazi ya kurejesha tena
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py,Full-time,Wakati wote
 DocType: Payroll Entry,Employees,Wafanyakazi
-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: Question,Single Correct Answer,Jibu Moja Sahihi
 DocType: Employee,Contact Details,Maelezo ya Mawasiliano
 DocType: C-Form,Received Date,Tarehe iliyopokea
@@ -4217,6 +4215,7 @@
 DocType: Pricing Rule,Price or Product Discount,Bei au Punguzo la Bidhaa
 apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.py,For row {0}: Enter planned qty,Kwa mstari {0}: Ingiza qty iliyopangwa
 DocType: Account,Income Account,Akaunti ya Mapato
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Customer &gt; Customer Group &gt; Territory,Mteja&gt; Kikundi cha Wateja&gt; Wilaya
 DocType: Payment Request,Amount in customer's currency,Kiasi cha fedha za wateja
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js,Delivery,Utoaji
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.py,Assigning Structures...,Kugawa Miundo ...
@@ -4266,7 +4265,6 @@
 DocType: HR Settings,Check Vacancies On Job Offer Creation,Angalia nafasi za kazi kwenye uumbaji wa kazi ya kazi
 apps/erpnext/erpnext/utilities/user_progress.py,Go to Letterheads,Nenda kwenye Barua
 DocType: Subscription,Cancel At End Of Period,Futa Wakati wa Mwisho
-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/hr/doctype/employee_promotion/employee_promotion.js,Property already added,Mali tayari imeongezwa
 DocType: Item Supplier,Item Supplier,Muuzaji wa Bidhaa
 apps/erpnext/erpnext/public/js/controllers/transaction.js,Please enter Item Code to get batch no,Tafadhali ingiza Msimbo wa Nambari ili kupata bat
@@ -4551,6 +4549,7 @@
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.js,Warning: Material Requested Qty is less than Minimum Order Qty,Onyo: Nyenzo Nambari Iliyoombwa ni chini ya Upeo wa chini wa Uagizaji
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py,Account {0} is frozen,Akaunti {0} imehifadhiwa
 DocType: Quiz Question,Quiz Question,Swali la Jaribio
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Supplier &gt; Supplier Type,Mtoaji&gt; Aina ya wasambazaji
 DocType: Company,Legal Entity / Subsidiary with a separate Chart of Accounts belonging to the Organization.,Shirika la Kisheria / Subsidiary na Chart tofauti ya Akaunti ya Shirika.
 DocType: Payment Request,Mute Email,Tuma barua pepe
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py,"Food, Beverage & Tobacco","Chakula, Beverage &amp; Tobacco"
@@ -5060,7 +5059,6 @@
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py,Delivery warehouse required for stock item {0},Ghala la utoaji inahitajika kwa kipengee cha hisa {0}
 DocType: Packing Slip,The gross weight of the package. Usually net weight + packaging material weight. (for print),Uzito mkubwa wa mfuko. Kawaida uzito wa uzito + uzito wa vifaa vya uzito. (kwa kuchapishwa)
 DocType: Assessment Plan,Program,Programu
-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: Accounts Settings,Users with this role are allowed to set frozen accounts and create / modify accounting entries against frozen accounts,Watumiaji wenye jukumu hili wanaruhusiwa kuweka akaunti zilizohifadhiwa na kujenga / kurekebisha entries za uhasibu dhidi ya akaunti zilizohifadhiwa
 ,Project Billing Summary,Muhtasari wa Bili ya Mradi
 DocType: Vital Signs,Cuts,Kupunguzwa
@@ -5298,6 +5296,7 @@
 apps/erpnext/erpnext/selling/report/sales_partner_target_variance_based_on_item_group/item_group_wise_sales_target_variance.py,Achieved ({}),Imefikiwa ({})
 DocType: Purchase Order Item Supplied,Purchase Order Item Supplied,Nambari ya Utaratibu wa Ununuzi Inayotolewa
 apps/erpnext/erpnext/public/js/setup_wizard.js,Company Name cannot be Company,Jina la Kampuni hawezi kuwa Kampuni
+apps/erpnext/erpnext/support/doctype/issue/issue.py,{0} parameter is invalid,{0} paramu sio sahihi
 apps/erpnext/erpnext/config/settings.py,Letter Heads for print templates.,Viongozi wa Barua kwa templates za kuchapisha.
 apps/erpnext/erpnext/config/settings.py,Titles for print templates e.g. Proforma Invoice.,Majina ya nyaraka za uchapishaji mfano Msajili wa Proforma.
 DocType: Program Enrollment,Walking,Kutembea
@@ -5307,6 +5306,7 @@
 apps/erpnext/erpnext/quality_management/doctype/quality_review/quality_review_list.js,No Action,Hakuna Kitendo
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js,Valuation type charges can not marked as Inclusive,Malipo ya aina ya thamani haipatikani kama Kuunganisha
 DocType: POS Profile,Update Stock,Sasisha Stock
+apps/erpnext/erpnext/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/stock/doctype/packing_slip/packing_slip.js,Different UOM for items will lead to incorrect (Total) Net Weight value. Make sure that Net Weight of each item is in the same UOM.,UOM tofauti kwa vitu itasababisha kutosa (Jumla) thamani ya uzito wa Nambari. Hakikisha kwamba Uzito wa Net wa kila kitu ni katika UOM sawa.
 DocType: Certification Application,Payment Details,Maelezo ya Malipo
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py,BOM Rate,Kiwango cha BOM
@@ -5410,6 +5410,8 @@
 apps/erpnext/erpnext/accounts/doctype/monthly_distribution/monthly_distribution.py,Percentage Allocation should be equal to 100%,Asilimia ya Ugawaji lazima iwe sawa na 100%
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js,Please select Posting Date before selecting Party,Tafadhali chagua Tarehe ya Kuweka kabla ya kuchagua Chama
 apps/erpnext/erpnext/config/accounting.py,Payment Terms based on conditions,Masharti ya malipo kulingana na masharti
+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: Program Enrollment,School House,Shule ya Shule
 DocType: Serial No,Out of AMC,Nje ya AMC
 DocType: Opportunity,Opportunity Amount,Fursa Kiasi
@@ -5611,6 +5613,7 @@
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py,Order/Quot %,Order / Quot%
 apps/erpnext/erpnext/config/healthcare.py,Record Patient Vitals,Rekodi Vitals Mgonjwa
 DocType: Fee Schedule,Institution,Taasisi
+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}
 DocType: Asset,Partially Depreciated,Ulimwenguni ulipoteza
 DocType: Issue,Opening Time,Wakati wa Ufunguzi
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py,From and To dates required,Kutoka na Ili tarehe inahitajika
@@ -5827,6 +5830,7 @@
 DocType: Quality Procedure Process,Link existing Quality Procedure.,Unganisha Utaratibu wa Ubora uliopo.
 apps/erpnext/erpnext/config/hr.py,Loans,Mikopo
 DocType: Healthcare Service Unit,Healthcare Service Unit,Kitengo cha Utumishi wa Afya
+,Customer-wise Item Price,Bei ya vitu vya busara ya Wateja
 apps/erpnext/erpnext/public/js/financial_statements.js,Cash Flow Statement,Taarifa ya Flow Flow
 apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.py,No material request created,Hakuna ombi la nyenzo lililoundwa
 apps/erpnext/erpnext/hr/doctype/loan_application/loan_application.py,Loan Amount cannot exceed Maximum Loan Amount of {0},Kiasi cha Mkopo hawezi kuzidi Kiwango cha Mikopo ya Upeo wa {0}
@@ -6088,6 +6092,7 @@
 apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py,Opening Value,Thamani ya Ufunguzi
 DocType: Salary Component,Formula,Mfumo
 apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py,Serial #,Serial #
+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: Material Request Plan Item,Required Quantity,Kiasi kinachohitajika
 DocType: Lab Test Template,Lab Test Template,Kigezo cha Mtihani wa Lab
 apps/erpnext/erpnext/accounts/doctype/accounting_period/accounting_period.py,Accounting Period overlaps with {0},Kipindi cha Uhasibu huingiliana na {0}
@@ -6337,7 +6342,6 @@
 DocType: Request for Quotation Item,Project Name,Jina la Mradi
 apps/erpnext/erpnext/regional/italy/utils.py,Please set the Customer Address,Tafadhali weka Anwani ya Wateja
 DocType: Customer,Mention if non-standard receivable account,Eleza kama akaunti isiyo ya kawaida ya kupokea
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Customer &gt; Customer Group &gt; Territory,Mteja&gt; Kikundi cha Wateja&gt; Wilaya
 DocType: Bank,Plaid Access Token,Ishara ya Upataji wa Paa
 apps/erpnext/erpnext/hr/doctype/employee_benefit_application/employee_benefit_application.py,Please add the remaining benefits {0} to any of the existing component,Tafadhali ongeza faida zilizobaki {0} kwa sehemu yoyote iliyopo
 DocType: Journal Entry Account,If Income or Expense,Kama Mapato au Gharama
@@ -6599,8 +6603,6 @@
 apps/erpnext/erpnext/buying/utils.py,Please enter quantity for Item {0},Tafadhali ingiza kiasi cha Bidhaa {0}
 DocType: Quality Procedure,Processes,Michakato
 DocType: Shift Type,First Check-in and Last Check-out,Angalia kwanza na Uangalie mwisho
-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/regional/report/hsn_wise_summary_of_outward_supplies/hsn_wise_summary_of_outward_supplies.py,Total Taxable Amount,Jumla ya Kiasi cha Ushuru
 DocType: Employee External Work History,Employee External Work History,Historia ya Kazi ya Wafanyakazi wa Nje
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.py,Job card {0} created,Kadi ya Kazi {0} imeundwa
@@ -6636,6 +6638,7 @@
 apps/erpnext/erpnext/accounts/doctype/payment_terms_template/payment_terms_template.py,Combined invoice portion must equal 100%,Sehemu ya ankara ya pamoja lazima iwe sawa na 100%
 DocType: Item Default,Default Expense Account,Akaunti ya gharama nafuu
 DocType: GST Account,CGST Account,Akaunti ya CGST
+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/education/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py,Student Email ID,Kitambulisho cha Barua ya Wanafunzi
 DocType: Employee,Notice (days),Angalia (siku)
 DocType: POS Closing Voucher Invoices,POS Closing Voucher Invoices,POS Invoices ya Voucher Voucher
@@ -7273,6 +7276,7 @@
 DocType: Maintenance Visit,Maintenance Date,Tarehe ya Matengenezo
 DocType: Purchase Invoice Item,Rejected Serial No,Imekataliwa Serial No
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py,Year start date or end date is overlapping with {0}. To avoid please set company,Tarehe ya kuanza kwa mwaka au tarehe ya mwisho ni kuingiliana na {0}. Ili kuepuka tafadhali kuweka kampuni
+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/selling/doctype/customer/customer.py,Please mention the Lead Name in Lead {0},Tafadhali kutaja jina la kiongozi katika kiongozi {0}
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py,Start date should be less than end date for Item {0},Tarehe ya mwanzo inapaswa kuwa chini ya tarehe ya mwisho ya Bidhaa {0}
 DocType: Shift Type,Auto Attendance Settings,Mipangilio ya Mahudhurio Moja kwa moja
diff --git a/erpnext/translations/ta.csv b/erpnext/translations/ta.csv
index 02886c8..2d180e5 100644
--- a/erpnext/translations/ta.csv
+++ b/erpnext/translations/ta.csv
@@ -164,7 +164,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py,Accountant,கணக்கர்
 apps/erpnext/erpnext/stock/report/item_price_stock/item_price_stock.py,Selling Price List,விலை பட்டியல் விற்பனை
 DocType: Patient,Tobacco Current Use,புகையிலை தற்போதைய பயன்பாடு
-apps/erpnext/erpnext/stock/report/item_price_stock/item_price_stock.py,Selling Rate,விலை விற்பனை
+apps/erpnext/erpnext/selling/report/customer_wise_item_price/customer_wise_item_price.py,Selling Rate,விலை விற்பனை
 apps/erpnext/erpnext/erpnext_integrations/doctype/plaid_settings/plaid_settings.js,Please save your document before adding a new account,புதிய கணக்கைச் சேர்ப்பதற்கு முன் உங்கள் ஆவணத்தைச் சேமிக்கவும்
 DocType: Cost Center,Stock User,பங்கு பயனர்
 DocType: Soil Analysis,(Ca+Mg)/K,(+ எம்ஜி CA) / கே
@@ -200,7 +200,6 @@
 DocType: Packed Item,Parent Detail docname,பெற்றோர் விரிவாக docname
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py,"Reference: {0}, Item Code: {1} and Customer: {2}",குறிப்பு: {0} பொருள் குறியீடு: {1} மற்றும் வாடிக்கையாளர்: {2}
 apps/erpnext/erpnext/accounts/report/consolidated_financial_statement/consolidated_financial_statement.py,{0} {1} is not present in the parent company,{0} {1} பெற்றோர் நிறுவனத்தில் இல்லை
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Supplier &gt; Supplier Type,சப்ளையர்&gt; சப்ளையர் வகை
 apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py,Trial Period End Date Cannot be before Trial Period Start Date,சோதனை காலம் முடிவடையும் தேதி சோதனை காலம் தொடங்கும் தேதிக்கு முன்பாக இருக்க முடியாது
 apps/erpnext/erpnext/utilities/user_progress.py,Kg,கிலோ
 DocType: Tax Withholding Category,Tax Withholding Category,வரி விலக்கு பிரிவு
@@ -312,6 +311,7 @@
 DocType: Quality Procedure Table,Responsible Individual,பொறுப்பான தனிநபர்
 DocType: Naming Series,Prefix,முற்சேர்க்கை
 apps/erpnext/erpnext/hr/notification/training_scheduled/training_scheduled.html,Event Location,நிகழ்வு இருப்பிடம்
+apps/erpnext/erpnext/selling/report/customer_wise_item_price/customer_wise_item_price.py,Available Stock,கிடைக்கும் பங்கு
 DocType: Asset Settings,Asset Settings,சொத்து அமைப்புகள்
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py,Consumable,நுகர்வோர்
 DocType: Student,B-,பி-
@@ -345,6 +345,7 @@
 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 \
 				Serial No.",சீரியல் எண் மூலம் \ item {0} உடன் வழங்கப்பட்டதை உறுதி செய்ய முடியாது \ Serial No.
+apps/erpnext/erpnext/education/doctype/instructor/instructor.py,Please setup Instructor Naming System in Education &gt; Education Settings,கல்வி&gt; கல்வி அமைப்புகளில் பயிற்றுவிப்பாளர் பெயரிடும் முறையை அமைக்கவும்
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py,At least one mode of payment is required for POS invoice.,கட்டணம் குறைந்தது ஒரு முறை பிஓஎஸ் விலைப்பட்டியல் தேவைப்படுகிறது.
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py,Batch no is required for batched item {0},தொகுக்கப்பட்ட உருப்படிக்கு தொகுதி எண் தேவையில்லை {0}
 DocType: Bank Statement Transaction Invoice Item,Bank Statement Transaction Invoice Item,வங்கி அறிக்கை பரிவர்த்தனை விலைப்பட்டியல் பொருள்
@@ -1658,7 +1659,6 @@
 DocType: Item Barcode,Item Barcode,உருப்படியை பார்கோடு
 DocType: Delivery Trip,In Transit,நடு வழியில்
 DocType: Woocommerce Settings,Endpoints,இறுதிப்புள்ளிகள்
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Item Code &gt; Item Group &gt; Brand,பொருள் குறியீடு&gt; பொருள் குழு&gt; பிராண்ட்
 DocType: Shopping Cart Settings,Show Configure Button,கட்டமை பொத்தானைக் காட்டு
 DocType: Quality Inspection Reading,Reading 6,6 படித்தல்
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js,Cannot {0} {1} {2} without any negative outstanding invoice,இல்லை {0} {1} {2} இல்லாமல் எந்த எதிர்மறை நிலுவையில் விலைப்பட்டியல் Can
@@ -2200,6 +2200,7 @@
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js,Item 2,பொருள் 2
 DocType: Pricing Rule,Validate Applied Rule,பயன்பாட்டு விதியை சரிபார்க்கவும்
 DocType: QuickBooks Migrator,Authorization Endpoint,அங்கீகார முடிவு
+DocType: Employee Onboarding,Notify users by email,மின்னஞ்சல் மூலம் பயனர்களுக்கு அறிவிக்கவும்
 DocType: Travel Request,International,சர்வதேச
 DocType: Training Event,Training Event,பயிற்சி நிகழ்வு
 DocType: Item,Auto re-order,வாகன மறு ஒழுங்கு
@@ -2801,7 +2802,6 @@
 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,அதே பெயருடன் ஒரு வாடிக்கையாளர் ஏற்கனவே உள்ளார்
-DocType: Contract,Inactive,செயல்படா
 apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.js,This will submit Salary Slips and create accrual Journal Entry. Do you want to proceed?,இது சம்பள சரிவுகளைச் சமர்ப்பிக்கும் மற்றும் ஊடுருவல் ஜர்னல் நுழைவு உருவாக்குதல். நீங்கள் தொடர விரும்புகிறீர்களா?
 DocType: Purchase Invoice,Total Net Weight,மொத்த நிகர எடை
 DocType: Purchase Order,Order Confirmation No,ஆர்டர் உறுதிப்படுத்தல் எண்
@@ -3080,7 +3080,6 @@
 apps/erpnext/erpnext/accounts/party.py,Billing currency must be equal to either default company's currency or party account currency,பில்லிங் நாணயம் இயல்புநிலை நிறுவன நாணய அல்லது கட்சி கணக்கு நாணயத்திற்கு சமமாக இருக்க வேண்டும்
 DocType: Packing Slip,Indicates that the package is a part of this delivery (Only Draft),தொகுப்பு இந்த விநியோக ஒரு பகுதியாக உள்ளது என்று குறிக்கிறது (மட்டும் வரைவு)
 apps/erpnext/erpnext/accounts/report/customer_ledger_summary/customer_ledger_summary.py,Closing Balance,முடிவிருப்பு
-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: Soil Texture,Loam,லோம்
 apps/erpnext/erpnext/controllers/accounts_controller.py,Row {0}: Due Date cannot be before posting date,வரிசை {0}: தேதி தேதி வெளியிடும் தேதி இருக்க முடியாது
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py,Quantity for Item {0} must be less than {1},அளவு உருப்படி {0} விட குறைவாக இருக்க வேண்டும் {1}
@@ -3601,7 +3600,6 @@
 DocType: Stock Settings,Raise Material Request when stock reaches re-order level,பங்கு மறு ஒழுங்கு நிலை அடையும் போது பொருள் கோரிக்கை எழுப்ப
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py,Full-time,முழு நேர
 DocType: Payroll Entry,Employees,ஊழியர்
-apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py,Please setup numbering series for Attendance via Setup &gt; Numbering Series,அமைவு&gt; எண்ணைத் தொடர் வழியாக வருகைக்கான எண்ணைத் தொடரை அமைக்கவும்
 DocType: Question,Single Correct Answer,ஒற்றை சரியான பதில்
 DocType: Employee,Contact Details,விபரங்கள்
 DocType: C-Form,Received Date,ஏற்கப்பட்ட தேதி
@@ -4229,6 +4227,7 @@
 DocType: Pricing Rule,Price or Product Discount,விலை அல்லது தயாரிப்பு தள்ளுபடி
 apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.py,For row {0}: Enter planned qty,வரிசையில் {0}: திட்டமிட்ட qty ஐ உள்ளிடவும்
 DocType: Account,Income Account,வருமான கணக்கு
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Customer &gt; Customer Group &gt; Territory,வாடிக்கையாளர்&gt; வாடிக்கையாளர் குழு&gt; பிரதேசம்
 DocType: Payment Request,Amount in customer's currency,வாடிக்கையாளர் நாட்டின் நாணய தொகை
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js,Delivery,விநியோகம்
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.py,Assigning Structures...,கட்டமைப்புகளை ஒதுக்குதல் ...
@@ -4277,7 +4276,6 @@
 DocType: HR Settings,Check Vacancies On Job Offer Creation,வேலை சலுகை உருவாக்கத்தில் காலியிடங்களை சரிபார்க்கவும்
 apps/erpnext/erpnext/utilities/user_progress.py,Go to Letterheads,லெட்டர்ஹெட்ஸ் செல்க
 DocType: Subscription,Cancel At End Of Period,காலம் முடிவில் ரத்துசெய்
-apps/erpnext/erpnext/education/doctype/instructor/instructor.py,Please setup Instructor Naming System in Education &gt; Education Settings,கல்வி&gt; கல்வி அமைப்புகளில் பயிற்றுவிப்பாளர் பெயரிடும் முறையை அமைக்கவும்
 apps/erpnext/erpnext/hr/doctype/employee_promotion/employee_promotion.js,Property already added,சொத்து ஏற்கனவே சேர்க்கப்பட்டது
 DocType: Item Supplier,Item Supplier,பொருள் சப்ளையர்
 apps/erpnext/erpnext/public/js/controllers/transaction.js,Please enter Item Code to get batch no,எந்த தொகுதி கிடைக்கும் பொருள் கோட் உள்ளிடவும்
@@ -4571,6 +4569,7 @@
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.js,Warning: Material Requested Qty is less than Minimum Order Qty,எச்சரிக்கை : அளவு கோரப்பட்ட பொருள் குறைந்தபட்ச ஆணை அளவு குறைவாக உள்ளது
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py,Account {0} is frozen,கணக்கு {0} உறைந்திருக்கும்
 DocType: Quiz Question,Quiz Question,வினாடி வினா கேள்வி
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Supplier &gt; Supplier Type,சப்ளையர்&gt; சப்ளையர் வகை
 DocType: Company,Legal Entity / Subsidiary with a separate Chart of Accounts belonging to the Organization.,நிறுவனத்திற்கு சொந்தமான கணக்குகள் ஒரு தனி விளக்கப்படம் சட்ட நிறுவனம் / துணைநிறுவனத்திற்கு.
 DocType: Payment Request,Mute Email,முடக்கு மின்னஞ்சல்
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py,"Food, Beverage & Tobacco","உணவு , குளிர்பானங்கள் & புகையிலை"
@@ -5077,7 +5076,6 @@
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py,Delivery warehouse required for stock item {0},டெலிவரி கிடங்கு பங்கு உருப்படியை தேவையான {0}
 DocType: Packing Slip,The gross weight of the package. Usually net weight + packaging material weight. (for print),தொகுப்பின் மொத்த எடை. பொதுவாக நிகர எடை + பேக்கேஜிங் பொருட்கள் எடை. (அச்சுக்கு)
 DocType: Assessment Plan,Program,திட்டம்
-apps/erpnext/erpnext/hr/doctype/employee/employee.py,Please setup Employee Naming System in Human Resource &gt; HR Settings,மனிதவள&gt; மனிதவள அமைப்புகளில் பணியாளர் பெயரிடும் முறையை அமைக்கவும்
 DocType: Accounts Settings,Users with this role are allowed to set frozen accounts and create / modify accounting entries against frozen accounts,இந்த பங்களிப்பை செய்த உறைந்த கணக்குகள் எதிராக கணக்கியல் உள்ளீடுகள் மாற்ற / உறைந்த கணக்குகள் அமைக்க உருவாக்க அனுமதி
 ,Project Billing Summary,திட்ட பில்லிங் சுருக்கம்
 DocType: Vital Signs,Cuts,கட்ஸ்
@@ -5425,6 +5423,8 @@
 apps/erpnext/erpnext/accounts/doctype/monthly_distribution/monthly_distribution.py,Percentage Allocation should be equal to 100%,சதவீதம் ஒதுக்கீடு 100% சமமாக இருக்க வேண்டும்
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js,Please select Posting Date before selecting Party,"கட்சி தேர்வு செய்யும் முன், பதிவுசெய்ய தேதி தேர்ந்தெடுக்கவும்"
 apps/erpnext/erpnext/config/accounting.py,Payment Terms based on conditions,நிபந்தனைகளின் அடிப்படையில் கட்டண விதிமுறைகள்
+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: Program Enrollment,School House,பள்ளி ஹவுஸ்
 DocType: Serial No,Out of AMC,AMC வெளியே
 DocType: Opportunity,Opportunity Amount,வாய்ப்பு தொகை
@@ -5626,6 +5626,7 @@
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py,Order/Quot %,ஆணை / quot%
 apps/erpnext/erpnext/config/healthcare.py,Record Patient Vitals,பதிவு நோயாளி Vitals
 DocType: Fee Schedule,Institution,நிறுவனம்
+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: Asset,Partially Depreciated,ஓரளவு Depreciated
 DocType: Issue,Opening Time,நேரம் திறந்து
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py,From and To dates required,தேவையான தேதிகள் மற்றும் இதயம்
@@ -5839,6 +5840,7 @@
 DocType: Quality Procedure Process,Link existing Quality Procedure.,இருக்கும் தர நடைமுறைகளை இணைக்கவும்.
 apps/erpnext/erpnext/config/hr.py,Loans,கடன்கள்
 DocType: Healthcare Service Unit,Healthcare Service Unit,சுகாதார சேவை பிரிவு
+,Customer-wise Item Price,வாடிக்கையாளர் வாரியான பொருள் விலை
 apps/erpnext/erpnext/public/js/financial_statements.js,Cash Flow Statement,பணப்பாய்வு அறிக்கை
 apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.py,No material request created,பொருள் கோரிக்கை எதுவும் உருவாக்கப்படவில்லை
 apps/erpnext/erpnext/hr/doctype/loan_application/loan_application.py,Loan Amount cannot exceed Maximum Loan Amount of {0},கடன் தொகை அதிகபட்ச கடன் தொகை தாண்ட முடியாது {0}
@@ -6102,6 +6104,7 @@
 apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py,Opening Value,திறப்பு மதிப்பு
 DocType: Salary Component,Formula,சூத்திரம்
 apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py,Serial #,தொடர் #
+apps/erpnext/erpnext/hr/doctype/employee/employee.py,Please setup Employee Naming System in Human Resource &gt; HR Settings,மனிதவள&gt; மனிதவள அமைப்புகளில் பணியாளர் பெயரிடும் முறையை அமைக்கவும்
 DocType: Material Request Plan Item,Required Quantity,தேவையான அளவு
 DocType: Lab Test Template,Lab Test Template,லேப் டெஸ்ட் வார்ப்புரு
 apps/erpnext/erpnext/setup/doctype/company/company.py,Sales Account,விற்பனை கணக்கு
@@ -6346,7 +6349,6 @@
 DocType: Request for Quotation Item,Project Name,திட்டம் பெயர்
 apps/erpnext/erpnext/regional/italy/utils.py,Please set the Customer Address,வாடிக்கையாளர் முகவரியை அமைக்கவும்
 DocType: Customer,Mention if non-standard receivable account,குறிப்பிட தரமற்ற பெறத்தக்க கணக்கு என்றால்
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Customer &gt; Customer Group &gt; Territory,வாடிக்கையாளர்&gt; வாடிக்கையாளர் குழு&gt; பிரதேசம்
 DocType: Bank,Plaid Access Token,பிளேட் அணுகல் டோக்கன்
 apps/erpnext/erpnext/hr/doctype/employee_benefit_application/employee_benefit_application.py,Please add the remaining benefits {0} to any of the existing component,தயவுசெய்து மீதமுள்ள நன்மைகளை {0} சேர்க்கப்பட்டுள்ள அங்கத்தினருக்கு சேர்க்கவும்
 DocType: Journal Entry Account,If Income or Expense,என்றால் வருமானம் அல்லது செலவு
@@ -6604,8 +6606,6 @@
 apps/erpnext/erpnext/buying/utils.py,Please enter quantity for Item {0},பொருள் எண்ணிக்கையை உள்ளிடவும் {0}
 DocType: Quality Procedure,Processes,செயல்முறைகள்
 DocType: Shift Type,First Check-in and Last Check-out,முதல் செக்-இன் மற்றும் கடைசியாக செக்-அவுட்
-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/regional/report/hsn_wise_summary_of_outward_supplies/hsn_wise_summary_of_outward_supplies.py,Total Taxable Amount,மொத்த வரிவிலக்கு தொகை
 DocType: Employee External Work History,Employee External Work History,பணியாளர் வெளி வேலை வரலாறு
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.py,Job card {0} created,வேலை அட்டை {0} உருவாக்கப்பட்டது
@@ -6642,6 +6642,7 @@
 apps/erpnext/erpnext/accounts/doctype/payment_terms_template/payment_terms_template.py,Combined invoice portion must equal 100%,ஒருங்கிணைந்த விலைப்பட்டியல் பகுதியை 100%
 DocType: Item Default,Default Expense Account,முன்னிருப்பு செலவு கணக்கு
 DocType: GST Account,CGST Account,CGST கணக்கு
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Item Code &gt; Item Group &gt; Brand,பொருள் குறியீடு&gt; பொருள் குழு&gt; பிராண்ட்
 apps/erpnext/erpnext/education/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py,Student Email ID,மாணவர் மின்னஞ்சல் ஐடி
 DocType: Employee,Notice (days),அறிவிப்பு ( நாட்கள்)
 DocType: POS Closing Voucher Invoices,POS Closing Voucher Invoices,பிஓஎஸ் நிறைவு வவுச்சர் பற்றுச்சீட்டுகள்
@@ -7274,6 +7275,7 @@
 DocType: Maintenance Visit,Maintenance Date,பராமரிப்பு தேதி
 DocType: Purchase Invoice Item,Rejected Serial No,நிராகரிக்கப்பட்டது சீரியல் இல்லை
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py,Year start date or end date is overlapping with {0}. To avoid please set company,"ஆண்டு தொடக்க தேதி அல்லது முடிவு தேதி {0} கொண்டு மேலெழும். நிறுவனம் அமைக்கவும், தயவு செய்து தவிர்க்க"
+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/selling/doctype/customer/customer.py,Please mention the Lead Name in Lead {0},முன்னணி தலைப்பில் குறிப்பிடவும் {0}
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py,Start date should be less than end date for Item {0},தொடக்க தேதி பொருள் முடிவு தேதி விட குறைவாக இருக்க வேண்டும் {0}
 DocType: Shift Type,Auto Attendance Settings,ஆட்டோ வருகை அமைப்புகள்
diff --git a/erpnext/translations/te.csv b/erpnext/translations/te.csv
index 0b1e035..7dad9bd 100644
--- a/erpnext/translations/te.csv
+++ b/erpnext/translations/te.csv
@@ -163,7 +163,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py,Accountant,అకౌంటెంట్
 apps/erpnext/erpnext/stock/report/item_price_stock/item_price_stock.py,Selling Price List,ధర జాబితా అమ్మకం
 DocType: Patient,Tobacco Current Use,పొగాకు ప్రస్తుత ఉపయోగం
-apps/erpnext/erpnext/stock/report/item_price_stock/item_price_stock.py,Selling Rate,రేట్ సెల్లింగ్
+apps/erpnext/erpnext/selling/report/customer_wise_item_price/customer_wise_item_price.py,Selling Rate,రేట్ సెల్లింగ్
 apps/erpnext/erpnext/erpnext_integrations/doctype/plaid_settings/plaid_settings.js,Please save your document before adding a new account,క్రొత్త ఖాతాను జోడించే ముందు దయచేసి మీ పత్రాన్ని సేవ్ చేయండి
 DocType: Cost Center,Stock User,స్టాక్ వాడుకరి
 DocType: Soil Analysis,(Ca+Mg)/K,(Ca + Mg) / K
@@ -199,7 +199,6 @@
 DocType: Packed Item,Parent Detail docname,మాతృ వివరాలు docname
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py,"Reference: {0}, Item Code: {1} and Customer: {2}","సూచన: {0}, Item కోడ్: {1} మరియు కస్టమర్: {2}"
 apps/erpnext/erpnext/accounts/report/consolidated_financial_statement/consolidated_financial_statement.py,{0} {1} is not present in the parent company,{0} {1} మాతృ సంస్థలో లేదు
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Supplier &gt; Supplier Type,సరఫరాదారు&gt; సరఫరాదారు రకం
 apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py,Trial Period End Date Cannot be before Trial Period Start Date,ట్రయల్ వ్యవధి ముగింపు తేదీ ట్రయల్ పీరియడ్ ప్రారంభ తేదీకి ముందు ఉండకూడదు
 apps/erpnext/erpnext/utilities/user_progress.py,Kg,కిలొగ్రామ్
 DocType: Tax Withholding Category,Tax Withholding Category,పన్ను అక్రమ హోదా
@@ -311,6 +310,7 @@
 DocType: Quality Procedure Table,Responsible Individual,బాధ్యతాయుతమైన వ్యక్తి
 DocType: Naming Series,Prefix,ఆదిపదం
 apps/erpnext/erpnext/hr/notification/training_scheduled/training_scheduled.html,Event Location,ఈవెంట్ స్థానం
+apps/erpnext/erpnext/selling/report/customer_wise_item_price/customer_wise_item_price.py,Available Stock,అందుబాటులో ఉన్న స్టాక్
 DocType: Asset Settings,Asset Settings,ఆస్తి సెట్టింగ్లు
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py,Consumable,వినిమయ
 DocType: Student,B-,B-
@@ -344,6 +344,7 @@
 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 \
 				Serial No.",సీరియల్ నో ద్వారా డెలివరీను హామీ ఇవ్వలేము \ అంశం {0} మరియు సీరియల్ నంబర్
+apps/erpnext/erpnext/education/doctype/instructor/instructor.py,Please setup Instructor Naming System in Education &gt; Education Settings,దయచేసి విద్య&gt; విద్య సెట్టింగులలో బోధకుడు నామకరణ వ్యవస్థను సెటప్ చేయండి
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py,At least one mode of payment is required for POS invoice.,చెల్లింపు మోడ్ అయినా POS వాయిస్ అవసరం.
 DocType: Bank Statement Transaction Invoice Item,Bank Statement Transaction Invoice Item,బ్యాంక్ స్టేట్మెంట్ ట్రాన్సాక్షన్ వాయిస్ ఐటెమ్
 DocType: Salary Detail,Tax on flexible benefit,సౌకర్యవంతమైన ప్రయోజనం మీద పన్ను
@@ -1637,7 +1638,6 @@
 DocType: Item Barcode,Item Barcode,అంశం బార్కోడ్
 DocType: Delivery Trip,In Transit,రవాణాలో
 DocType: Woocommerce Settings,Endpoints,అంత్య బిందువుల
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Item Code &gt; Item Group &gt; Brand,ఐటెమ్ కోడ్&gt; ఐటమ్ గ్రూప్&gt; బ్రాండ్
 DocType: Shopping Cart Settings,Show Configure Button,కాన్ఫిగర్ బటన్ చూపించు
 DocType: Quality Inspection Reading,Reading 6,6 పఠనం
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js,Cannot {0} {1} {2} without any negative outstanding invoice,కాదు {0} {1} {2} లేకుండా ఏ ప్రతికూల అత్యుత్తమ వాయిస్ కెన్
@@ -2178,6 +2178,7 @@
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js,Item 2,అంశం 2
 DocType: Pricing Rule,Validate Applied Rule,అనువర్తిత నియమాన్ని ధృవీకరించండి
 DocType: QuickBooks Migrator,Authorization Endpoint,ప్రామాణీకరణ ముగింపు
+DocType: Employee Onboarding,Notify users by email,ఇమెయిల్ ద్వారా వినియోగదారులకు తెలియజేయండి
 DocType: Travel Request,International,అంతర్జాతీయ
 DocType: Training Event,Training Event,శిక్షణ ఈవెంట్
 DocType: Item,Auto re-order,ఆటో క్రమాన్ని
@@ -2779,7 +2780,6 @@
 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,అదే పేరుతో ఉన్న కస్టమర్ ఇప్పటికే ఉంది
-DocType: Contract,Inactive,క్రియారహిత
 apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.js,This will submit Salary Slips and create accrual Journal Entry. Do you want to proceed?,"ఇది జీతం స్లిప్ లను సమర్పించి, హక్కు జర్నల్ ఎంట్రీని సృష్టిస్తుంది. మీరు కొనసాగాలనుకుంటున్నారా?"
 DocType: Purchase Invoice,Total Net Weight,మొత్తం నికర బరువు
 DocType: Purchase Order,Order Confirmation No,ఆర్డర్ నిర్ధారణ సంఖ్య
@@ -3057,7 +3057,6 @@
 apps/erpnext/erpnext/accounts/party.py,Billing currency must be equal to either default company's currency or party account currency,బిల్లింగ్ కరెన్సీ డిఫాల్ట్ కంపెనీ కరెన్సీ లేదా పార్టీ ఖాతా కరెన్సీకి సమానంగా ఉండాలి
 DocType: Packing Slip,Indicates that the package is a part of this delivery (Only Draft),ప్యాకేజీ దూస్రా (మాత్రమే డ్రాఫ్ట్) లో ఒక భాగంగా ఉంది అని సూచిస్తుంది
 apps/erpnext/erpnext/accounts/report/customer_ledger_summary/customer_ledger_summary.py,Closing Balance,ముగింపు బ్యాలెన్స్
-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: Soil Texture,Loam,లోవామ్
 apps/erpnext/erpnext/controllers/accounts_controller.py,Row {0}: Due Date cannot be before posting date,రో {0}: తేదీని పోస్ట్ చేసే ముందు తేదీ ఉండకూడదు
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py,Quantity for Item {0} must be less than {1},అంశం పరిమాణం {0} కంటే తక్కువ ఉండాలి {1}
@@ -3579,7 +3578,6 @@
 DocType: Stock Settings,Raise Material Request when stock reaches re-order level,స్టాక్ క్రమాన్ని స్థాయి చేరుకున్నప్పుడు మెటీరియల్ అభ్యర్థన రైజ్
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py,Full-time,పూర్తి సమయం
 DocType: Payroll Entry,Employees,ఉద్యోగులు
-apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py,Please setup numbering series for Attendance via Setup &gt; Numbering Series,దయచేసి సెటప్&gt; నంబరింగ్ సిరీస్ ద్వారా హాజరు కోసం నంబరింగ్ సిరీస్‌ను సెటప్ చేయండి
 DocType: Question,Single Correct Answer,ఒకే సరైన సమాధానం
 DocType: Employee,Contact Details,సంప్రదింపు వివరాలు
 DocType: C-Form,Received Date,స్వీకరించిన తేదీ
@@ -4185,6 +4183,7 @@
 DocType: Pricing Rule,Price or Product Discount,ధర లేదా ఉత్పత్తి తగ్గింపు
 apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.py,For row {0}: Enter planned qty,వరుస కోసం {0}: అనుకున్న qty ను నమోదు చేయండి
 DocType: Account,Income Account,ఆదాయపు ఖాతా
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Customer &gt; Customer Group &gt; Territory,కస్టమర్&gt; కస్టమర్ గ్రూప్&gt; భూభాగం
 DocType: Payment Request,Amount in customer's currency,కస్టమర్ యొక్క కరెన్సీ లో మొత్తం
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js,Delivery,డెలివరీ
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.py,Assigning Structures...,నిర్మాణాలను కేటాయించడం ...
@@ -4233,7 +4232,6 @@
 DocType: HR Settings,Check Vacancies On Job Offer Creation,జాబ్ ఆఫర్ సృష్టిలో ఖాళీలను తనిఖీ చేయండి
 apps/erpnext/erpnext/utilities/user_progress.py,Go to Letterheads,లెటర్ హెడ్స్ వెళ్ళండి
 DocType: Subscription,Cancel At End Of Period,కాలం ముగింపులో రద్దు చేయండి
-apps/erpnext/erpnext/education/doctype/instructor/instructor.py,Please setup Instructor Naming System in Education &gt; Education Settings,దయచేసి విద్య&gt; విద్య సెట్టింగులలో బోధకుడు నామకరణ వ్యవస్థను సెటప్ చేయండి
 apps/erpnext/erpnext/hr/doctype/employee_promotion/employee_promotion.js,Property already added,ఆస్తి ఇప్పటికే జోడించబడింది
 DocType: Item Supplier,Item Supplier,అంశం సరఫరాదారు
 apps/erpnext/erpnext/public/js/controllers/transaction.js,Please enter Item Code to get batch no,బ్యాచ్ ఏ పొందడానికి అంశం కోడ్ను నమోదు చేయండి
@@ -4515,6 +4513,7 @@
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.js,Warning: Material Requested Qty is less than Minimum Order Qty,హెచ్చరిక: Qty అభ్యర్థించిన మెటీరియల్ కనీస ఆర్డర్ ప్యాక్ చేసిన అంశాల కంటే తక్కువ
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py,Account {0} is frozen,ఖాతా {0} ఘనీభవించిన
 DocType: Quiz Question,Quiz Question,క్విజ్ ప్రశ్న
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Supplier &gt; Supplier Type,సరఫరాదారు&gt; సరఫరాదారు రకం
 DocType: Company,Legal Entity / Subsidiary with a separate Chart of Accounts belonging to the Organization.,సంస్థ చెందిన ఖాతాల ప్రత్యేక చార్ట్ తో లీగల్ సంస్థ / అనుబంధ.
 DocType: Payment Request,Mute Email,మ్యూట్ ఇమెయిల్
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py,"Food, Beverage & Tobacco","ఫుడ్, బేవరేజ్ పొగాకు"
@@ -5018,7 +5017,6 @@
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py,Delivery warehouse required for stock item {0},డెలివరీ గిడ్డంగి స్టాక్ అంశం అవసరం {0}
 DocType: Packing Slip,The gross weight of the package. Usually net weight + packaging material weight. (for print),ప్యాకేజీ యొక్క స్థూల బరువు. సాధారణంగా నికర బరువు + ప్యాకేజింగ్ పదార్థం బరువు. (ముద్రణ కోసం)
 DocType: Assessment Plan,Program,ప్రోగ్రామ్
-apps/erpnext/erpnext/hr/doctype/employee/employee.py,Please setup Employee Naming System in Human Resource &gt; HR Settings,దయచేసి మానవ వనరులు&gt; హెచ్ ఆర్ సెట్టింగులలో ఉద్యోగుల నామకరణ వ్యవస్థను సెటప్ చేయండి
 DocType: Accounts Settings,Users with this role are allowed to set frozen accounts and create / modify accounting entries against frozen accounts,ఈ పాత్ర తో వినియోగదారులు ఘనీభవించిన ఖాతాల వ్యతిరేకంగా అకౌంటింగ్ ఎంట్రీలు ఘనీభవించిన ఖాతాల సెట్ మరియు సృష్టించడానికి / సవరించడానికి అనుమతించింది ఉంటాయి
 ,Project Billing Summary,ప్రాజెక్ట్ బిల్లింగ్ సారాంశం
 DocType: Vital Signs,Cuts,కోతలు
@@ -5361,6 +5359,8 @@
 apps/erpnext/erpnext/accounts/doctype/monthly_distribution/monthly_distribution.py,Percentage Allocation should be equal to 100%,శాతం కేటాయింపు 100% సమానంగా ఉండాలి
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js,Please select Posting Date before selecting Party,దయచేసి పార్టీ ఎంచుకోవడం ముందు పోస్టింగ్ తేదిని ఎంచుకోండి
 apps/erpnext/erpnext/config/accounting.py,Payment Terms based on conditions,షరతుల ఆధారంగా చెల్లింపు నిబంధనలు
+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: Program Enrollment,School House,స్కూల్ హౌస్
 DocType: Serial No,Out of AMC,AMC యొక్క అవుట్
 DocType: Opportunity,Opportunity Amount,అవకాశం మొత్తం
@@ -5561,6 +5561,7 @@
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py,Order/Quot %,ఆర్డర్ / QUOT%
 apps/erpnext/erpnext/config/healthcare.py,Record Patient Vitals,రికార్డ్ పేషెంట్ వైల్ట్లు
 DocType: Fee Schedule,Institution,ఇన్స్టిట్యూషన్
+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: Asset,Partially Depreciated,పాక్షికంగా సింధియా
 DocType: Issue,Opening Time,ప్రారంభ సమయం
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py,From and To dates required,నుండి మరియు అవసరమైన తేదీలు
@@ -5777,6 +5778,7 @@
 DocType: Quality Procedure Process,Link existing Quality Procedure.,ఇప్పటికే ఉన్న నాణ్యతా విధానాన్ని లింక్ చేయండి.
 apps/erpnext/erpnext/config/hr.py,Loans,రుణాలు
 DocType: Healthcare Service Unit,Healthcare Service Unit,హెల్త్కేర్ సర్వీస్ యూనిట్
+,Customer-wise Item Price,కస్టమర్ల వారీగా వస్తువు ధర
 apps/erpnext/erpnext/public/js/financial_statements.js,Cash Flow Statement,లావాదేవి నివేదిక
 apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.py,No material request created,విషయం అభ్యర్థన సృష్టించబడలేదు
 apps/erpnext/erpnext/hr/doctype/loan_application/loan_application.py,Loan Amount cannot exceed Maximum Loan Amount of {0},రుణ మొత్తం గరిష్ట రుణ మొత్తం మించకూడదు {0}
@@ -6041,6 +6043,7 @@
 apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py,Opening Value,ఓపెనింగ్ విలువ
 DocType: Salary Component,Formula,ఫార్ములా
 apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py,Serial #,సీరియల్ #
+apps/erpnext/erpnext/hr/doctype/employee/employee.py,Please setup Employee Naming System in Human Resource &gt; HR Settings,దయచేసి మానవ వనరులు&gt; హెచ్ ఆర్ సెట్టింగులలో ఉద్యోగుల నామకరణ వ్యవస్థను సెటప్ చేయండి
 DocType: Material Request Plan Item,Required Quantity,అవసరమైన పరిమాణం
 DocType: Lab Test Template,Lab Test Template,ల్యాబ్ టెస్ట్ మూస
 apps/erpnext/erpnext/setup/doctype/company/company.py,Sales Account,సేల్స్ ఖాతా
@@ -6284,7 +6287,6 @@
 DocType: Request for Quotation Item,Project Name,ప్రాజెక్ట్ పేరు
 apps/erpnext/erpnext/regional/italy/utils.py,Please set the Customer Address,దయచేసి కస్టమర్ చిరునామాను సెట్ చేయండి
 DocType: Customer,Mention if non-standard receivable account,మెన్షన్ ప్రామాణికం కాని స్వీకరించదగిన ఖాతా ఉంటే
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Customer &gt; Customer Group &gt; Territory,కస్టమర్&gt; కస్టమర్ గ్రూప్&gt; భూభాగం
 DocType: Bank,Plaid Access Token,ప్లాయిడ్ యాక్సెస్ టోకెన్
 apps/erpnext/erpnext/hr/doctype/employee_benefit_application/employee_benefit_application.py,Please add the remaining benefits {0} to any of the existing component,దయచేసి ప్రస్తుతం ఉన్న ఏవైనా అంశానికి మిగిలిన ప్రయోజనాలను {0} జోడించండి
 DocType: Journal Entry Account,If Income or Expense,ఆదాయం వ్యయం ఉంటే
@@ -6543,8 +6545,6 @@
 apps/erpnext/erpnext/buying/utils.py,Please enter quantity for Item {0},అంశం పరిమాణం నమోదు చేయండి {0}
 DocType: Quality Procedure,Processes,ప్రాసెసెస్
 DocType: Shift Type,First Check-in and Last Check-out,మొదటి చెక్-ఇన్ మరియు చివరి చెక్-అవుట్
-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/regional/report/hsn_wise_summary_of_outward_supplies/hsn_wise_summary_of_outward_supplies.py,Total Taxable Amount,మొత్తం పన్ను చెల్లింపు మొత్తం
 DocType: Employee External Work History,Employee External Work History,Employee బాహ్య వర్క్ చరిత్ర
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.py,Job card {0} created,ఉద్యోగ కార్డు {0} సృష్టించబడింది
@@ -6581,6 +6581,7 @@
 apps/erpnext/erpnext/accounts/doctype/payment_terms_template/payment_terms_template.py,Combined invoice portion must equal 100%,కలిపి ఇన్వాయిస్ భాగం తప్పక 100%
 DocType: Item Default,Default Expense Account,డిఫాల్ట్ వ్యయం ఖాతా
 DocType: GST Account,CGST Account,CGST ఖాతా
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Item Code &gt; Item Group &gt; Brand,ఐటెమ్ కోడ్&gt; ఐటమ్ గ్రూప్&gt; బ్రాండ్
 apps/erpnext/erpnext/education/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py,Student Email ID,స్టూడెంట్ అడ్రెస్
 DocType: Employee,Notice (days),నోటీసు (రోజులు)
 DocType: POS Closing Voucher Invoices,POS Closing Voucher Invoices,POS మూసివేత రసీదు ఇన్వాయిస్లు
@@ -7136,6 +7137,7 @@
 DocType: Vital Signs,Coated,కోటెడ్
 apps/erpnext/erpnext/assets/doctype/asset/asset.py,Row {0}: Expected Value After Useful Life must be less than Gross Purchase Amount,రో {0}: ఉపయోగకరమైన లైఫ్ తర్వాత ఊహించిన విలువ తప్పనిసరిగా స్థూల కొనుగోలు మొత్తం కంటే తక్కువగా ఉండాలి
 DocType: GoCardless Settings,GoCardless Settings,GoCardless సెట్టింగులు
+apps/erpnext/erpnext/controllers/stock_controller.py,Create Quality Inspection for Item {0},అంశం {0} కోసం నాణ్యత తనిఖీని సృష్టించండి
 DocType: Leave Block List,Leave Block List Name,బ్లాక్ జాబితా వదిలి పేరు
 DocType: Certified Consultant,Certification Validity,సర్టిఫికేషన్ చెల్లుబాటు
 apps/erpnext/erpnext/hr/doctype/vehicle/vehicle.py,Insurance Start date should be less than Insurance End date,భీమా తేదీ ప్రారంభించండి భీమా ముగింపు తేదీ కంటే తక్కువ ఉండాలి
@@ -7216,6 +7218,7 @@
 DocType: Maintenance Visit,Maintenance Date,నిర్వహణ తేదీ
 DocType: Purchase Invoice Item,Rejected Serial No,తిరస్కరించబడిన సీరియల్ లేవు
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py,Year start date or end date is overlapping with {0}. To avoid please set company,ఇయర్ ప్రారంభ తేదీ లేదా ముగింపు తేదీ {0} ఓవర్ల్యాప్ ఉంది. నివారించేందుకు కంపెనీని స్థాపించారు దయచేసి
+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/selling/doctype/customer/customer.py,Please mention the Lead Name in Lead {0},దయచేసి లీడ్ లో లీడ్ పేరును ప్రస్తావించండి {0}
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py,Start date should be less than end date for Item {0},అంశం కోసం ముగింపు తేదీ కంటే తక్కువ ఉండాలి తేదీ ప్రారంభించండి {0}
 DocType: Shift Type,Auto Attendance Settings,ఆటో హాజరు సెట్టింగ్‌లు
diff --git a/erpnext/translations/th.csv b/erpnext/translations/th.csv
index bfa3df2..8c7dd85 100644
--- a/erpnext/translations/th.csv
+++ b/erpnext/translations/th.csv
@@ -168,7 +168,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py,Accountant,นักบัญชี
 apps/erpnext/erpnext/stock/report/item_price_stock/item_price_stock.py,Selling Price List,รายการราคาขาย
 DocType: Patient,Tobacco Current Use,การใช้ในปัจจุบันของยาสูบ
-apps/erpnext/erpnext/stock/report/item_price_stock/item_price_stock.py,Selling Rate,ราคาขาย
+apps/erpnext/erpnext/selling/report/customer_wise_item_price/customer_wise_item_price.py,Selling Rate,ราคาขาย
 apps/erpnext/erpnext/erpnext_integrations/doctype/plaid_settings/plaid_settings.js,Please save your document before adding a new account,โปรดบันทึกเอกสารของคุณก่อนที่จะเพิ่มบัญชีใหม่
 DocType: Cost Center,Stock User,หุ้นผู้ใช้
 DocType: Soil Analysis,(Ca+Mg)/K,(Ca + Mg) / K
@@ -205,7 +205,6 @@
 DocType: Packed Item,Parent Detail docname,docname รายละเอียดผู้ปกครอง
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py,"Reference: {0}, Item Code: {1} and Customer: {2}",ข้อมูลอ้างอิง: {0} รหัสรายการ: {1} และลูกค้า: {2}
 apps/erpnext/erpnext/accounts/report/consolidated_financial_statement/consolidated_financial_statement.py,{0} {1} is not present in the parent company,{0} {1} ไม่มีอยู่ใน บริษัท แม่
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Supplier &gt; Supplier Type,ผู้ผลิต&gt; ประเภทผู้จำหน่าย
 apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py,Trial Period End Date Cannot be before Trial Period Start Date,วันสิ้นสุดของรอบระยะทดลองไม่สามารถเป็นได้ก่อนวันที่เริ่มทดลองใช้
 apps/erpnext/erpnext/utilities/user_progress.py,Kg,กิโลกรัม
 DocType: Tax Withholding Category,Tax Withholding Category,ประเภทหัก ณ ที่จ่ายภาษี
@@ -319,6 +318,7 @@
 DocType: Quality Procedure Table,Responsible Individual,บุคคลที่รับผิดชอบ
 DocType: Naming Series,Prefix,อุปสรรค
 apps/erpnext/erpnext/hr/notification/training_scheduled/training_scheduled.html,Event Location,สถานที่จัดงาน
+apps/erpnext/erpnext/selling/report/customer_wise_item_price/customer_wise_item_price.py,Available Stock,สต็อกที่มีอยู่
 DocType: Asset Settings,Asset Settings,การตั้งค่าเนื้อหา
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py,Consumable,วัสดุสิ้นเปลือง
 DocType: Student,B-,B-
@@ -352,6 +352,7 @@
 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 \
 				Serial No.",ไม่สามารถรับรองการส่งมอบโดย Serial No เป็น \ Item {0} ถูกเพิ่มด้วยและโดยไม่ต้องแน่ใจว่ามีการจัดส่งโดย \ Serial No.
+apps/erpnext/erpnext/education/doctype/instructor/instructor.py,Please setup Instructor Naming System in Education &gt; Education Settings,โปรดตั้งค่าระบบการตั้งชื่อผู้สอนในด้านการศึกษา&gt; การตั้งค่าการศึกษา
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py,At least one mode of payment is required for POS invoice.,อย่างน้อยหนึ่งโหมดการชำระเงินเป็นสิ่งจำเป็นสำหรับใบแจ้งหนี้ จุดขาย
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py,Batch no is required for batched item {0},ไม่ต้องแบทช์สำหรับรายการที่แบทช์ {0}
 DocType: Bank Statement Transaction Invoice Item,Bank Statement Transaction Invoice Item,รายการใบแจ้งรายการธุรกรรมของธนาคาร
@@ -880,7 +881,6 @@
 DocType: Vital Signs,Blood Pressure (systolic),ความดันโลหิต (systolic)
 apps/erpnext/erpnext/controllers/buying_controller.py,{0} {1} is {2},{0} {1} คือ {2}
 DocType: Item Price,Valid Upto,ที่ถูกต้องไม่เกิน
-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: Training Event,Workshop,โรงงาน
 DocType: Supplier Scorecard Scoring Standing,Warn Purchase Orders,เตือนคำสั่งซื้อ
 apps/erpnext/erpnext/utilities/user_progress.py,List a few of your customers. They could be organizations or individuals.,รายการ บางส่วนของ ลูกค้าของคุณ พวกเขาจะเป็น องค์กร หรือบุคคล
@@ -1691,7 +1691,6 @@
 DocType: Item Barcode,Item Barcode,บาร์โค้ดสินค้า
 DocType: Delivery Trip,In Transit,กำลังเดินทาง
 DocType: Woocommerce Settings,Endpoints,ปลายทาง
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Item Code &gt; Item Group &gt; Brand,รหัสรายการ&gt; กลุ่มรายการ&gt; แบรนด์
 DocType: Shopping Cart Settings,Show Configure Button,แสดงปุ่มกำหนดค่า
 DocType: Quality Inspection Reading,Reading 6,Reading 6
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js,Cannot {0} {1} {2} without any negative outstanding invoice,ไม่สามารถ {0} {1} {2} โดยไม่ต้องมีใบแจ้งหนี้ที่โดดเด่นในเชิงลบ
@@ -2055,6 +2054,7 @@
 DocType: Cheque Print Template,Payer Settings,การตั้งค่าการชำระเงิน
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js,No pending Material Requests found to link for the given items.,ไม่พบคำร้องขอวัสดุที่รอการค้นหาสำหรับรายการที่ระบุ
 apps/erpnext/erpnext/public/js/utils/party.js,Select company first,เลือก บริษัท ก่อน
+apps/erpnext/erpnext/accounts/general_ledger.py,Account: <b>{0}</b> is capital Work in progress and can not be updated by Journal Entry,บัญชี: <b>{0}</b> เป็นงานที่อยู่ระหว่างดำเนินการและไม่สามารถอัพเดตได้โดยรายการบันทึก
 apps/erpnext/erpnext/education/doctype/quiz/quiz.py,Compare List function takes on list arguments,ฟังก์ชั่นรายการเปรียบเทียบใช้เวลาในรายการอาร์กิวเมนต์
 DocType: Item Attribute Value,"This will be appended to the Item Code of the variant. For example, if your abbreviation is ""SM"", and the item code is ""T-SHIRT"", the item code of the variant will be ""T-SHIRT-SM""","นี้จะถูกผนวกเข้ากับรหัสสินค้าของตัวแปร ตัวอย่างเช่นถ้าย่อของคุณคือ ""เอสเอ็ม"" และรหัสรายการคือ ""เสื้อยืด"" รหัสรายการของตัวแปรจะเป็น ""เสื้อ-SM"""
 DocType: Salary Slip,Net Pay (in words) will be visible once you save the Salary Slip.,จ่ายสุทธิ (คำ) จะสามารถมองเห็นได้เมื่อคุณบันทึกสลิปเงินเดือน
@@ -2241,6 +2241,7 @@
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js,Item 2,รายการที่ 2
 DocType: Pricing Rule,Validate Applied Rule,ตรวจสอบกฎที่ใช้
 DocType: QuickBooks Migrator,Authorization Endpoint,Endpoint การให้สิทธิ์
+DocType: Employee Onboarding,Notify users by email,แจ้งผู้ใช้ทางอีเมล
 DocType: Travel Request,International,ระหว่างประเทศ
 DocType: Training Event,Training Event,กิจกรรมการฝึกอบรม
 DocType: Item,Auto re-order,Auto สั่งซื้อใหม่
@@ -2855,7 +2856,6 @@
 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,มีลูกค้าที่มีชื่อเดียวกันอยู่แล้ว
-DocType: Contract,Inactive,เฉื่อยชา
 apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.js,This will submit Salary Slips and create accrual Journal Entry. Do you want to proceed?,การดำเนินการนี้จะส่งสลากเงินเดือนและสร้างสมุดบันทึกรายวันคงค้าง คุณต้องการดำเนินการต่อหรือไม่?
 DocType: Purchase Invoice,Total Net Weight,น้ำหนักสุทธิรวม
 DocType: Purchase Order,Order Confirmation No,หมายเลขคำยืนยันการสั่งซื้อ
@@ -3138,7 +3138,6 @@
 apps/erpnext/erpnext/accounts/party.py,Billing currency must be equal to either default company's currency or party account currency,สกุลเงินการเรียกเก็บเงินต้องเท่ากับสกุลเงินของ บริษัท หรือสกุลเงินของ บริษัท ที่เป็นค่าเริ่มต้น
 DocType: Packing Slip,Indicates that the package is a part of this delivery (Only Draft),แสดงให้เห็นว่าแพคเกจเป็นส่วนหนึ่งของการส่งมอบนี้ (เฉพาะร่าง)
 apps/erpnext/erpnext/accounts/report/customer_ledger_summary/customer_ledger_summary.py,Closing Balance,ยอดปิด
-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: Soil Texture,Loam,พื้นที่อันอุดมสมบูรณ์
 apps/erpnext/erpnext/controllers/accounts_controller.py,Row {0}: Due Date cannot be before posting date,แถว {0}: วันครบกำหนดไม่สามารถเป็นได้ก่อนวันที่ผ่านรายการ
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py,Quantity for Item {0} must be less than {1},ปริมาณ รายการ {0} ต้องน้อยกว่า {1}
@@ -3668,7 +3667,6 @@
 DocType: Stock Settings,Raise Material Request when stock reaches re-order level,ยกคำขอวัสดุเมื่อหุ้นถึงระดับใหม่สั่ง
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py,Full-time,เต็มเวลา
 DocType: Payroll Entry,Employees,พนักงาน
-apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py,Please setup numbering series for Attendance via Setup &gt; Numbering Series,โปรดตั้งค่าหมายเลขลำดับสำหรับการเข้าร่วมผ่านการตั้งค่า&gt; ลำดับเลข
 DocType: Question,Single Correct Answer,คำตอบที่ถูกต้องเดียว
 DocType: Employee,Contact Details,รายละเอียดการติดต่อ
 DocType: C-Form,Received Date,วันที่ได้รับ
@@ -4304,6 +4302,7 @@
 DocType: Pricing Rule,Price or Product Discount,ราคาหรือส่วนลดสินค้า
 apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.py,For row {0}: Enter planned qty,สำหรับแถว {0}: ป้อนจำนวนที่วางแผนไว้
 DocType: Account,Income Account,บัญชีรายได้
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Customer &gt; Customer Group &gt; Territory,ลูกค้า&gt; กลุ่มลูกค้า&gt; อาณาเขต
 DocType: Payment Request,Amount in customer's currency,จำนวนเงินในสกุลเงินของลูกค้า
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js,Delivery,การจัดส่งสินค้า
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.py,Assigning Structures...,การกำหนดโครงสร้าง ...
@@ -4353,7 +4352,6 @@
 DocType: HR Settings,Check Vacancies On Job Offer Creation,ตรวจสอบตำแหน่งว่างในการสร้างข้อเสนองาน
 apps/erpnext/erpnext/utilities/user_progress.py,Go to Letterheads,ไปที่หัวจดหมาย
 DocType: Subscription,Cancel At End Of Period,ยกเลิกเมื่อสิ้นสุดระยะเวลา
-apps/erpnext/erpnext/education/doctype/instructor/instructor.py,Please setup Instructor Naming System in Education &gt; Education Settings,โปรดตั้งค่าระบบการตั้งชื่อผู้สอนในด้านการศึกษา&gt; การตั้งค่าการศึกษา
 apps/erpnext/erpnext/hr/doctype/employee_promotion/employee_promotion.js,Property already added,เพิ่มคุณสมบัติแล้ว
 DocType: Item Supplier,Item Supplier,ผู้ผลิตรายการ
 apps/erpnext/erpnext/public/js/controllers/transaction.js,Please enter Item Code to get batch no,กรุณากรอก รหัสสินค้า ที่จะได้รับ ชุด ไม่
@@ -4651,6 +4649,7 @@
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.js,Warning: Material Requested Qty is less than Minimum Order Qty,คำเตือน: ขอ วัสดุ จำนวน น้อยกว่า จำนวน สั่งซื้อขั้นต่ำ
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py,Account {0} is frozen,บัญชี {0} จะถูก แช่แข็ง
 DocType: Quiz Question,Quiz Question,คำถามตอบคำถาม
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Supplier &gt; Supplier Type,ผู้ผลิต&gt; ประเภทผู้จัดจำหน่าย
 DocType: Company,Legal Entity / Subsidiary with a separate Chart of Accounts belonging to the Organization.,นิติบุคคล / สาขา ที่มีผังบัญชีแยกกัน ภายใต้องค์กร
 DocType: Payment Request,Mute Email,ปิดเสียงอีเมล์
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py,"Food, Beverage & Tobacco","อาหาร, เครื่องดื่ม และ ยาสูบ"
@@ -5167,7 +5166,6 @@
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py,Delivery warehouse required for stock item {0},คลังสินค้าจัดส่งสินค้าที่จำเป็นสำหรับรายการหุ้น {0}
 DocType: Packing Slip,The gross weight of the package. Usually net weight + packaging material weight. (for print),น้ำหนักรวมของแพคเกจ น้ำหนักสุทธิปกติ + น้ำหนักวัสดุบรรจุภัณฑ์ (สำหรับพิมพ์)
 DocType: Assessment Plan,Program,โครงการ
-apps/erpnext/erpnext/hr/doctype/employee/employee.py,Please setup Employee Naming System in Human Resource &gt; HR Settings,โปรดตั้งค่าระบบการตั้งชื่อพนักงานในทรัพยากรมนุษย์&gt; การตั้งค่าทรัพยากรบุคคล
 DocType: Accounts Settings,Users with this role are allowed to set frozen accounts and create / modify accounting entries against frozen accounts,ผู้ใช้ที่มี บทบาทนี้ ได้รับอนุญาตให้ตั้ง บัญชีแช่แข็งและ สร้าง / แก้ไข รายการบัญชี ในบัญชีแช่แข็ง
 ,Project Billing Summary,สรุปการเรียกเก็บเงินโครงการ
 DocType: Vital Signs,Cuts,ตัด
@@ -5418,6 +5416,7 @@
 apps/erpnext/erpnext/quality_management/doctype/quality_review/quality_review_list.js,No Action,ไม่มีการตอบสนอง
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js,Valuation type charges can not marked as Inclusive,ค่าใช้จ่ายประเภทการประเมินไม่สามารถทำเครื่องหมายเป็น Inclusive
 DocType: POS Profile,Update Stock,อัพเดทสต็อก
+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/stock/doctype/packing_slip/packing_slip.js,Different UOM for items will lead to incorrect (Total) Net Weight value. Make sure that Net Weight of each item is in the same UOM.,UOM ที่แตกต่างกัน สำหรับรายการที่ จะ นำไปสู่การ ที่ไม่ถูกต้อง ( รวม ) ค่า น้ำหนักสุทธิ ให้แน่ใจว่า น้ำหนักสุทธิ ของแต่ละรายการ ที่อยู่ในUOM เดียวกัน
 DocType: Certification Application,Payment Details,รายละเอียดการชำระเงิน
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py,BOM Rate,อัตรา BOM
@@ -5523,6 +5522,8 @@
 apps/erpnext/erpnext/accounts/doctype/monthly_distribution/monthly_distribution.py,Percentage Allocation should be equal to 100%,ร้อยละ จัดสรร ควรจะเท่ากับ 100%
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js,Please select Posting Date before selecting Party,กรุณาเลือกวันที่โพสต์ก่อนที่จะเลือกพรรค
 apps/erpnext/erpnext/config/accounting.py,Payment Terms based on conditions,เงื่อนไขการชำระเงินตามเงื่อนไข
+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: Program Enrollment,School House,โรงเรียนบ้าน
 DocType: Serial No,Out of AMC,ออกของ AMC
 DocType: Opportunity,Opportunity Amount,จำนวนโอกาส
@@ -5726,6 +5727,7 @@
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py,Order/Quot %,คำสั่งซื้อ / Quot%
 apps/erpnext/erpnext/config/healthcare.py,Record Patient Vitals,บันทึกข้อมูลผู้ป่วย
 DocType: Fee Schedule,Institution,สถาบัน
+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: Asset,Partially Depreciated,Depreciated บางส่วน
 DocType: Issue,Opening Time,เปิดเวลา
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py,From and To dates required,จากและถึง วันที่คุณต้องการ
@@ -5945,6 +5947,7 @@
 DocType: Quality Procedure Process,Link existing Quality Procedure.,เชื่อมโยงกระบวนการคุณภาพที่มีอยู่
 apps/erpnext/erpnext/config/hr.py,Loans,เงินให้กู้ยืม
 DocType: Healthcare Service Unit,Healthcare Service Unit,หน่วยบริการด้านการดูแลสุขภาพ
+,Customer-wise Item Price,ราคารายการลูกค้าฉลาด
 apps/erpnext/erpnext/public/js/financial_statements.js,Cash Flow Statement,งบกระแสเงินสด
 apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.py,No material request created,ไม่ได้สร้างคำขอเนื้อหา
 apps/erpnext/erpnext/hr/doctype/loan_application/loan_application.py,Loan Amount cannot exceed Maximum Loan Amount of {0},วงเงินกู้ไม่เกินจำนวนเงินกู้สูงสุดของ {0}
@@ -6211,6 +6214,7 @@
 apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py,Opening Value,ราคาเปิด
 DocType: Salary Component,Formula,สูตร
 apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py,Serial #,Serial #
+apps/erpnext/erpnext/hr/doctype/employee/employee.py,Please setup Employee Naming System in Human Resource &gt; HR Settings,โปรดตั้งค่าระบบการตั้งชื่อพนักงานในทรัพยากรมนุษย์&gt; การตั้งค่าทรัพยากรบุคคล
 DocType: Material Request Plan Item,Required Quantity,ปริมาณที่ต้องการ
 DocType: Lab Test Template,Lab Test Template,เทมเพลตการทดสอบ Lab
 apps/erpnext/erpnext/accounts/doctype/accounting_period/accounting_period.py,Accounting Period overlaps with {0},รอบระยะเวลาบัญชีทับซ้อนกับ {0}
@@ -6461,7 +6465,6 @@
 DocType: Request for Quotation Item,Project Name,ชื่อโครงการ
 apps/erpnext/erpnext/regional/italy/utils.py,Please set the Customer Address,กรุณาตั้งที่อยู่ลูกค้า
 DocType: Customer,Mention if non-standard receivable account,ถ้าพูดถึงไม่ได้มาตรฐานบัญชีลูกหนี้
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Customer &gt; Customer Group &gt; Territory,ลูกค้า&gt; กลุ่มลูกค้า&gt; อาณาเขต
 DocType: Bank,Plaid Access Token,โทเค็นการเข้าถึง Plaid
 apps/erpnext/erpnext/hr/doctype/employee_benefit_application/employee_benefit_application.py,Please add the remaining benefits {0} to any of the existing component,โปรดเพิ่มผลประโยชน์ที่เหลือ {0} ให้กับคอมโพเนนต์ใด ๆ ที่มีอยู่
 DocType: Journal Entry Account,If Income or Expense,ถ้ารายได้หรือค่าใช้จ่าย
@@ -6725,8 +6728,6 @@
 apps/erpnext/erpnext/buying/utils.py,Please enter quantity for Item {0},กรุณากรอก ปริมาณ รายการ {0}
 DocType: Quality Procedure,Processes,กระบวนการ
 DocType: Shift Type,First Check-in and Last Check-out,เช็คอินครั้งแรกและเช็คเอาท์ครั้งสุดท้าย
-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/regional/report/hsn_wise_summary_of_outward_supplies/hsn_wise_summary_of_outward_supplies.py,Total Taxable Amount,จำนวนเงินที่ต้องเสียภาษีทั้งหมด
 DocType: Employee External Work History,Employee External Work History,ประวัติการทำงานของพนักงานภายนอก
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.py,Job card {0} created,สร้างการ์ดงาน {0} แล้ว
@@ -6763,6 +6764,7 @@
 apps/erpnext/erpnext/accounts/doctype/payment_terms_template/payment_terms_template.py,Combined invoice portion must equal 100%,ส่วนใบแจ้งหนี้รวมต้องเท่ากับ 100%
 DocType: Item Default,Default Expense Account,บัญชีค่าใช้จ่ายเริ่มต้น
 DocType: GST Account,CGST Account,บัญชี CGST
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Item Code &gt; Item Group &gt; Brand,รหัสรายการ&gt; กลุ่มรายการ&gt; แบรนด์
 apps/erpnext/erpnext/education/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py,Student Email ID,อีเมล์ ID นักศึกษา
 DocType: Employee,Notice (days),แจ้งให้ทราบล่วงหน้า (วัน)
 DocType: POS Closing Voucher Invoices,POS Closing Voucher Invoices,POS ใบแจ้งหนี้ปิดบัญชี
@@ -7406,6 +7408,7 @@
 DocType: Maintenance Visit,Maintenance Date,วันที่ทำการบำรุงรักษา
 DocType: Purchase Invoice Item,Rejected Serial No,หมายเลขเครื่องปฏิเสธ
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py,Year start date or end date is overlapping with {0}. To avoid please set company,ปีวันเริ่มต้นหรือวันที่สิ้นสุดอยู่ที่ทับซ้อนกันด้วย {0} เพื่อหลีกเลี่ยงการโปรดตั้ง บริษัท
+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/selling/doctype/customer/customer.py,Please mention the Lead Name in Lead {0},โปรดระบุชื่อตะกั่วในผู้นำ {0}
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py,Start date should be less than end date for Item {0},วันที่เริ่มต้น ควรจะน้อยกว่า วันที่ สิ้นสุดสำหรับ รายการ {0}
 DocType: Shift Type,Auto Attendance Settings,การตั้งค่าการเข้าร่วมอัตโนมัติ
diff --git a/erpnext/translations/tr.csv b/erpnext/translations/tr.csv
index 2350522..2153d06 100644
--- a/erpnext/translations/tr.csv
+++ b/erpnext/translations/tr.csv
@@ -184,7 +184,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py,Accountant,Muhasebeci
 apps/erpnext/erpnext/stock/report/item_price_stock/item_price_stock.py,Selling Price List,Satış Fiyatı Listesi
 DocType: Patient,Tobacco Current Use,Tütün Mevcut Kullanımı
-apps/erpnext/erpnext/stock/report/item_price_stock/item_price_stock.py,Selling Rate,Satış oranı
+apps/erpnext/erpnext/selling/report/customer_wise_item_price/customer_wise_item_price.py,Selling Rate,Satış oranı
 apps/erpnext/erpnext/erpnext_integrations/doctype/plaid_settings/plaid_settings.js,Please save your document before adding a new account,Lütfen yeni bir hesap eklemeden önce belgenizi kaydedin
 DocType: Cost Center,Stock User,Hisse Senedi Kullanıcı
 DocType: Soil Analysis,(Ca+Mg)/K,(Ca+Mg)/K
@@ -223,7 +223,6 @@
 DocType: Packed Item,Parent Detail docname,Ana Detay belgesi adı
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py,"Reference: {0}, Item Code: {1} and Customer: {2}","Referans: {0}, Ürün Kodu: {1} ve Müşteri: {2}"
 apps/erpnext/erpnext/accounts/report/consolidated_financial_statement/consolidated_financial_statement.py,{0} {1} is not present in the parent company,{0} {1} ana şirkette mevcut değil
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Supplier &gt; Supplier Type,Tedarikçi&gt; Tedarikçi Tipi
 apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py,Trial Period End Date Cannot be before Trial Period Start Date,Deneme Süresi Bitiş Tarihi Deneme Süresi Başlangıç Tarihinden önce olamaz
 apps/erpnext/erpnext/utilities/user_progress.py,Kg,Kilogram
 apps/erpnext/erpnext/utilities/user_progress.py,Kg,Kilogram
@@ -347,6 +346,7 @@
 DocType: Naming Series,Prefix,Önek
 DocType: Naming Series,Prefix,Önek
 apps/erpnext/erpnext/hr/notification/training_scheduled/training_scheduled.html,Event Location,Etkinlik Yeri
+apps/erpnext/erpnext/selling/report/customer_wise_item_price/customer_wise_item_price.py,Available Stock,Mevcut stok
 DocType: Asset Settings,Asset Settings,Varlık Ayarları
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py,Consumable,Tüketilir
 DocType: Student,B-,B-
@@ -381,6 +381,7 @@
 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 \
 				Serial No.","Serial No ile teslim edilemedi \ Item {0}, \ Serial No."
+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/accounts/doctype/sales_invoice/sales_invoice.py,At least one mode of payment is required for POS invoice.,Ödeme en az bir mod POS fatura için gereklidir.
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py,Batch no is required for batched item {0},Toplu iş {0} toplu öğesi için gerekli
 DocType: Bank Statement Transaction Invoice Item,Bank Statement Transaction Invoice Item,Banka ekstresi İşlem Fatura Öğesi
@@ -952,7 +953,6 @@
 DocType: Vital Signs,Blood Pressure (systolic),Kan Basıncı (sistolik)
 apps/erpnext/erpnext/controllers/buying_controller.py,{0} {1} is {2},"{0} {1}, {2}"
 DocType: Item Price,Valid Upto,Tarihine kadar geçerli
-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: Training Event,Workshop,Atölye
 DocType: Supplier Scorecard Scoring Standing,Warn Purchase Orders,Satınalma Siparişlerini Uyarın
 apps/erpnext/erpnext/utilities/user_progress.py,List a few of your customers. They could be organizations or individuals.,Müşterilerinizin birkaçını listeleyin. Bunlar kuruluşlar veya bireyler olabilir.
@@ -1830,7 +1830,6 @@
 DocType: Item Barcode,Item Barcode,Ürün Barkodu
 DocType: Delivery Trip,In Transit,Transit olarak
 DocType: Woocommerce Settings,Endpoints,Endpoints
-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
 DocType: Shopping Cart Settings,Show Configure Button,Yapılandırma Düğmesini Göster
 DocType: Quality Inspection Reading,Reading 6,6 Okuma
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js,Cannot {0} {1} {2} without any negative outstanding invoice,değil {0} {1} {2} olmadan herhangi bir olumsuz ödenmemiş fatura Can
@@ -2219,6 +2218,7 @@
 DocType: Cheque Print Template,Payer Settings,ödeyici Ayarları
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js,No pending Material Requests found to link for the given items.,Verilen öğeler için bağlantı bekleyen herhangi bir Malzeme Talebi bulunamadı.
 apps/erpnext/erpnext/public/js/utils/party.js,Select company first,Önce şirketi seç
+apps/erpnext/erpnext/accounts/general_ledger.py,Account: <b>{0}</b> is capital Work in progress and can not be updated by Journal Entry,Hesap: <b>{0}</b> sermayedir Devam etmekte olan iş ve Journal Entry tarafından güncellenemez
 apps/erpnext/erpnext/education/doctype/quiz/quiz.py,Compare List function takes on list arguments,Karşılaştırma Listesi işlevi liste değişkenlerini alır
 DocType: Item Attribute Value,"This will be appended to the Item Code of the variant. For example, if your abbreviation is ""SM"", and the item code is ""T-SHIRT"", the item code of the variant will be ""T-SHIRT-SM""","Bu varyant Ürün Kodu eklenecektir. Senin kısaltması ""SM"", ve eğer, örneğin, ürün kodu ""T-Shirt"", ""T-Shirt-SM"" olacak varyantın madde kodu"
 DocType: Salary Slip,Net Pay (in words) will be visible once you save the Salary Slip.,Net Ödeme (sözlü) Maaş Makbuzunu kaydettiğinizde görünecektir
@@ -2417,6 +2417,7 @@
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js,Item 2,Madde 2
 DocType: Pricing Rule,Validate Applied Rule,Uygulanan Kuralı Doğrula
 DocType: QuickBooks Migrator,Authorization Endpoint,Yetkilendirme Bitiş Noktası
+DocType: Employee Onboarding,Notify users by email,Kullanıcıları e-postayla bilgilendir
 DocType: Travel Request,International,Uluslararası
 DocType: Training Event,Training Event,Eğitim Etkinlik
 DocType: Item,Auto re-order,Otomatik yeniden sipariş
@@ -3087,7 +3088,6 @@
 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
-DocType: Contract,Inactive,etkisiz
 apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.js,This will submit Salary Slips and create accrual Journal Entry. Do you want to proceed?,"Bu, Maaş Fişleri gönderecek ve Tahakkuk Dergisi Girişi oluşturacaktır. Devam etmek istiyor musunuz?"
 DocType: Purchase Invoice,Total Net Weight,Toplam net ağırlık
 DocType: Purchase Order,Order Confirmation No,Sipariş Onayı No
@@ -3389,7 +3389,6 @@
 apps/erpnext/erpnext/accounts/party.py,Billing currency must be equal to either default company's currency or party account currency,"Faturalandırma para birimi, varsayılan şirketin para birimi veya parti hesabı para birimine eşit olmalıdır"
 DocType: Packing Slip,Indicates that the package is a part of this delivery (Only Draft),Paketin bu teslimatın bir parçası olduğunu gösterir (Sadece Taslak)
 apps/erpnext/erpnext/accounts/report/customer_ledger_summary/customer_ledger_summary.py,Closing Balance,Kapanış bakiyesi
-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ı:
 DocType: Soil Texture,Loam,verimli toprak
 apps/erpnext/erpnext/controllers/accounts_controller.py,Row {0}: Due Date cannot be before posting date,Satır {0}: Teslim Tarihi gönderim tarihinden önce olamaz
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py,Quantity for Item {0} must be less than {1},Ürün {0} için miktar{1} den az olmalıdır
@@ -3962,7 +3961,6 @@
 DocType: Stock Settings,Raise Material Request when stock reaches re-order level,Stok yeniden sipariş düzeyine ulaştığında Malzeme talebinde bulun
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py,Full-time,Tam zamanlı
 DocType: Payroll Entry,Employees,Çalışanlar
-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: Question,Single Correct Answer,Tek Doğru Cevap
 DocType: Employee,Contact Details,İletişim Bilgileri
 DocType: C-Form,Received Date,Alınan Tarih
@@ -4641,6 +4639,7 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.py,For row {0}: Enter planned qty,{0} satırı için: Planlanan miktarı girin
 DocType: Account,Income Account,Gelir Hesabı
 DocType: Account,Income Account,Gelir Hesabı
+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: Payment Request,Amount in customer's currency,Müşterinin para miktarı
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js,Delivery,İrsaliye
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.py,Assigning Structures...,Yapılara ata...
@@ -4695,7 +4694,6 @@
 DocType: HR Settings,Check Vacancies On Job Offer Creation,İş Teklifi Oluşturma İşleminde Boşlukları Kontrol Edin
 apps/erpnext/erpnext/utilities/user_progress.py,Go to Letterheads,Antetli Kâğıtlara Git
 DocType: Subscription,Cancel At End Of Period,Dönem Sonunda İptal
-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/hr/doctype/employee_promotion/employee_promotion.js,Property already added,Özellik zaten eklendi
 DocType: Item Supplier,Item Supplier,Ürün Tedarikçisi
 DocType: Item Supplier,Item Supplier,Ürün Tedarikçisi
@@ -5014,6 +5012,7 @@
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py,Account {0} is frozen,Hesap {0} dondurulmuş
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py,Account {0} is frozen,Hesap {0} donduruldu
 DocType: Quiz Question,Quiz Question,Sınav Sorusu
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Supplier &gt; Supplier Type,Tedarikçi&gt; Tedarikçi Tipi
 DocType: Company,Legal Entity / Subsidiary with a separate Chart of Accounts belonging to the Organization.,Örgüte ait Hesap ayrı Planı Tüzel Kişilik / Yardımcı.
 DocType: Payment Request,Mute Email,E-postayı Sessize Al
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py,"Food, Beverage & Tobacco","Gıda, İçecek ve Tütün"
@@ -5568,7 +5567,6 @@
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py,Delivery warehouse required for stock item {0},Teslim depo stok kalemi için gerekli {0}
 DocType: Packing Slip,The gross weight of the package. Usually net weight + packaging material weight. (for print),Paketin brüt ağırlığı. Genellikle net ağırlığı + ambalaj Ürünü ağırlığı. (Baskı için)
 DocType: Assessment Plan,Program,program
-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: Accounts Settings,Users with this role are allowed to set frozen accounts and create / modify accounting entries against frozen accounts,Bu role sahip kullanıcıların dondurulmuş hesapları ayarlama ve dondurulmuş hesaplara karşı muhasebe girdileri oluşturma/düzenleme yetkileri vardır
 ,Project Billing Summary,Proje Fatura Özeti
 DocType: Vital Signs,Cuts,keser
@@ -5832,6 +5830,7 @@
 apps/erpnext/erpnext/quality_management/doctype/quality_review/quality_review_list.js,No Action,Hiçbir eylem
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js,Valuation type charges can not marked as Inclusive,Değerleme tipi ücretleri dahil olarak işaretlenmiş olamaz
 DocType: POS Profile,Update Stock,Stok güncelle
+apps/erpnext/erpnext/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/stock/doctype/packing_slip/packing_slip.js,Different UOM for items will lead to incorrect (Total) Net Weight value. Make sure that Net Weight of each item is in the same UOM.,Ürünler için farklı Ölçü Birimi yanlış (Toplam) net ağırlıklı değere yol açacaktır. Net ağırlıklı değerin aynı olduğundan emin olun.
 DocType: Certification Application,Payment Details,Ödeme detayları
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py,BOM Rate,Ürün Ağacı Oranı
@@ -5941,6 +5940,8 @@
 apps/erpnext/erpnext/accounts/doctype/monthly_distribution/monthly_distribution.py,Percentage Allocation should be equal to 100%,Yüzde Tahsisi % 100'e eşit olmalıdır
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js,Please select Posting Date before selecting Party,Partiyi seçmeden önce Gönderme Tarihi seçiniz
 apps/erpnext/erpnext/config/accounting.py,Payment Terms based on conditions,Koşullara göre Ödeme Koşulları
+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"
 DocType: Program Enrollment,School House,Okul Evi
 DocType: Serial No,Out of AMC,Çıkış AMC
 DocType: Opportunity,Opportunity Amount,Fırsat Tutarı
@@ -6163,6 +6164,7 @@
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py,Order/Quot %,Sipariş / Teklif%
 apps/erpnext/erpnext/config/healthcare.py,Record Patient Vitals,Kayıt Hasta Vitals
 DocType: Fee Schedule,Institution,kurum
+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ı:
 DocType: Asset,Partially Depreciated,Kısmen Değer Kaybına Uğramış
 DocType: Issue,Opening Time,Açılış Zamanı
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py,From and To dates required,Tarih aralığı gerekli
@@ -6399,6 +6401,7 @@
 DocType: Quality Procedure Process,Link existing Quality Procedure.,Mevcut Kalite Prosedürünü bağlayın.
 apps/erpnext/erpnext/config/hr.py,Loans,Krediler
 DocType: Healthcare Service Unit,Healthcare Service Unit,Sağlık Hizmet Birimi
+,Customer-wise Item Price,Müşteri-bilge Öğe Fiyat
 apps/erpnext/erpnext/public/js/financial_statements.js,Cash Flow Statement,Nakit Akım Tablosu
 apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.py,No material request created,Malzeme isteği oluşturulmadı
 apps/erpnext/erpnext/hr/doctype/loan_application/loan_application.py,Loan Amount cannot exceed Maximum Loan Amount of {0},Kredi Miktarı Maksimum Kredi Tutarı geçemez {0}
@@ -6678,6 +6681,7 @@
 apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py,Opening Value,açılış Değeri
 DocType: Salary Component,Formula,formül
 apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py,Serial #,Seri #
+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: Material Request Plan Item,Required Quantity,Gerekli miktar
 DocType: Lab Test Template,Lab Test Template,Lab Test Şablonu
 apps/erpnext/erpnext/accounts/doctype/accounting_period/accounting_period.py,Accounting Period overlaps with {0},Muhasebe Dönemi {0} ile örtüşüyor
@@ -6955,7 +6959,6 @@
 DocType: Request for Quotation Item,Project Name,Proje Adı
 apps/erpnext/erpnext/regional/italy/utils.py,Please set the Customer Address,Lütfen Müşteri Adresinizi ayarlayın
 DocType: Customer,Mention if non-standard receivable account,Mansiyon standart dışı alacak hesabı varsa
-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: Bank,Plaid Access Token,Ekose Erişim Simgesi
 apps/erpnext/erpnext/hr/doctype/employee_benefit_application/employee_benefit_application.py,Please add the remaining benefits {0} to any of the existing component,Lütfen mevcut bileşenlerden herhangi birine {0} kalan faydaları ekleyin
 DocType: Journal Entry Account,If Income or Expense,Gelir veya Gider ise
@@ -7234,8 +7237,6 @@
 apps/erpnext/erpnext/buying/utils.py,Please enter quantity for Item {0},Lütfen Ürün {0} için miktar giriniz
 DocType: Quality Procedure,Processes,Süreçler
 DocType: Shift Type,First Check-in and Last Check-out,İlk Check-in ve Son Check-out
-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/regional/report/hsn_wise_summary_of_outward_supplies/hsn_wise_summary_of_outward_supplies.py,Total Taxable Amount,Toplam Vergilendirilebilir Tutar
 DocType: Employee External Work History,Employee External Work History,Çalışan Harici İş Geçmişi
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.py,Job card {0} created,İş kartı {0} oluşturuldu
@@ -7274,6 +7275,7 @@
 apps/erpnext/erpnext/accounts/doctype/payment_terms_template/payment_terms_template.py,Combined invoice portion must equal 100%,Kombine fatura payı% 100&#39;e eşit olmalıdır
 DocType: Item Default,Default Expense Account,Standart Gider Hesabı
 DocType: GST Account,CGST Account,CGST Hesabı
+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/education/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py,Student Email ID,Öğrenci E-posta Kimliği
 DocType: Employee,Notice (days),Bildirimi (gün)
 DocType: Employee,Notice (days),Bildirimi (gün)
@@ -7978,6 +7980,7 @@
 DocType: Maintenance Visit,Maintenance Date,Bakım Tarih
 DocType: Purchase Invoice Item,Rejected Serial No,Seri No Reddedildi
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py,Year start date or end date is overlapping with {0}. To avoid please set company,Yılın başlangıç ve bitiş tarihi {0} ile çakışıyor. Engellemek için lütfen firma seçin.
+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/selling/doctype/customer/customer.py,Please mention the Lead Name in Lead {0},Lütfen Kurşun Adını {0} Kurşun&#39;dan belirtin
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py,Start date should be less than end date for Item {0},Başlangıç tarihi Ürün {0} için bitiş tarihinden daha az olmalıdır
 DocType: Shift Type,Auto Attendance Settings,Otomatik Devam Ayarları
diff --git a/erpnext/translations/uk.csv b/erpnext/translations/uk.csv
index 5bfa87a..b294290 100644
--- a/erpnext/translations/uk.csv
+++ b/erpnext/translations/uk.csv
@@ -168,7 +168,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py,Accountant,Бухгалтер
 apps/erpnext/erpnext/stock/report/item_price_stock/item_price_stock.py,Selling Price List,Ціновий продаж
 DocType: Patient,Tobacco Current Use,Використання тютюну
-apps/erpnext/erpnext/stock/report/item_price_stock/item_price_stock.py,Selling Rate,Рейтинг продажів
+apps/erpnext/erpnext/selling/report/customer_wise_item_price/customer_wise_item_price.py,Selling Rate,Рейтинг продажів
 apps/erpnext/erpnext/erpnext_integrations/doctype/plaid_settings/plaid_settings.js,Please save your document before adding a new account,"Збережіть документ перед тим, як додати новий рахунок"
 DocType: Cost Center,Stock User,Складській користувач
 DocType: Soil Analysis,(Ca+Mg)/K,(Ca + Mg) / K
@@ -205,7 +205,6 @@
 DocType: Packed Item,Parent Detail docname,Батько Подробиці DOCNAME
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py,"Reference: {0}, Item Code: {1} and Customer: {2}","Посилання: {0}, Код товару: {1} і клієнта: {2}"
 apps/erpnext/erpnext/accounts/report/consolidated_financial_statement/consolidated_financial_statement.py,{0} {1} is not present in the parent company,{0} {1} не присутній у материнській компанії
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Supplier &gt; Supplier Type,Постачальник&gt; Тип постачальника
 apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py,Trial Period End Date Cannot be before Trial Period Start Date,Дата закінчення випробувального періоду Не може бути до Дата початку випробувального періоду
 apps/erpnext/erpnext/utilities/user_progress.py,Kg,Кг
 DocType: Tax Withholding Category,Tax Withholding Category,Категорія оподаткування
@@ -319,6 +318,7 @@
 DocType: Quality Procedure Table,Responsible Individual,Відповідальна особа
 DocType: Naming Series,Prefix,Префікс
 apps/erpnext/erpnext/hr/notification/training_scheduled/training_scheduled.html,Event Location,Місце проведення події
+apps/erpnext/erpnext/selling/report/customer_wise_item_price/customer_wise_item_price.py,Available Stock,В наявності
 DocType: Asset Settings,Asset Settings,Налаштування активів
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py,Consumable,Витратні
 DocType: Student,B-,B-
@@ -352,6 +352,7 @@
 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 \
 				Serial No.","Неможливо забезпечити доставку послідовним номером, оскільки \ Item {0} додається з та без забезпечення доставки по \ серійному номеру."
+apps/erpnext/erpnext/education/doctype/instructor/instructor.py,Please setup Instructor Naming System in Education &gt; Education Settings,"Будь ласка, налаштуйте систему іменування інструкторів у програмі Освіта&gt; Налаштування освіти"
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py,At least one mode of payment is required for POS invoice.,Принаймні один спосіб оплати потрібно для POS рахунку.
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py,Batch no is required for batched item {0},Пакетна партія не потрібна для пакетного товару {0}
 DocType: Bank Statement Transaction Invoice Item,Bank Statement Transaction Invoice Item,Банківська виписка Звіт про транзакцію
@@ -880,7 +881,6 @@
 DocType: Vital Signs,Blood Pressure (systolic),Артеріальний тиск (систолічний)
 apps/erpnext/erpnext/controllers/buying_controller.py,{0} {1} is {2},{0} {1} - це {2}
 DocType: Item Price,Valid Upto,Дійсне до
-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: Training Event,Workshop,семінар
 DocType: Supplier Scorecard Scoring Standing,Warn Purchase Orders,Попереджати замовлення на купівлю
 apps/erpnext/erpnext/utilities/user_progress.py,List a few of your customers. They could be organizations or individuals.,Перерахуйте деякі з ваших клієнтів. Вони можуть бути організації або окремі особи.
@@ -1670,7 +1670,6 @@
 DocType: Item Barcode,Item Barcode,Пункт Штрих
 DocType: Delivery Trip,In Transit,В дорозі
 DocType: Woocommerce Settings,Endpoints,Кінцеві точки
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Item Code &gt; Item Group &gt; Brand,Код товару&gt; Група предметів&gt; Бренд
 DocType: Shopping Cart Settings,Show Configure Button,Показати кнопку Налаштувати
 DocType: Quality Inspection Reading,Reading 6,Читання 6
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js,Cannot {0} {1} {2} without any negative outstanding invoice,Може не {0} {1} {2} без будь-якого негативного видатний рахунок-фактура
@@ -2035,6 +2034,7 @@
 DocType: Cheque Print Template,Payer Settings,Налаштування платника
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js,No pending Material Requests found to link for the given items.,"Жодних незавершених Матеріальних запитів не знайдено, щоб пов&#39;язати ці елементи."
 apps/erpnext/erpnext/public/js/utils/party.js,Select company first,Спочатку виберіть компанію
+apps/erpnext/erpnext/accounts/general_ledger.py,Account: <b>{0}</b> is capital Work in progress and can not be updated by Journal Entry,"Рахунок: <b>{0}</b> - це капітал Незавершене виробництво, і його не можна оновлювати в журналі"
 apps/erpnext/erpnext/education/doctype/quiz/quiz.py,Compare List function takes on list arguments,Функція Порівняння списку бере аргументи списку
 DocType: Item Attribute Value,"This will be appended to the Item Code of the variant. For example, if your abbreviation is ""SM"", and the item code is ""T-SHIRT"", the item code of the variant will be ""T-SHIRT-SM""","Це буде додано до коду варіанту. Наприклад, якщо ваша абревіатура ""СМ"", і код товару ""Футболки"", тоді код варіанту буде ""Футболки-СМ"""
 DocType: Salary Slip,Net Pay (in words) will be visible once you save the Salary Slip.,"Сума ""на руки"" (прописом) буде видно, як тільки ви збережете Зарплатний розрахунок."
@@ -2221,6 +2221,7 @@
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js,Item 2,Пункт 2
 DocType: Pricing Rule,Validate Applied Rule,Підтвердити застосоване правило
 DocType: QuickBooks Migrator,Authorization Endpoint,Кінцева точка авторизації
+DocType: Employee Onboarding,Notify users by email,Повідомте користувачів електронною поштою
 DocType: Travel Request,International,Міжнародний
 DocType: Training Event,Training Event,навчальний захід
 DocType: Item,Auto re-order,Авто-дозамовлення
@@ -2834,7 +2835,6 @@
 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;ям вже існує
-DocType: Contract,Inactive,Неактивний
 apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.js,This will submit Salary Slips and create accrual Journal Entry. Do you want to proceed?,Це дозволить подати заробітну плату та створити нарахування вступного журналу. Ви хочете продовжити?
 DocType: Purchase Invoice,Total Net Weight,Загальна вага нетто
 DocType: Purchase Order,Order Confirmation No,Підтвердження замовлення №
@@ -3117,7 +3117,6 @@
 apps/erpnext/erpnext/accounts/party.py,Billing currency must be equal to either default company's currency or party account currency,Платіжна валюта повинна дорівнювати валюті чи валюті облікового запису партії компанії за умовчанням
 DocType: Packing Slip,Indicates that the package is a part of this delivery (Only Draft),"Вказує, що пакет є частиною цієї поставки (тільки проекту)"
 apps/erpnext/erpnext/accounts/report/customer_ledger_summary/customer_ledger_summary.py,Closing Balance,Заключний баланс
-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: Soil Texture,Loam,Loam
 apps/erpnext/erpnext/controllers/accounts_controller.py,Row {0}: Due Date cannot be before posting date,Рядок {0}: Дата закінчення не може бути до дати опублікування
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py,Quantity for Item {0} must be less than {1},"Кількість для пункту {0} має бути менше, ніж {1}"
@@ -3646,7 +3645,6 @@
 DocType: Stock Settings,Raise Material Request when stock reaches re-order level,Створити Замовлення матеріалів коли залишки дійдуть до рівня дозамовлення
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py,Full-time,Повний день
 DocType: Payroll Entry,Employees,співробітники
-apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py,Please setup numbering series for Attendance via Setup &gt; Numbering Series,Установіть серію нумерації для відвідування за допомогою пункту Налаштування&gt; Серія нумерації
 DocType: Question,Single Correct Answer,Єдиний правильний відповідь
 DocType: Employee,Contact Details,Контактні дані
 DocType: C-Form,Received Date,Дата отримання
@@ -4261,6 +4259,7 @@
 DocType: Pricing Rule,Price or Product Discount,Ціна або знижка на товар
 apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.py,For row {0}: Enter planned qty,Для рядка {0}: введіть заплановане число
 DocType: Account,Income Account,Рахунок доходів
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Customer &gt; Customer Group &gt; Territory,Клієнт&gt; Група клієнтів&gt; Територія
 DocType: Payment Request,Amount in customer's currency,Сума в валюті клієнта
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js,Delivery,Доставка
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.py,Assigning Structures...,Призначення структур ...
@@ -4310,7 +4309,6 @@
 DocType: HR Settings,Check Vacancies On Job Offer Creation,Перевірте вакансії при створенні вакансії
 apps/erpnext/erpnext/utilities/user_progress.py,Go to Letterheads,Перейти на бланки
 DocType: Subscription,Cancel At End Of Period,Скасувати наприкінці періоду
-apps/erpnext/erpnext/education/doctype/instructor/instructor.py,Please setup Instructor Naming System in Education &gt; Education Settings,"Будь ласка, налаштуйте систему іменування інструкторів у програмі Освіта&gt; Налаштування освіти"
 apps/erpnext/erpnext/hr/doctype/employee_promotion/employee_promotion.js,Property already added,Власність вже додана
 DocType: Item Supplier,Item Supplier,Пункт Постачальник
 apps/erpnext/erpnext/public/js/controllers/transaction.js,Please enter Item Code to get batch no,"Будь ласка, введіть код позиції, щоб отримати номер партії"
@@ -4596,6 +4594,7 @@
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.js,Warning: Material Requested Qty is less than Minimum Order Qty,Увага: Кількість замовленого матеріалу менша за мінімально допустиму
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py,Account {0} is frozen,Рахунок {0} заблоковано
 DocType: Quiz Question,Quiz Question,Питання для вікторини
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Supplier &gt; Supplier Type,Постачальник&gt; Тип постачальника
 DocType: Company,Legal Entity / Subsidiary with a separate Chart of Accounts belonging to the Organization.,"Юридична особа / Допоміжний з окремим Плану рахунків, що належать Організації."
 DocType: Payment Request,Mute Email,Відключення E-mail
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py,"Food, Beverage & Tobacco","Продукти харчування, напої і тютюнові вироби"
@@ -5112,7 +5111,6 @@
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py,Delivery warehouse required for stock item {0},Склад доставки необхідний для номенклатурної позиції {0}
 DocType: Packing Slip,The gross weight of the package. Usually net weight + packaging material weight. (for print),Вага брутто упаковки. Зазвичай вага нетто + пакувальний матеріал вагу. (для друку)
 DocType: Assessment Plan,Program,Програма
-apps/erpnext/erpnext/hr/doctype/employee/employee.py,Please setup Employee Naming System in Human Resource &gt; HR Settings,"Будь ласка, налаштуйте Систему іменування співробітників у Людських ресурсах&gt; Налаштування HR"
 DocType: Accounts Settings,Users with this role are allowed to set frozen accounts and create / modify accounting entries against frozen accounts,Користувачі з цією роллю можуть встановлювати заблоковані рахунки і створювати / змінювати проводки по заблокованих рахунках
 ,Project Billing Summary,Підсумок виставлення рахунків за проект
 DocType: Vital Signs,Cuts,Розрізи
@@ -5363,6 +5361,7 @@
 apps/erpnext/erpnext/quality_management/doctype/quality_review/quality_review_list.js,No Action,Ніяких дій
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js,Valuation type charges can not marked as Inclusive,Звинувачення типу Оцінка не може відзначений як включено
 DocType: POS Profile,Update Stock,Оновити запас
+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/stock/doctype/packing_slip/packing_slip.js,Different UOM for items will lead to incorrect (Total) Net Weight value. Make sure that Net Weight of each item is in the same UOM.,"Різні Одиниця виміру для елементів призведе до неправильної (всього) значення маси нетто. Переконайтеся, що вага нетто кожного елемента знаходиться в тій же UOM."
 DocType: Certification Application,Payment Details,Платіжні реквізити
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py,BOM Rate,Вартість згідно норми
@@ -5468,6 +5467,8 @@
 apps/erpnext/erpnext/accounts/doctype/monthly_distribution/monthly_distribution.py,Percentage Allocation should be equal to 100%,Розподіл відсотків має дорівнювати 100%
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js,Please select Posting Date before selecting Party,"Будь ласка, виберіть дату запису, перш ніж вибрати контрагента"
 apps/erpnext/erpnext/config/accounting.py,Payment Terms based on conditions,Умови оплати на основі умов
+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: Program Enrollment,School House,School House
 DocType: Serial No,Out of AMC,З Контракту на річне обслуговування
 DocType: Opportunity,Opportunity Amount,Сума можливостей
@@ -5672,6 +5673,7 @@
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py,Order/Quot %,Замовлення / Quot%
 apps/erpnext/erpnext/config/healthcare.py,Record Patient Vitals,Запис пацієнта Vitals
 DocType: Fee Schedule,Institution,установа
+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: Asset,Partially Depreciated,Частково амортизований
 DocType: Issue,Opening Time,Час відкриття
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py,From and To dates required,"Від і До дати, необхідних"
@@ -5892,6 +5894,7 @@
 DocType: Quality Procedure Process,Link existing Quality Procedure.,Пов’язати існуючу процедуру якості.
 apps/erpnext/erpnext/config/hr.py,Loans,Кредити
 DocType: Healthcare Service Unit,Healthcare Service Unit,Служба охорони здоров&#39;я
+,Customer-wise Item Price,"Ціна предмета, орієнтована на клієнта"
 apps/erpnext/erpnext/public/js/financial_statements.js,Cash Flow Statement,Звіт про рух грошових коштів
 apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.py,No material request created,Не було створено жодного матеріального запиту
 apps/erpnext/erpnext/hr/doctype/loan_application/loan_application.py,Loan Amount cannot exceed Maximum Loan Amount of {0},Сума кредиту не може перевищувати максимальний Сума кредиту {0}
@@ -6157,6 +6160,7 @@
 apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py,Opening Value,Сума на початок роботи
 DocType: Salary Component,Formula,формула
 apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py,Serial #,Серійний #
+apps/erpnext/erpnext/hr/doctype/employee/employee.py,Please setup Employee Naming System in Human Resource &gt; HR Settings,"Будь ласка, налаштуйте Систему іменування співробітників у Людських ресурсах&gt; Налаштування HR"
 DocType: Material Request Plan Item,Required Quantity,Необхідна кількість
 DocType: Lab Test Template,Lab Test Template,Шаблон Lab Test
 apps/erpnext/erpnext/accounts/doctype/accounting_period/accounting_period.py,Accounting Period overlaps with {0},Період обліку перекривається на {0}
@@ -6407,7 +6411,6 @@
 DocType: Request for Quotation Item,Project Name,Назва проекту
 apps/erpnext/erpnext/regional/italy/utils.py,Please set the Customer Address,Введіть адресу клієнта
 DocType: Customer,Mention if non-standard receivable account,Вказати якщо нестандартний рахунок заборгованості
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Customer &gt; Customer Group &gt; Territory,Клієнт&gt; Група клієнтів&gt; Територія
 DocType: Bank,Plaid Access Token,Позначка доступу в плед
 apps/erpnext/erpnext/hr/doctype/employee_benefit_application/employee_benefit_application.py,Please add the remaining benefits {0} to any of the existing component,"Будь ласка, додайте решту переваг {0} до будь-якого існуючого компонента"
 DocType: Journal Entry Account,If Income or Expense,Якщо доходи або витрати
@@ -6671,8 +6674,6 @@
 apps/erpnext/erpnext/buying/utils.py,Please enter quantity for Item {0},"Будь ласка, введіть кількість для {0}"
 DocType: Quality Procedure,Processes,Процеси
 DocType: Shift Type,First Check-in and Last Check-out,Перший заїзд та останній виїзд
-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/regional/report/hsn_wise_summary_of_outward_supplies/hsn_wise_summary_of_outward_supplies.py,Total Taxable Amount,Загальна сума податкової декларації
 DocType: Employee External Work History,Employee External Work History,Співробітник зовнішньої роботи Історія
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.py,Job card {0} created,Робоча карта {0} створена
@@ -6709,6 +6710,7 @@
 apps/erpnext/erpnext/accounts/doctype/payment_terms_template/payment_terms_template.py,Combined invoice portion must equal 100%,Комбінована частина рахунку-фактури повинна дорівнювати 100%
 DocType: Item Default,Default Expense Account,Витратний рахунок за замовчуванням
 DocType: GST Account,CGST Account,Обліковий запис CGST
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Item Code &gt; Item Group &gt; Brand,Код товару&gt; Група предметів&gt; Бренд
 apps/erpnext/erpnext/education/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py,Student Email ID,ІД епошти студента
 DocType: Employee,Notice (days),Попередження (днів)
 DocType: POS Closing Voucher Invoices,POS Closing Voucher Invoices,Квитанції про закупівлю ваучерів POS
@@ -7352,6 +7354,7 @@
 DocType: Maintenance Visit,Maintenance Date,Дата технічного обслуговування
 DocType: Purchase Invoice Item,Rejected Serial No,Відхилено Серійний номер
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py,Year start date or end date is overlapping with {0}. To avoid please set company,"Дата початку року або дата закінчення перекривається з {0}. Щоб уникнути будь ласка, встановіть компанію"
+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/selling/doctype/customer/customer.py,Please mention the Lead Name in Lead {0},"Вкажіть, будь ласка, ім&#39;я головного моменту у програмі {0}"
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py,Start date should be less than end date for Item {0},"Дата початку повинна бути менше, ніж дата закінчення Пункт {0}"
 DocType: Shift Type,Auto Attendance Settings,Налаштування автоматичного відвідування
diff --git a/erpnext/translations/ur.csv b/erpnext/translations/ur.csv
index e32f55d..6368023 100644
--- a/erpnext/translations/ur.csv
+++ b/erpnext/translations/ur.csv
@@ -163,7 +163,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py,Accountant,اکاؤنٹنٹ
 apps/erpnext/erpnext/stock/report/item_price_stock/item_price_stock.py,Selling Price List,قیمت کی فہرست فروخت
 DocType: Patient,Tobacco Current Use,تمباکو موجودہ استعمال
-apps/erpnext/erpnext/stock/report/item_price_stock/item_price_stock.py,Selling Rate,فروخت کی شرح
+apps/erpnext/erpnext/selling/report/customer_wise_item_price/customer_wise_item_price.py,Selling Rate,فروخت کی شرح
 apps/erpnext/erpnext/erpnext_integrations/doctype/plaid_settings/plaid_settings.js,Please save your document before adding a new account,براہ کرم نیا اکاؤنٹ شامل کرنے سے پہلے اپنی دستاویز کو محفوظ کریں۔
 DocType: Cost Center,Stock User,اسٹاک صارف
 DocType: Soil Analysis,(Ca+Mg)/K,(Ca + MG) / K
@@ -199,7 +199,6 @@
 DocType: Packed Item,Parent Detail docname,والدین تفصیل docname
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py,"Reference: {0}, Item Code: {1} and Customer: {2}",حوالہ: {0}، آئٹم کوڈ: {1} اور کسٹمر: {2}
 apps/erpnext/erpnext/accounts/report/consolidated_financial_statement/consolidated_financial_statement.py,{0} {1} is not present in the parent company,{0} {1} والدین کی کمپنی میں موجود نہیں ہے
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Supplier &gt; Supplier Type,سپلائر&gt; سپلائر کی قسم
 apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py,Trial Period End Date Cannot be before Trial Period Start Date,آزمائشی مدت کے اختتام تاریخ آزمائشی دورہ شروع ہونے سے پہلے نہیں ہوسکتی ہے
 apps/erpnext/erpnext/utilities/user_progress.py,Kg,کلو
 DocType: Tax Withholding Category,Tax Withholding Category,ٹیکس کو روکنے والے زمرہ
@@ -310,6 +309,7 @@
 DocType: Quality Procedure Table,Responsible Individual,ذمہ دار انفرادی۔
 DocType: Naming Series,Prefix,اپسرگ
 apps/erpnext/erpnext/hr/notification/training_scheduled/training_scheduled.html,Event Location,واقعہ مقام
+apps/erpnext/erpnext/selling/report/customer_wise_item_price/customer_wise_item_price.py,Available Stock,دستیاب اسٹاک
 DocType: Asset Settings,Asset Settings,اثاثہ کی ترتیبات
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py,Consumable,فراہمی
 DocType: Student,B-,B-
@@ -343,6 +343,7 @@
 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 \
 				Serial No.",سیریل نمبر کی طرف سے \ آئٹم {0} کے ذریعے ترسیل کو یقینی بنانے کے بغیر اور سیریل نمبر کی طرف سے یقینی بنانے کے بغیر شامل نہیں کیا جاسکتا ہے.
+apps/erpnext/erpnext/education/doctype/instructor/instructor.py,Please setup Instructor Naming System in Education &gt; Education Settings,براہ کرم تعلیم&gt; تعلیم کی ترتیبات میں انسٹرکٹر نام دینے کا نظام مرتب کریں۔
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py,At least one mode of payment is required for POS invoice.,ادائیگی کی کم از کم ایک موڈ POS انوائس کے لئے ضروری ہے.
 DocType: Bank Statement Transaction Invoice Item,Bank Statement Transaction Invoice Item,بینک بیان ٹرانزیکشن انوائس آئٹم
 DocType: Salary Detail,Tax on flexible benefit,لچکدار فائدہ پر ٹیکس
@@ -1639,7 +1640,6 @@
 DocType: Item Barcode,Item Barcode,آئٹم بارکوڈ
 DocType: Delivery Trip,In Transit,ٹرانزٹ میں
 DocType: Woocommerce Settings,Endpoints,اختتام
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Item Code &gt; Item Group &gt; Brand,آئٹم کوڈ&gt; آئٹم گروپ&gt; برانڈ۔
 DocType: Shopping Cart Settings,Show Configure Button,کنفیگر بٹن دکھائیں۔
 DocType: Quality Inspection Reading,Reading 6,6 پڑھنا
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js,Cannot {0} {1} {2} without any negative outstanding invoice,نہ {0} {1} {2} بھی منفی بقایا انوائس کے بغیر کر سکتے ہیں
@@ -2187,6 +2187,7 @@
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js,Item 2,آئٹم 2
 DocType: Pricing Rule,Validate Applied Rule,قابل اطلاق قانون کی تصدیق کریں۔
 DocType: QuickBooks Migrator,Authorization Endpoint,اجازت کے آخر پوائنٹ
+DocType: Employee Onboarding,Notify users by email,صارفین کو ای میل کے ذریعے مطلع کریں۔
 DocType: Travel Request,International,بین اقوامی
 DocType: Training Event,Training Event,تربیت ایونٹ
 DocType: Item,Auto re-order,آٹو دوبارہ آرڈر
@@ -2789,7 +2790,6 @@
 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,ایک ہی نام کے ساتھ گاہک پہلے ہی موجود ہے
-DocType: Contract,Inactive,غیر فعال
 apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.js,This will submit Salary Slips and create accrual Journal Entry. Do you want to proceed?,یہ تنخواہ سلپس جمع کردیتا ہے اور اسکرین جرنل انٹری تخلیق کرتا ہے. کیا آپ آگے بڑھنا چاہتے ہیں؟
 DocType: Purchase Invoice,Total Net Weight,کل نیٹ وزن
 DocType: Purchase Order,Order Confirmation No,آرڈر کی توثیق نمبر
@@ -3064,7 +3064,6 @@
 apps/erpnext/erpnext/accounts/party.py,Billing currency must be equal to either default company's currency or party account currency,بلنگ کی کرنسی کو پہلے ہی ڈیفالٹ کمپنی کی کرنسی یا پارٹی اکاؤنٹ کرنسی کے برابر ہونا ضروری ہے
 DocType: Packing Slip,Indicates that the package is a part of this delivery (Only Draft),پیکیج اس کی ترسیل (صرف ڈرافٹ) کا ایک حصہ ہے کہ اشارہ کرتا ہے
 apps/erpnext/erpnext/accounts/report/customer_ledger_summary/customer_ledger_summary.py,Closing Balance,اختتامی توازن
-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: Soil Texture,Loam,لوام
 apps/erpnext/erpnext/controllers/accounts_controller.py,Row {0}: Due Date cannot be before posting date,صف {0}: تاریخ کی تاریخ تاریخ سے پہلے نہیں ہوسکتی ہے
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py,Quantity for Item {0} must be less than {1},شے کے لئے مقدار {0} سے کم ہونا چاہئے {1}
@@ -3581,7 +3580,6 @@
 DocType: Stock Settings,Raise Material Request when stock reaches re-order level,اسٹاک دوبارہ آرڈر کی سطح تک پہنچ جاتا ہے مواد کی درخواست میں اضافہ
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py,Full-time,پورا وقت
 DocType: Payroll Entry,Employees,ایمپلائز
-apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py,Please setup numbering series for Attendance via Setup &gt; Numbering Series,براہ کرم حاضری کے لئے نمبر بندی سیریز سیٹ اپ&gt; نمبرنگ سیریز کے ذریعے ترتیب دیں۔
 DocType: Question,Single Correct Answer,سنگل درست جواب۔
 DocType: Employee,Contact Details,رابطہ کی تفصیلات
 DocType: C-Form,Received Date,موصول تاریخ
@@ -4190,6 +4188,7 @@
 DocType: Pricing Rule,Price or Product Discount,قیمت یا مصنوع کی چھوٹ۔
 apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.py,For row {0}: Enter planned qty,قطار {0} کے لئے: منصوبہ بندی کی مقدار درج کریں
 DocType: Account,Income Account,انکم اکاؤنٹ
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Customer &gt; Customer Group &gt; Territory,کسٹمر&gt; کسٹمر گروپ&gt; علاقہ۔
 DocType: Payment Request,Amount in customer's currency,کسٹمر کی کرنسی میں رقم
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js,Delivery,ڈلیوری
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.py,Assigning Structures...,ڈھانچے کی تفویض…
@@ -4238,7 +4237,6 @@
 DocType: HR Settings,Check Vacancies On Job Offer Creation,ملازمت کی پیش کش پر خالی آسامیوں کو چیک کریں۔
 apps/erpnext/erpnext/utilities/user_progress.py,Go to Letterheads,لیٹر ہیڈز پر جائیں
 DocType: Subscription,Cancel At End Of Period,مدت کے آخر میں منسوخ کریں
-apps/erpnext/erpnext/education/doctype/instructor/instructor.py,Please setup Instructor Naming System in Education &gt; Education Settings,براہ کرم تعلیم&gt; تعلیم کی ترتیبات میں انسٹرکٹر نام دینے کا نظام مرتب کریں۔
 apps/erpnext/erpnext/hr/doctype/employee_promotion/employee_promotion.js,Property already added,پراپرٹی پہلے سے شامل ہے
 DocType: Item Supplier,Item Supplier,آئٹم پردایک
 apps/erpnext/erpnext/public/js/controllers/transaction.js,Please enter Item Code to get batch no,بیچ کوئی حاصل کرنے کے لئے آئٹم کوڈ درج کریں
@@ -4521,6 +4519,7 @@
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.js,Warning: Material Requested Qty is less than Minimum Order Qty,انتباہ: مقدار درخواست مواد کم از کم آرڈر کی مقدار سے کم ہے
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py,Account {0} is frozen,اکاؤنٹ {0} منجمد ہے
 DocType: Quiz Question,Quiz Question,کوئز سوال۔
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Supplier &gt; Supplier Type,سپلائر&gt; سپلائر کی قسم
 DocType: Company,Legal Entity / Subsidiary with a separate Chart of Accounts belonging to the Organization.,تنظیم سے تعلق رکھنے والے اکاؤنٹس کی ایک علیحدہ چارٹ کے ساتھ قانونی / ماتحت.
 DocType: Payment Request,Mute Email,گونگا ای میل
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py,"Food, Beverage & Tobacco",کھانا، مشروب اور تمباکو
@@ -5028,7 +5027,6 @@
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py,Delivery warehouse required for stock item {0},ڈلیوری گودام اسٹاک شے کے لئے کی ضرورت {0}
 DocType: Packing Slip,The gross weight of the package. Usually net weight + packaging material weight. (for print),پیکج کی مجموعی وزن. عام طور پر نیٹ وزن پیکیجنگ مواد وزن. (پرنٹ کے لئے)
 DocType: Assessment Plan,Program,پروگرام کا
-apps/erpnext/erpnext/hr/doctype/employee/employee.py,Please setup Employee Naming System in Human Resource &gt; HR Settings,برائے کرم انسانی وسائل&gt; HR کی ترتیبات میں ملازمین کے نام دینے کا نظام مرتب کریں۔
 DocType: Accounts Settings,Users with this role are allowed to set frozen accounts and create / modify accounting entries against frozen accounts,اس کردار کے ساتھ صارفین کو منجمد اکاؤنٹس کے خلاف اکاؤنٹنگ اندراجات منجمد اکاؤنٹس قائم کرنے اور تخلیق / ترمیم کریں کرنے کی اجازت ہے
 ,Project Billing Summary,پروجیکٹ بلنگ کا خلاصہ۔
 DocType: Vital Signs,Cuts,پکڑتا ہے
@@ -5373,6 +5371,8 @@
 apps/erpnext/erpnext/accounts/doctype/monthly_distribution/monthly_distribution.py,Percentage Allocation should be equal to 100%,فیصدی ایلوکیشن 100٪ کے برابر ہونا چاہئے
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js,Please select Posting Date before selecting Party,پارٹی منتخب کرنے سے پہلے پوسٹنگ کی تاریخ براہ مہربانی منتخب کریں
 apps/erpnext/erpnext/config/accounting.py,Payment Terms based on conditions,شرائط پر مبنی ادائیگی کی شرائط۔
+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: Program Enrollment,School House,سکول ہاؤس
 DocType: Serial No,Out of AMC,اے ایم سی کے باہر
 DocType: Opportunity,Opportunity Amount,موقع کی رقم
@@ -5575,6 +5575,7 @@
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py,Order/Quot %,آرڈر / عمومی quot٪
 apps/erpnext/erpnext/config/healthcare.py,Record Patient Vitals,ریکارڈ مریض وٹیلز
 DocType: Fee Schedule,Institution,ادارہ
+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: Asset,Partially Depreciated,جزوی طور پر فرسودگی
 DocType: Issue,Opening Time,افتتاحی وقت
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py,From and To dates required,سے اور مطلوبہ تاریخوں کے لئے
@@ -5791,6 +5792,7 @@
 DocType: Quality Procedure Process,Link existing Quality Procedure.,موجودہ کوالٹی پروسیجر کو لنک کریں۔
 apps/erpnext/erpnext/config/hr.py,Loans,قرضے۔
 DocType: Healthcare Service Unit,Healthcare Service Unit,ہیلتھ کیئر سروس یونٹ
+,Customer-wise Item Price,کسٹمر وار آئٹم قیمت۔
 apps/erpnext/erpnext/public/js/financial_statements.js,Cash Flow Statement,کیش فلو کا بیان
 apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.py,No material request created,کوئی مادی درخواست نہیں کی گئی
 apps/erpnext/erpnext/hr/doctype/loan_application/loan_application.py,Loan Amount cannot exceed Maximum Loan Amount of {0},قرض کی رقم {0} کی زیادہ سے زیادہ قرض کی رقم سے زیادہ نہیں ہوسکتی
@@ -6053,6 +6055,7 @@
 apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py,Opening Value,افتتاحی ویلیو
 DocType: Salary Component,Formula,فارمولہ
 apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py,Serial #,سیریل نمبر
+apps/erpnext/erpnext/hr/doctype/employee/employee.py,Please setup Employee Naming System in Human Resource &gt; HR Settings,برائے کرم انسانی وسائل&gt; HR کی ترتیبات میں ملازمین کے نام دینے کا نظام مرتب کریں۔
 DocType: Material Request Plan Item,Required Quantity,مطلوبہ مقدار
 DocType: Lab Test Template,Lab Test Template,لیب ٹیسٹنگ سانچہ
 apps/erpnext/erpnext/setup/doctype/company/company.py,Sales Account,سیلز اکاؤنٹ
@@ -6298,7 +6301,6 @@
 DocType: Request for Quotation Item,Project Name,پراجیکٹ کا نام
 apps/erpnext/erpnext/regional/italy/utils.py,Please set the Customer Address,برائے کرم کسٹمر ایڈریس متعین کریں۔
 DocType: Customer,Mention if non-standard receivable account,ذکر غیر معیاری وصولی اکاؤنٹ تو
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Customer &gt; Customer Group &gt; Territory,کسٹمر&gt; کسٹمر گروپ&gt; علاقہ۔
 DocType: Bank,Plaid Access Token,پلائڈ رسائی ٹوکن۔
 apps/erpnext/erpnext/hr/doctype/employee_benefit_application/employee_benefit_application.py,Please add the remaining benefits {0} to any of the existing component,موجودہ حصوں میں سے کوئی بھی باقی فوائد {0} کو شامل کریں
 DocType: Journal Entry Account,If Income or Expense,آمدنی یا اخراجات تو
@@ -6557,8 +6559,6 @@
 apps/erpnext/erpnext/buying/utils.py,Please enter quantity for Item {0},شے کے لئے مقدار درج کریں {0}
 DocType: Quality Procedure,Processes,عمل
 DocType: Shift Type,First Check-in and Last Check-out,پہلے چیک ان اور آخری چیک آؤٹ۔
-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/regional/report/hsn_wise_summary_of_outward_supplies/hsn_wise_summary_of_outward_supplies.py,Total Taxable Amount,کل ٹیکس قابل رقم
 DocType: Employee External Work History,Employee External Work History,ملازم بیرونی کام کی تاریخ
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.py,Job card {0} created,ملازمت کارڈ {0} تیار
@@ -6595,6 +6595,7 @@
 apps/erpnext/erpnext/accounts/doctype/payment_terms_template/payment_terms_template.py,Combined invoice portion must equal 100%,مشترکہ انوائس کا حصہ 100٪
 DocType: Item Default,Default Expense Account,پہلے سے طے شدہ ایکسپینس اکاؤنٹ
 DocType: GST Account,CGST Account,CGST اکاؤنٹ
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Item Code &gt; Item Group &gt; Brand,آئٹم کوڈ&gt; آئٹم گروپ&gt; برانڈ۔
 apps/erpnext/erpnext/education/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py,Student Email ID,Student کی ای میل آئی ڈی
 DocType: Employee,Notice (days),نوٹس (دن)
 DocType: POS Closing Voucher Invoices,POS Closing Voucher Invoices,پی او وی بند واؤچر انوائس
@@ -7230,6 +7231,7 @@
 DocType: Maintenance Visit,Maintenance Date,بحالی کی تاریخ
 DocType: Purchase Invoice Item,Rejected Serial No,مسترد سیریل نمبر
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py,Year start date or end date is overlapping with {0}. To avoid please set company,سال کے آغاز کی تاریخ یا تاریخ انتہاء {0} کے ساتھ اتیویاپی ہے. سے بچنے کے لئے مقرر کی کمپنی کے لئے براہ مہربانی
+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/selling/doctype/customer/customer.py,Please mention the Lead Name in Lead {0},براہ کرم لیڈ نام {0} میں ذکر کریں.
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py,Start date should be less than end date for Item {0},شے کے لئے ختم ہونے کی تاریخ سے کم ہونا چاہئے شروع کرنے کی تاریخ {0}
 DocType: Shift Type,Auto Attendance Settings,خود حاضری کی ترتیبات۔
diff --git a/erpnext/translations/uz.csv b/erpnext/translations/uz.csv
index 15de43e..81fe50a 100644
--- a/erpnext/translations/uz.csv
+++ b/erpnext/translations/uz.csv
@@ -167,7 +167,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py,Accountant,Hisobchi
 apps/erpnext/erpnext/stock/report/item_price_stock/item_price_stock.py,Selling Price List,Sotuvlar narxlari
 DocType: Patient,Tobacco Current Use,Tamaki foydalanish
-apps/erpnext/erpnext/stock/report/item_price_stock/item_price_stock.py,Selling Rate,Sotish darajasi
+apps/erpnext/erpnext/selling/report/customer_wise_item_price/customer_wise_item_price.py,Selling Rate,Sotish darajasi
 apps/erpnext/erpnext/erpnext_integrations/doctype/plaid_settings/plaid_settings.js,Please save your document before adding a new account,Yangi hisob qo&#39;shmasdan oldin hujjatni saqlang
 DocType: Cost Center,Stock User,Tayyor foydalanuvchi
 DocType: Soil Analysis,(Ca+Mg)/K,(Ca + Mg) / K
@@ -204,7 +204,6 @@
 DocType: Packed Item,Parent Detail docname,Ota-ona batafsil docname
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py,"Reference: {0}, Item Code: {1} and Customer: {2}","Malumot: {0}, mahsulot kodi: {1} va mijoz: {2}"
 apps/erpnext/erpnext/accounts/report/consolidated_financial_statement/consolidated_financial_statement.py,{0} {1} is not present in the parent company,{0} {1} kompaniyada mavjud emas
-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/accounts/doctype/subscription/subscription.py,Trial Period End Date Cannot be before Trial Period Start Date,Sinov muddati tugash sanasi Sinov davri boshlanish sanasidan oldin bo&#39;lishi mumkin emas
 apps/erpnext/erpnext/utilities/user_progress.py,Kg,Kg
 DocType: Tax Withholding Category,Tax Withholding Category,Soliq to&#39;lash tartibi
@@ -318,6 +317,7 @@
 DocType: Quality Procedure Table,Responsible Individual,Mas&#39;ul shaxs
 DocType: Naming Series,Prefix,Prefiks
 apps/erpnext/erpnext/hr/notification/training_scheduled/training_scheduled.html,Event Location,Voqealar joylashuvi
+apps/erpnext/erpnext/selling/report/customer_wise_item_price/customer_wise_item_price.py,Available Stock,Mavjud zaxira
 DocType: Asset Settings,Asset Settings,Asset Sozlamalari
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py,Consumable,Sarflanadigan
 DocType: Student,B-,B-
@@ -350,6 +350,7 @@
 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 \
 				Serial No.","\ Serial No tomonidan etkazib berishni ta&#39;minlash mumkin emas, \ Subject {0} \ Serial No."
+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/accounts/doctype/sales_invoice/sales_invoice.py,At least one mode of payment is required for POS invoice.,POS-faktura uchun kamida bitta to&#39;lov tartibi talab qilinadi.
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py,Batch no is required for batched item {0},{0} qadoqlangan mahsulot uchun partiya talab qilinmaydi
 DocType: Bank Statement Transaction Invoice Item,Bank Statement Transaction Invoice Item,Bank deklaratsiyasi bitimining bitimi
@@ -872,7 +873,6 @@
 DocType: Vital Signs,Blood Pressure (systolic),Qon bosimi (sistolik)
 apps/erpnext/erpnext/controllers/buying_controller.py,{0} {1} is {2},{0} {1} bu {2}
 DocType: Item Price,Valid Upto,To&#39;g&#39;ri Upto
-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: Training Event,Workshop,Seminar
 DocType: Supplier Scorecard Scoring Standing,Warn Purchase Orders,Sotib olish buyurtmalarini ogohlantiring
 apps/erpnext/erpnext/utilities/user_progress.py,List a few of your customers. They could be organizations or individuals.,Mijozlaringizning bir qismini ro&#39;yxatlang. Ular tashkilotlar yoki shaxslar bo&#39;lishi mumkin.
@@ -1654,7 +1654,6 @@
 DocType: Item Barcode,Item Barcode,Mahsulot shtrix kodi
 DocType: Delivery Trip,In Transit,Transitda
 DocType: Woocommerce Settings,Endpoints,Oxirgi fikrlar
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Item Code &gt; Item Group &gt; Brand,Element kodi&gt; Mahsulotlar guruhi&gt; Tovar
 DocType: Shopping Cart Settings,Show Configure Button,Moslash tugmachasini ko&#39;rsatish
 DocType: Quality Inspection Reading,Reading 6,O&#39;qish 6
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js,Cannot {0} {1} {2} without any negative outstanding invoice,{0} {1} {2} hech qanday salbiy taqdim etgan holda taqdim etilmaydi
@@ -2014,6 +2013,7 @@
 DocType: Cheque Print Template,Payer Settings,To&#39;lovchining sozlamalari
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js,No pending Material Requests found to link for the given items.,Berilgan narsalar uchun bog&#39;lanmagan Material Talablari topilmadi.
 apps/erpnext/erpnext/public/js/utils/party.js,Select company first,Avval kompaniya tanlang
+apps/erpnext/erpnext/accounts/general_ledger.py,Account: <b>{0}</b> is capital Work in progress and can not be updated by Journal Entry,Hisob qaydnomasi: <b>{0}</b> asosiy ish bajarilmoqda va Journal Entry tomonidan yangilanmaydi
 apps/erpnext/erpnext/education/doctype/quiz/quiz.py,Compare List function takes on list arguments,Taqqoslash ro&#39;yxati funktsiyasi ro&#39;yxat dalillarini qabul qiladi
 DocType: Item Attribute Value,"This will be appended to the Item Code of the variant. For example, if your abbreviation is ""SM"", and the item code is ""T-SHIRT"", the item code of the variant will be ""T-SHIRT-SM""","Bunga Variantning Mahsulot kodiga qo&#39;shiladi. Misol uchun, qisqartma &quot;SM&quot; bo&#39;lsa va element kodi &quot;T-SHIRT&quot; bo&#39;lsa, variantning element kodi &quot;T-SHIRT-SM&quot;"
 DocType: Salary Slip,Net Pay (in words) will be visible once you save the Salary Slip.,"Ish haqi miqdorini saqlaganingizdan so&#39;ng, aniq to&#39;lov (so&#39;zlar bilan) ko&#39;rinadi."
@@ -2198,6 +2198,7 @@
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js,Item 2,2-band
 DocType: Pricing Rule,Validate Applied Rule,Amaliy qoidalarni tasdiqlash
 DocType: QuickBooks Migrator,Authorization Endpoint,Avtorizatsiya yakuni
+DocType: Employee Onboarding,Notify users by email,Foydalanuvchilarni elektron pochta orqali xabardor qiling
 DocType: Travel Request,International,Xalqaro
 DocType: Training Event,Training Event,O&#39;quv mashg&#39;uloti
 DocType: Item,Auto re-order,Avtomatik buyurtma
@@ -2804,7 +2805,6 @@
 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
-DocType: Contract,Inactive,Faol emas
 apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.js,This will submit Salary Slips and create accrual Journal Entry. Do you want to proceed?,Bu ish haqi to`plarini taqdim etadi va hisobga olish jurnalini yaratadi. Davom etmoqchimisiz?
 DocType: Purchase Invoice,Total Net Weight,Jami aniq vazn
 DocType: Purchase Order,Order Confirmation No,Buyurtma tasdig&#39;i No
@@ -3081,7 +3081,6 @@
 apps/erpnext/erpnext/accounts/party.py,Billing currency must be equal to either default company's currency or party account currency,To&#39;lov valyutasi odatiy kompaniyaning valyutasiga yoki partiyaning hisobvaraqlariga teng bo&#39;lishi kerak
 DocType: Packing Slip,Indicates that the package is a part of this delivery (Only Draft),Paket ushbu etkazib berishning bir qismi ekanligini ko&#39;rsatadi (faqat loyiha)
 apps/erpnext/erpnext/accounts/report/customer_ledger_summary/customer_ledger_summary.py,Closing Balance,Yakuniy balans
-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}
 DocType: Soil Texture,Loam,Loam
 apps/erpnext/erpnext/controllers/accounts_controller.py,Row {0}: Due Date cannot be before posting date,Row {0}: sanasi sanasidan oldin sanasi bo&#39;lmaydi
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py,Quantity for Item {0} must be less than {1},{0} uchun mahsulot miqdori {1} dan kam bo&#39;lishi kerak
@@ -3604,7 +3603,6 @@
 DocType: Stock Settings,Raise Material Request when stock reaches re-order level,Buyurtma qayta buyurtma darajasiga yetganida Materiallar so&#39;rovini ko&#39;taring
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py,Full-time,To&#39;liq stavka
 DocType: Payroll Entry,Employees,Xodimlar
-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: Question,Single Correct Answer,Bitta to&#39;g&#39;ri javob
 DocType: Employee,Contact Details,Aloqa tafsilotlari
 DocType: C-Form,Received Date,Olingan sana
@@ -4213,6 +4211,7 @@
 DocType: Pricing Rule,Price or Product Discount,Narx yoki mahsulot chegirmasi
 apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.py,For row {0}: Enter planned qty,{0} qatoriga: rejali qty kiriting
 DocType: Account,Income Account,Daromad hisobvarag&#39;i
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Customer &gt; Customer Group &gt; Territory,Xaridor&gt; Mijozlar guruhi&gt; Hudud
 DocType: Payment Request,Amount in customer's currency,Mijozning valyutadagi miqdori
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js,Delivery,Yetkazib berish
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.py,Assigning Structures...,Tuzilmalarni tayinlash ...
@@ -4262,7 +4261,6 @@
 DocType: HR Settings,Check Vacancies On Job Offer Creation,Ish taklifini yaratish bo&#39;yicha bo&#39;sh ish o&#39;rinlarini tekshiring
 apps/erpnext/erpnext/utilities/user_progress.py,Go to Letterheads,Antetli qog&#39;ozlarga o&#39;ting
 DocType: Subscription,Cancel At End Of Period,Davr oxirida bekor qilish
-apps/erpnext/erpnext/education/doctype/instructor/instructor.py,Please setup Instructor Naming System in Education &gt; Education Settings,"Iltimos, Ta&#39;lim beruvchiga nom berish tizimini Ta&#39;lim sozlamalarida o&#39;rnating"
 apps/erpnext/erpnext/hr/doctype/employee_promotion/employee_promotion.js,Property already added,Xususiyat allaqachon qo&#39;shilgan
 DocType: Item Supplier,Item Supplier,Mahsulot etkazib beruvchisi
 apps/erpnext/erpnext/public/js/controllers/transaction.js,Please enter Item Code to get batch no,"Iltimos, mahsulot kodini kiriting"
@@ -4547,6 +4545,7 @@
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.js,Warning: Material Requested Qty is less than Minimum Order Qty,Ogohlantirish: Kerakli ma&#39;lumot Minimum Buyurtma miqdori ostida
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py,Account {0} is frozen,{0} hisobi muzlatilgan
 DocType: Quiz Question,Quiz Question,Viktorina savol
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Supplier &gt; Supplier Type,Ta&#39;minotchi&gt; Ta&#39;minotchi turi
 DocType: Company,Legal Entity / Subsidiary with a separate Chart of Accounts belonging to the Organization.,Yuridik shaxs / Tashkilotga qarashli alohida hisob-kitob rejasi bo&#39;lgan filial.
 DocType: Payment Request,Mute Email,E-pochtani o&#39;chirish
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py,"Food, Beverage & Tobacco","Oziq-ovqat, ichgani va tamaki"
@@ -5057,7 +5056,6 @@
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py,Delivery warehouse required for stock item {0},{0} aksessuarlari uchun yetkazib berish ombori
 DocType: Packing Slip,The gross weight of the package. Usually net weight + packaging material weight. (for print),Paketning umumiy og&#39;irligi. Odatda aniq og&#39;irlik + qadoqlash materialining og&#39;irligi. (chop etish uchun)
 DocType: Assessment Plan,Program,Dastur
-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: Accounts Settings,Users with this role are allowed to set frozen accounts and create / modify accounting entries against frozen accounts,Ushbu rolga ega foydalanuvchilar muzlatilgan hisoblarni o&#39;rnatish va muzlatilgan hisoblarga qarshi buxgalter yozuvlarini yaratish / o&#39;zgartirishga ruxsat beriladi
 ,Project Billing Summary,Loyihani taqdim etish bo&#39;yicha qisqacha ma&#39;lumot
 DocType: Vital Signs,Cuts,Cuts
@@ -5306,6 +5304,7 @@
 apps/erpnext/erpnext/quality_management/doctype/quality_review/quality_review_list.js,No Action,Harakat yo‘q
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js,Valuation type charges can not marked as Inclusive,Baholashning turi to&#39;lovlari inklyuziv sifatida belgilanishi mumkin emas
 DocType: POS Profile,Update Stock,Stokni yangilang
+apps/erpnext/erpnext/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/stock/doctype/packing_slip/packing_slip.js,Different UOM for items will lead to incorrect (Total) Net Weight value. Make sure that Net Weight of each item is in the same UOM.,Ma&#39;lumotlar uchun turli UOM noto&#39;g&#39;ri (Total) Net Og&#39;irligi qiymatiga olib keladi. Har bir elementning aniq vazniga bir xil UOM ichida ekanligiga ishonch hosil qiling.
 DocType: Certification Application,Payment Details,To&#39;lov ma&#39;lumoti
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py,BOM Rate,BOM darajasi
@@ -5409,6 +5408,8 @@
 apps/erpnext/erpnext/accounts/doctype/monthly_distribution/monthly_distribution.py,Percentage Allocation should be equal to 100%,Foizlarni taqsimlash 100%
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js,Please select Posting Date before selecting Party,Tomonni tanlashdan oldin sanasi sanasini tanlang
 apps/erpnext/erpnext/config/accounting.py,Payment Terms based on conditions,Shartlarga qarab to&#39;lov shartlari
+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: Program Enrollment,School House,Maktab uyi
 DocType: Serial No,Out of AMC,AMCdan tashqarida
 DocType: Opportunity,Opportunity Amount,Imkoniyatlar miqdori
@@ -5610,6 +5611,7 @@
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py,Order/Quot %,Buyurtma / QQT%
 apps/erpnext/erpnext/config/healthcare.py,Record Patient Vitals,Kasal bemorlarni yozib oling
 DocType: Fee Schedule,Institution,Tashkilotlar
+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}
 DocType: Asset,Partially Depreciated,Qisman Amortizatsiyalangan
 DocType: Issue,Opening Time,Vaqtni ochish
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py,From and To dates required,Kerakli kunlardan boshlab
@@ -5826,6 +5828,7 @@
 DocType: Quality Procedure Process,Link existing Quality Procedure.,Mavjud sifat tartibini bog&#39;lang.
 apps/erpnext/erpnext/config/hr.py,Loans,Kreditlar
 DocType: Healthcare Service Unit,Healthcare Service Unit,Sog&#39;liqni saqlash xizmati bo&#39;limi
+,Customer-wise Item Price,Xaridorga mos keladigan mahsulot narxi
 apps/erpnext/erpnext/public/js/financial_statements.js,Cash Flow Statement,Naqd pul oqimlari bayonoti
 apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.py,No material request created,Hech qanday material talabi yaratilmagan
 apps/erpnext/erpnext/hr/doctype/loan_application/loan_application.py,Loan Amount cannot exceed Maximum Loan Amount of {0},Kredit summasi {0} maksimum kredit summasidan oshib ketmasligi kerak.
@@ -6086,6 +6089,7 @@
 apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py,Opening Value,Ochilish qiymati
 DocType: Salary Component,Formula,Formulalar
 apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py,Serial #,Seriya #
+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: Material Request Plan Item,Required Quantity,Kerakli miqdori
 DocType: Lab Test Template,Lab Test Template,Laboratoriya viktorina namunasi
 apps/erpnext/erpnext/accounts/doctype/accounting_period/accounting_period.py,Accounting Period overlaps with {0},Hisob-kitob davri {0} bilan mos keladi
@@ -6335,7 +6339,6 @@
 DocType: Request for Quotation Item,Project Name,Loyiha nomi
 apps/erpnext/erpnext/regional/italy/utils.py,Please set the Customer Address,"Iltimos, mijoz manzilini ko&#39;rsating"
 DocType: Customer,Mention if non-standard receivable account,Standart bo&#39;lmagan deb hisob-kitobni eslab qoling
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Customer &gt; Customer Group &gt; Territory,Xaridor&gt; Mijozlar guruhi&gt; Hudud
 DocType: Bank,Plaid Access Token,Plaid kirish tokenlari
 apps/erpnext/erpnext/hr/doctype/employee_benefit_application/employee_benefit_application.py,Please add the remaining benefits {0} to any of the existing component,Qolgan imtiyozlarni {0} mavjud tarkibiy qismlardan biriga qo&#39;shing
 DocType: Journal Entry Account,If Income or Expense,Agar daromad yoki xarajat bo&#39;lsa
@@ -6598,8 +6601,6 @@
 apps/erpnext/erpnext/buying/utils.py,Please enter quantity for Item {0},"Iltimos, {0} mahsulot uchun miqdorni kiriting"
 DocType: Quality Procedure,Processes,Jarayonlar
 DocType: Shift Type,First Check-in and Last Check-out,Avval ro&#39;yxatdan o&#39;tish va oxirgi chiqish
-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/regional/report/hsn_wise_summary_of_outward_supplies/hsn_wise_summary_of_outward_supplies.py,Total Taxable Amount,Soliqqa tortiladigan jami miqdori
 DocType: Employee External Work History,Employee External Work History,Xodimning tashqi ish tarixi
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.py,Job card {0} created,{0} ish kartasi yaratildi
@@ -6635,6 +6636,7 @@
 apps/erpnext/erpnext/accounts/doctype/payment_terms_template/payment_terms_template.py,Combined invoice portion must equal 100%,Qo&#39;shma hisob-faktura qismi 100%
 DocType: Item Default,Default Expense Account,Standart xarajat hisob
 DocType: GST Account,CGST Account,CGST hisob
+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/education/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py,Student Email ID,Isoning shogirdi Email identifikatori
 DocType: Employee,Notice (days),Izoh (kun)
 DocType: POS Closing Voucher Invoices,POS Closing Voucher Invoices,Qalinligi uchun Voucher Faturalari
@@ -7273,6 +7275,7 @@
 DocType: Maintenance Visit,Maintenance Date,Xizmat sanasi
 DocType: Purchase Invoice Item,Rejected Serial No,Rad etilgan seriya raqami
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py,Year start date or end date is overlapping with {0}. To avoid please set company,Yil boshlanish sanasi yoki tugash sanasi {0} bilan örtüşüyor. Buning oldini olish uchun kompaniyani tanlang
+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/selling/doctype/customer/customer.py,Please mention the Lead Name in Lead {0},"Iltimos, qo&#39;rg&#39;oshin nomi {0}"
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py,Start date should be less than end date for Item {0},Boshlanish sanasi {0} element uchun tugash sanasidan past bo&#39;lishi kerak
 DocType: Shift Type,Auto Attendance Settings,Avtomatik ishtirok etish sozlamalari
diff --git a/erpnext/translations/vi.csv b/erpnext/translations/vi.csv
index e432fd1..c4e57db 100644
--- a/erpnext/translations/vi.csv
+++ b/erpnext/translations/vi.csv
@@ -168,7 +168,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py,Accountant,Kế toán viên
 apps/erpnext/erpnext/stock/report/item_price_stock/item_price_stock.py,Selling Price List,Bảng giá bán
 DocType: Patient,Tobacco Current Use,Sử dụng thuốc lá
-apps/erpnext/erpnext/stock/report/item_price_stock/item_price_stock.py,Selling Rate,Giá bán
+apps/erpnext/erpnext/selling/report/customer_wise_item_price/customer_wise_item_price.py,Selling Rate,Giá bán
 apps/erpnext/erpnext/erpnext_integrations/doctype/plaid_settings/plaid_settings.js,Please save your document before adding a new account,Vui lòng lưu tài liệu của bạn trước khi thêm tài khoản mới
 DocType: Cost Center,Stock User,Cổ khoản
 DocType: Soil Analysis,(Ca+Mg)/K,(Ca + Mg) / K
@@ -205,7 +205,6 @@
 DocType: Packed Item,Parent Detail docname,chi tiết tên tài liệu gốc
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py,"Reference: {0}, Item Code: {1} and Customer: {2}","Tham khảo: {0}, Mã hàng: {1} và Khách hàng: {2}"
 apps/erpnext/erpnext/accounts/report/consolidated_financial_statement/consolidated_financial_statement.py,{0} {1} is not present in the parent company,{0} {1} không có mặt trong công ty mẹ
-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/accounts/doctype/subscription/subscription.py,Trial Period End Date Cannot be before Trial Period Start Date,Ngày kết thúc giai đoạn dùng thử không thể trước ngày bắt đầu giai đoạn dùng thử
 apps/erpnext/erpnext/utilities/user_progress.py,Kg,Kg
 DocType: Tax Withholding Category,Tax Withholding Category,Danh mục khấu trừ thuế
@@ -319,6 +318,7 @@
 DocType: Quality Procedure Table,Responsible Individual,Cá nhân có trách nhiệm
 DocType: Naming Series,Prefix,Tiền tố
 apps/erpnext/erpnext/hr/notification/training_scheduled/training_scheduled.html,Event Location,Vị trí sự kiện
+apps/erpnext/erpnext/selling/report/customer_wise_item_price/customer_wise_item_price.py,Available Stock,Cổ phiếu có sẵn
 DocType: Asset Settings,Asset Settings,Cài đặt nội dung
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py,Consumable,Tiêu hao
 DocType: Student,B-,B-
@@ -352,6 +352,7 @@
 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 \
 				Serial No.",Không thể đảm bảo giao hàng theo Số Serial \ Mặt hàng {0} được tạo và không có thiết lập đảm bảo giao hàng đúng \ số Serial
+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/accounts/doctype/sales_invoice/sales_invoice.py,At least one mode of payment is required for POS invoice.,Ít nhất một phương thức thanh toán là cần thiết cho POS hóa đơn.
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py,Batch no is required for batched item {0},Không có lô nào là bắt buộc đối với mục theo lô {0}
 DocType: Bank Statement Transaction Invoice Item,Bank Statement Transaction Invoice Item,Mục hóa đơn giao dịch báo cáo ngân hàng
@@ -879,7 +880,6 @@
 DocType: Vital Signs,Blood Pressure (systolic),Huyết áp (tâm thu)
 apps/erpnext/erpnext/controllers/buying_controller.py,{0} {1} is {2},{0} {1} là {2}
 DocType: Item Price,Valid Upto,Hợp lệ tới
-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: Training Event,Workshop,xưởng
 DocType: Supplier Scorecard Scoring Standing,Warn Purchase Orders,Lệnh mua hàng cảnh báo
 apps/erpnext/erpnext/utilities/user_progress.py,List a few of your customers. They could be organizations or individuals.,lên danh sách một vài khách hàng của bạn. Họ có thể là các tổ chức hoặc cá nhân
@@ -1671,7 +1671,6 @@
 DocType: Item Barcode,Item Barcode,Mục mã vạch
 DocType: Delivery Trip,In Transit,Quá cảnh
 DocType: Woocommerce Settings,Endpoints,Điểm cuối
-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
 DocType: Shopping Cart Settings,Show Configure Button,Hiển thị nút cấu hình
 DocType: Quality Inspection Reading,Reading 6,Đọc 6
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js,Cannot {0} {1} {2} without any negative outstanding invoice,Không thể {0} {1} {2} không có bất kỳ hóa đơn xuất sắc tiêu cực
@@ -2036,6 +2035,7 @@
 DocType: Cheque Print Template,Payer Settings,Cài đặt người trả tiền
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js,No pending Material Requests found to link for the given items.,Không tìm thấy yêu cầu vật liệu đang chờ xử lý nào để liên kết cho các mục nhất định.
 apps/erpnext/erpnext/public/js/utils/party.js,Select company first,Chọn công ty trước
+apps/erpnext/erpnext/accounts/general_ledger.py,Account: <b>{0}</b> is capital Work in progress and can not be updated by Journal Entry,Tài khoản: <b>{0}</b> là vốn Công việc đang được tiến hành và không thể cập nhật bằng Nhật ký
 apps/erpnext/erpnext/education/doctype/quiz/quiz.py,Compare List function takes on list arguments,Chức năng So sánh Danh sách đảm nhận đối số danh sách
 DocType: Item Attribute Value,"This will be appended to the Item Code of the variant. For example, if your abbreviation is ""SM"", and the item code is ""T-SHIRT"", the item code of the variant will be ""T-SHIRT-SM""","Điều này sẽ được nối thêm vào các mã hàng của các biến thể. Ví dụ, nếu bạn viết tắt là ""SM"", và các mã hàng là ""T-shirt"", các mã hàng của các biến thể sẽ là ""T-shirt-SM"""
 DocType: Salary Slip,Net Pay (in words) will be visible once you save the Salary Slip.,Tiền thực phải trả (bằng chữ) sẽ hiện ra khi bạn lưu bảng lương
@@ -2222,6 +2222,7 @@
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js,Item 2,Khoản 2
 DocType: Pricing Rule,Validate Applied Rule,Xác thực quy tắc áp dụng
 DocType: QuickBooks Migrator,Authorization Endpoint,Điểm cuối ủy quyền
+DocType: Employee Onboarding,Notify users by email,Thông báo cho người dùng qua email
 DocType: Travel Request,International,Quốc tế
 DocType: Training Event,Training Event,Sự kiện Đào tạo
 DocType: Item,Auto re-order,Auto lại trật tự
@@ -2838,7 +2839,6 @@
 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
-DocType: Contract,Inactive,Không hoạt động
 apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.js,This will submit Salary Slips and create accrual Journal Entry. Do you want to proceed?,Điều này sẽ gửi phiếu lương và tạo Khoản Ghi Theo Dồn. Bạn có muốn tiếp tục?
 DocType: Purchase Invoice,Total Net Weight,Tổng trọng lượng tịnh
 DocType: Purchase Order,Order Confirmation No,Xác nhận Đơn hàng
@@ -3121,7 +3121,6 @@
 apps/erpnext/erpnext/accounts/party.py,Billing currency must be equal to either default company's currency or party account currency,Đơn vị tiền tệ thanh toán phải bằng đơn vị tiền tệ của công ty mặc định hoặc tiền của tài khoản của bên thứ ba
 DocType: Packing Slip,Indicates that the package is a part of this delivery (Only Draft),Chỉ ra rằng gói này một phần của việc phân phối (Chỉ bản nháp)
 apps/erpnext/erpnext/accounts/report/customer_ledger_summary/customer_ledger_summary.py,Closing Balance,Số dư cuối kỳ
-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}
 DocType: Soil Texture,Loam,Tiếng ồn
 apps/erpnext/erpnext/controllers/accounts_controller.py,Row {0}: Due Date cannot be before posting date,Hàng {0}: Ngày hết hạn không thể trước ngày đăng
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py,Quantity for Item {0} must be less than {1},Số lượng cho hàng {0} phải nhỏ hơn {1}
@@ -3651,7 +3650,6 @@
 DocType: Stock Settings,Raise Material Request when stock reaches re-order level,Nâng cao Chất liệu Yêu cầu khi cổ phiếu đạt đến cấp độ sắp xếp lại
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py,Full-time,Toàn thời gian
 DocType: Payroll Entry,Employees,Nhân viên
-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: Question,Single Correct Answer,Câu trả lời đúng
 DocType: Employee,Contact Details,Chi tiết Liên hệ
 DocType: C-Form,Received Date,Hạn nhận
@@ -4267,6 +4265,7 @@
 DocType: Pricing Rule,Price or Product Discount,Giảm giá hoặc sản phẩm
 apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.py,For row {0}: Enter planned qty,Đối với hàng {0}: Nhập số lượng dự kiến
 DocType: Account,Income Account,Tài khoản thu nhập
+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: Payment Request,Amount in customer's currency,Tiền quy đổi theo ngoại tệ của khách
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js,Delivery,Giao hàng
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.py,Assigning Structures...,Phân công cấu trúc ...
@@ -4316,7 +4315,6 @@
 DocType: HR Settings,Check Vacancies On Job Offer Creation,Kiểm tra vị trí tuyển dụng khi tạo việc làm
 apps/erpnext/erpnext/utilities/user_progress.py,Go to Letterheads,Tới Tiêu đề thư
 DocType: Subscription,Cancel At End Of Period,Hủy vào cuối kỳ
-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/hr/doctype/employee_promotion/employee_promotion.js,Property already added,Đã thêm thuộc tính
 DocType: Item Supplier,Item Supplier,Mục Nhà cung cấp
 apps/erpnext/erpnext/public/js/controllers/transaction.js,Please enter Item Code to get batch no,Vui lòng nhập Item Code để có được hàng loạt không
@@ -4614,6 +4612,7 @@
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.js,Warning: Material Requested Qty is less than Minimum Order Qty,Cảnh báo: vật tư yêu cầu có số lượng ít hơn mức tối thiểu
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py,Account {0} is frozen,Tài khoản {0} bị đóng băng
 DocType: Quiz Question,Quiz Question,Câu hỏi trắc nghiệm
+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: Company,Legal Entity / Subsidiary with a separate Chart of Accounts belonging to the Organization.,Pháp nhân / Công ty con với một biểu đồ riêng của tài khoản thuộc Tổ chức.
 DocType: Payment Request,Mute Email,Tắt tiếng email
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py,"Food, Beverage & Tobacco","Thực phẩm, đồ uống và thuốc lá"
@@ -5130,7 +5129,6 @@
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py,Delivery warehouse required for stock item {0},Cần nhập kho giao/nhận cho hàng hóa {0}
 DocType: Packing Slip,The gross weight of the package. Usually net weight + packaging material weight. (for print),Tổng trọng lượng của gói. Thường là khối lượng tịnh + trọng lượng vật liệu. (Đối với việc in)
 DocType: Assessment Plan,Program,chương trình
-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: Accounts Settings,Users with this role are allowed to set frozen accounts and create / modify accounting entries against frozen accounts,Người sử dụng với vai trò này được phép thiết lập tài khoản phong toả và tạo / sửa đổi ghi sổ kế toán đối với tài khoản phong toả
 ,Project Billing Summary,Tóm tắt thanh toán dự án
 DocType: Vital Signs,Cuts,Cắt giảm
@@ -5381,6 +5379,7 @@
 apps/erpnext/erpnext/quality_management/doctype/quality_review/quality_review_list.js,No Action,Không có hành động
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js,Valuation type charges can not marked as Inclusive,Phí kiểu định giá không thể đánh dấu là toàn bộ
 DocType: POS Profile,Update Stock,Cập nhật hàng tồn kho
+apps/erpnext/erpnext/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/stock/doctype/packing_slip/packing_slip.js,Different UOM for items will lead to incorrect (Total) Net Weight value. Make sure that Net Weight of each item is in the same UOM.,UOM khác nhau cho các hạng mục sẽ dẫn đến (Tổng) giá trị Trọng lượng Tịnh không chính xác. Hãy chắc chắn rằng Trọng lượng Tịnh của mỗi hạng mục là trong cùng một UOM.
 DocType: Certification Application,Payment Details,Chi tiết Thanh toán
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py,BOM Rate,Tỷ giá BOM
@@ -5486,6 +5485,8 @@
 apps/erpnext/erpnext/accounts/doctype/monthly_distribution/monthly_distribution.py,Percentage Allocation should be equal to 100%,Tỷ lệ phần trăm phân bổ phải bằng 100%
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js,Please select Posting Date before selecting Party,Vui lòng chọn ngày đăng bài trước khi lựa chọn đối tác
 apps/erpnext/erpnext/config/accounting.py,Payment Terms based on conditions,Điều khoản thanh toán dựa trên các điều kiện
+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: Program Enrollment,School House,School House
 DocType: Serial No,Out of AMC,Của AMC
 DocType: Opportunity,Opportunity Amount,Số tiền cơ hội
@@ -5689,6 +5690,7 @@
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py,Order/Quot %,Yêu cầu/Trích dẫn%
 apps/erpnext/erpnext/config/healthcare.py,Record Patient Vitals,Ghi lại Vitals Bệnh nhân
 DocType: Fee Schedule,Institution,Tổ chức giáo dục
+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}
 DocType: Asset,Partially Depreciated,Nhiều khấu hao
 DocType: Issue,Opening Time,Thời gian mở
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py,From and To dates required,"""Từ ngày đến ngày"" phải có"
@@ -5909,6 +5911,7 @@
 DocType: Quality Procedure Process,Link existing Quality Procedure.,Liên kết Thủ tục chất lượng hiện có.
 apps/erpnext/erpnext/config/hr.py,Loans,Cho vay
 DocType: Healthcare Service Unit,Healthcare Service Unit,Đơn vị dịch vụ chăm sóc sức khỏe
+,Customer-wise Item Price,Giá khách hàng thông thái
 apps/erpnext/erpnext/public/js/financial_statements.js,Cash Flow Statement,Báo cáo lưu chuyển tiền mặt
 apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.py,No material request created,Không có yêu cầu vật liệu được tạo
 apps/erpnext/erpnext/hr/doctype/loan_application/loan_application.py,Loan Amount cannot exceed Maximum Loan Amount of {0},Số tiền cho vay không thể vượt quá Số tiền cho vay tối đa của {0}
@@ -6174,6 +6177,7 @@
 apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py,Opening Value,Giá trị mở
 DocType: Salary Component,Formula,Công thức
 apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py,Serial #,Serial #
+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: Material Request Plan Item,Required Quantity,Số lượng yêu cầu
 DocType: Lab Test Template,Lab Test Template,Mẫu thử nghiệm Lab
 apps/erpnext/erpnext/accounts/doctype/accounting_period/accounting_period.py,Accounting Period overlaps with {0},Kỳ kế toán trùng lặp với {0}
@@ -6424,7 +6428,6 @@
 DocType: Request for Quotation Item,Project Name,Tên dự án
 apps/erpnext/erpnext/regional/italy/utils.py,Please set the Customer Address,Vui lòng đặt Địa chỉ khách hàng
 DocType: Customer,Mention if non-standard receivable account,Đề cập đến nếu tài khoản phải thu phi tiêu chuẩn
-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: Bank,Plaid Access Token,Mã thông báo truy cập kẻ sọc
 apps/erpnext/erpnext/hr/doctype/employee_benefit_application/employee_benefit_application.py,Please add the remaining benefits {0} to any of the existing component,Vui lòng thêm các lợi ích còn lại {0} vào bất kỳ thành phần hiện có nào
 DocType: Journal Entry Account,If Income or Expense,Nếu thu nhập hoặc chi phí
@@ -6688,8 +6691,6 @@
 apps/erpnext/erpnext/buying/utils.py,Please enter quantity for Item {0},Vui lòng nhập số lượng cho hàng {0}
 DocType: Quality Procedure,Processes,Quy trình
 DocType: Shift Type,First Check-in and Last Check-out,Nhận phòng lần đầu và Trả phòng lần cuố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","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/regional/report/hsn_wise_summary_of_outward_supplies/hsn_wise_summary_of_outward_supplies.py,Total Taxable Amount,Tổng số tiền phải chịu thuế
 DocType: Employee External Work History,Employee External Work History,Nhân viên làm việc ngoài Lịch sử
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.py,Job card {0} created,Đã tạo thẻ công việc {0}
@@ -6726,6 +6727,7 @@
 apps/erpnext/erpnext/accounts/doctype/payment_terms_template/payment_terms_template.py,Combined invoice portion must equal 100%,Phần hoá đơn kết hợp phải bằng 100%
 DocType: Item Default,Default Expense Account,Tài khoản mặc định chi phí
 DocType: GST Account,CGST Account,Tài khoản CGST
+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/education/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py,Student Email ID,Email ID Sinh viên
 DocType: Employee,Notice (days),Thông báo (ngày)
 DocType: POS Closing Voucher Invoices,POS Closing Voucher Invoices,Hóa đơn phiếu mua hàng POS
@@ -7369,6 +7371,7 @@
 DocType: Maintenance Visit,Maintenance Date,Bảo trì ngày
 DocType: Purchase Invoice Item,Rejected Serial No,Dãy sê ri bị từ chối số
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py,Year start date or end date is overlapping with {0}. To avoid please set company,Ngày bắt đầu và kết thúc năm bị chồng lấn với {0}. Để tránh nó hãy thiết lập công ty.
+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/selling/doctype/customer/customer.py,Please mention the Lead Name in Lead {0},Hãy đề cập tới tên của tiềm năng trong mục Tiềm năng {0}
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py,Start date should be less than end date for Item {0},Ngày bắt đầu phải nhỏ hơn ngày kết thúc cho mẫu hàng {0}
 DocType: Shift Type,Auto Attendance Settings,Cài đặt tham dự tự động
diff --git a/erpnext/translations/zh.csv b/erpnext/translations/zh.csv
index b2cf6fc..c0b5724 100644
--- a/erpnext/translations/zh.csv
+++ b/erpnext/translations/zh.csv
@@ -167,7 +167,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py,Accountant,会计
 apps/erpnext/erpnext/stock/report/item_price_stock/item_price_stock.py,Selling Price List,销售价格清单
 DocType: Patient,Tobacco Current Use,烟草当前使用
-apps/erpnext/erpnext/stock/report/item_price_stock/item_price_stock.py,Selling Rate,销售价
+apps/erpnext/erpnext/selling/report/customer_wise_item_price/customer_wise_item_price.py,Selling Rate,销售价
 apps/erpnext/erpnext/erpnext_integrations/doctype/plaid_settings/plaid_settings.js,Please save your document before adding a new account,请在添加新帐户之前保存您的文档
 DocType: Cost Center,Stock User,库存用户
 DocType: Soil Analysis,(Ca+Mg)/K,（钙+镁）/ K
@@ -204,7 +204,6 @@
 DocType: Packed Item,Parent Detail docname,上级详细文件名
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py,"Reference: {0}, Item Code: {1} and Customer: {2}",参考：{0}，物料代号：{1}和顾客：{2}
 apps/erpnext/erpnext/accounts/report/consolidated_financial_statement/consolidated_financial_statement.py,{0} {1} is not present in the parent company,母公司中不存在{0} {1}
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Supplier &gt; Supplier Type,供应商&gt;供应商类型
 apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py,Trial Period End Date Cannot be before Trial Period Start Date,试用期结束日期不能在试用期开始日期之前
 apps/erpnext/erpnext/utilities/user_progress.py,Kg,千克
 DocType: Tax Withholding Category,Tax Withholding Category,预扣税类别
@@ -318,6 +317,7 @@
 DocType: Quality Procedure Table,Responsible Individual,负责任的个人
 DocType: Naming Series,Prefix,字首
 apps/erpnext/erpnext/hr/notification/training_scheduled/training_scheduled.html,Event Location,活动地点
+apps/erpnext/erpnext/selling/report/customer_wise_item_price/customer_wise_item_price.py,Available Stock,可用库存
 DocType: Asset Settings,Asset Settings,资产设置
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py,Consumable,耗材
 DocType: Student,B-,B-
@@ -351,6 +351,7 @@
 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 \
 				Serial No.",无法通过序列号确保交货，因为\项目{0}是否添加了确保交货\序列号
+apps/erpnext/erpnext/education/doctype/instructor/instructor.py,Please setup Instructor Naming System in Education &gt; Education Settings,请在教育&gt;教育设置中设置教师命名系统
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py,At least one mode of payment is required for POS invoice.,需要为POS费用清单定义至少一种付款模式
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py,Batch no is required for batched item {0},批处理项{0}需要批次否
 DocType: Bank Statement Transaction Invoice Item,Bank Statement Transaction Invoice Item,银行对账单交易费用清单条目
@@ -879,7 +880,6 @@
 DocType: Vital Signs,Blood Pressure (systolic),血压（收缩期）
 apps/erpnext/erpnext/controllers/buying_controller.py,{0} {1} is {2},{0} {1}是{2}
 DocType: Item Price,Valid Upto,有效期至
-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: Training Event,Workshop,车间
 DocType: Supplier Scorecard Scoring Standing,Warn Purchase Orders,警告采购订单
 apps/erpnext/erpnext/utilities/user_progress.py,List a few of your customers. They could be organizations or individuals.,列出一些你的客户，他们可以是组织或个人。
@@ -1681,7 +1681,6 @@
 DocType: Item Barcode,Item Barcode,物料条码
 DocType: Delivery Trip,In Transit,运输中
 DocType: Woocommerce Settings,Endpoints,端点
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Item Code &gt; Item Group &gt; Brand,商品代码&gt;商品分组&gt;品牌
 DocType: Shopping Cart Settings,Show Configure Button,显示配置按钮
 DocType: Quality Inspection Reading,Reading 6,检验结果6
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js,Cannot {0} {1} {2} without any negative outstanding invoice,没有负的未完成费用清单，无法{0} {1} {2}
@@ -2045,6 +2044,7 @@
 DocType: Cheque Print Template,Payer Settings,付款人设置
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js,No pending Material Requests found to link for the given items.,找不到针对给定项目链接的待处理物料请求。
 apps/erpnext/erpnext/public/js/utils/party.js,Select company first,首先选择公司
+apps/erpnext/erpnext/accounts/general_ledger.py,Account: <b>{0}</b> is capital Work in progress and can not be updated by Journal Entry,帐户： <b>{0}</b>是资金正在进行中，日记帐分录无法更新
 apps/erpnext/erpnext/education/doctype/quiz/quiz.py,Compare List function takes on list arguments,比较List函数采用列表参数
 DocType: Item Attribute Value,"This will be appended to the Item Code of the variant. For example, if your abbreviation is ""SM"", and the item code is ""T-SHIRT"", the item code of the variant will be ""T-SHIRT-SM""",这将追加到物料代码变量。例如，如果你的英文缩写为“SM”，而该物料代码是“T-SHIRT”，该变式的物料代码将是“T-SHIRT-SM”
 DocType: Salary Slip,Net Pay (in words) will be visible once you save the Salary Slip.,保存工资单后会显示净支付金额(大写)。
@@ -2231,6 +2231,7 @@
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js,Item 2,物料2
 DocType: Pricing Rule,Validate Applied Rule,验证应用规则
 DocType: QuickBooks Migrator,Authorization Endpoint,授权端点
+DocType: Employee Onboarding,Notify users by email,通过电子邮件通知用户
 DocType: Travel Request,International,国际
 DocType: Training Event,Training Event,培训项目
 DocType: Item,Auto re-order,自动重订货
@@ -2844,7 +2845,6 @@
 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,已存在同名客户
-DocType: Contract,Inactive,非活动的
 apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.js,This will submit Salary Slips and create accrual Journal Entry. Do you want to proceed?,这将提交工资单，并创建权责发生制日记账分录。你想继续吗？
 DocType: Purchase Invoice,Total Net Weight,总净重
 DocType: Purchase Order,Order Confirmation No,订单确认号
@@ -3125,7 +3125,6 @@
 apps/erpnext/erpnext/accounts/party.py,Billing currency must be equal to either default company's currency or party account currency,帐单货币必须等于默认公司的货币或科目币种
 DocType: Packing Slip,Indicates that the package is a part of this delivery (Only Draft),表示该打包是这个交付的一部分（仅草稿）
 apps/erpnext/erpnext/accounts/report/customer_ledger_summary/customer_ledger_summary.py,Closing Balance,结算余额
-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: Soil Texture,Loam,壤土
 apps/erpnext/erpnext/controllers/accounts_controller.py,Row {0}: Due Date cannot be before posting date,行{0}：到期日不能在记帐日之前
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py,Quantity for Item {0} must be less than {1},物料{0}的数量必须小于{1}
@@ -3655,7 +3654,6 @@
 DocType: Stock Settings,Raise Material Request when stock reaches re-order level,当库存达到重订货点时提出物料申请
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py,Full-time,全职
 DocType: Payroll Entry,Employees,员工
-apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py,Please setup numbering series for Attendance via Setup &gt; Numbering Series,请通过设置&gt;编号系列设置出勤编号系列
 DocType: Question,Single Correct Answer,单一正确答案
 DocType: Employee,Contact Details,联系人信息
 DocType: C-Form,Received Date,收到日期
@@ -4279,6 +4277,7 @@
 DocType: Pricing Rule,Price or Product Discount,价格或产品折扣
 apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.py,For row {0}: Enter planned qty,对于行{0}：输入计划的数量
 DocType: Account,Income Account,收入科目
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Customer &gt; Customer Group &gt; Territory,客户&gt;客户组&gt;地区
 DocType: Payment Request,Amount in customer's currency,量客户的货币
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js,Delivery,交货
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.py,Assigning Structures...,分配结构...
@@ -4328,7 +4327,6 @@
 DocType: HR Settings,Check Vacancies On Job Offer Creation,检查创造就业机会的职位空缺
 apps/erpnext/erpnext/utilities/user_progress.py,Go to Letterheads,转到信头
 DocType: Subscription,Cancel At End Of Period,在期末取消
-apps/erpnext/erpnext/education/doctype/instructor/instructor.py,Please setup Instructor Naming System in Education &gt; Education Settings,请在教育&gt;教育设置中设置教师命名系统
 apps/erpnext/erpnext/hr/doctype/employee_promotion/employee_promotion.js,Property already added,已添加属性
 DocType: Item Supplier,Item Supplier,物料供应商
 apps/erpnext/erpnext/public/js/controllers/transaction.js,Please enter Item Code to get batch no,请输入物料代码，以获得批号
@@ -4614,6 +4612,7 @@
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.js,Warning: Material Requested Qty is less than Minimum Order Qty,警告：物料需求数量低于最小起订量
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py,Account {0} is frozen,科目{0}已冻结
 DocType: Quiz Question,Quiz Question,测验问题
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Supplier &gt; Supplier Type,供应商&gt;供应商类型
 DocType: Company,Legal Entity / Subsidiary with a separate Chart of Accounts belonging to the Organization.,属于本机构的，带独立科目表的法人/附属机构。
 DocType: Payment Request,Mute Email,静音电子邮件
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py,"Food, Beverage & Tobacco",食品，饮料与烟草
@@ -5128,7 +5127,6 @@
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py,Delivery warehouse required for stock item {0},物料{0}为库存管理物料，且在主数据中未定义默认仓库，请在销售订单行填写出货仓库信息
 DocType: Packing Slip,The gross weight of the package. Usually net weight + packaging material weight. (for print),包装的毛重。通常是净重+包装材料的重量。 （用于打印）
 DocType: Assessment Plan,Program,程序
-apps/erpnext/erpnext/hr/doctype/employee/employee.py,Please setup Employee Naming System in Human Resource &gt; HR Settings,请在人力资源&gt;人力资源设置中设置员工命名系统
 DocType: Accounts Settings,Users with this role are allowed to set frozen accounts and create / modify accounting entries against frozen accounts,拥有此角色的用户可以设置冻结科目，创建/修改冻结科目的会计凭证
 ,Project Billing Summary,项目开票摘要
 DocType: Vital Signs,Cuts,削减
@@ -5379,6 +5377,7 @@
 apps/erpnext/erpnext/quality_management/doctype/quality_review/quality_review_list.js,No Action,没有行动
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js,Valuation type charges can not marked as Inclusive,估值类型罪名不能标记为包容性
 DocType: POS Profile,Update Stock,更新库存
+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/stock/doctype/packing_slip/packing_slip.js,Different UOM for items will lead to incorrect (Total) Net Weight value. Make sure that Net Weight of each item is in the same UOM.,不同计量单位的项目会导致不正确的（总）净重值。请确保每个物料的净重使用同一个计量单位。
 DocType: Certification Application,Payment Details,付款信息
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py,BOM Rate,物料清单税率
@@ -5484,6 +5483,8 @@
 apps/erpnext/erpnext/accounts/doctype/monthly_distribution/monthly_distribution.py,Percentage Allocation should be equal to 100%,百分比分配应该等于100 ％
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js,Please select Posting Date before selecting Party,在选择往来单位之前请先选择记帐日期
 apps/erpnext/erpnext/config/accounting.py,Payment Terms based on conditions,付款条款基于条件
+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: Program Enrollment,School House,学校议院
 DocType: Serial No,Out of AMC,出资产管理公司
 DocType: Opportunity,Opportunity Amount,机会金额
@@ -5687,6 +5688,7 @@
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py,Order/Quot %,订单/报价％
 apps/erpnext/erpnext/config/healthcare.py,Record Patient Vitals,记录患者维生素
 DocType: Fee Schedule,Institution,机构
+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: Asset,Partially Depreciated,部分贬值
 DocType: Issue,Opening Time,开放时间
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py,From and To dates required,必须指定起始和结束日期
@@ -5906,6 +5908,7 @@
 DocType: Quality Procedure Process,Link existing Quality Procedure.,链接现有的质量程序。
 apps/erpnext/erpnext/config/hr.py,Loans,贷款
 DocType: Healthcare Service Unit,Healthcare Service Unit,医疗服务单位
+,Customer-wise Item Price,客户明智的物品价格
 apps/erpnext/erpnext/public/js/financial_statements.js,Cash Flow Statement,现金流量表
 apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.py,No material request created,没有创建重要请求
 apps/erpnext/erpnext/hr/doctype/loan_application/loan_application.py,Loan Amount cannot exceed Maximum Loan Amount of {0},贷款额不能超过最高贷款额度{0}
@@ -6171,6 +6174,7 @@
 apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py,Opening Value,期初金额
 DocType: Salary Component,Formula,公式
 apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py,Serial #,序列号
+apps/erpnext/erpnext/hr/doctype/employee/employee.py,Please setup Employee Naming System in Human Resource &gt; HR Settings,请在人力资源&gt;人力资源设置中设置员工命名系统
 DocType: Material Request Plan Item,Required Quantity,所需数量
 DocType: Lab Test Template,Lab Test Template,实验室测试模板
 apps/erpnext/erpnext/accounts/doctype/accounting_period/accounting_period.py,Accounting Period overlaps with {0},会计期间与{0}重叠
@@ -6421,7 +6425,6 @@
 DocType: Request for Quotation Item,Project Name,项目名称
 apps/erpnext/erpnext/regional/italy/utils.py,Please set the Customer Address,请设置客户地址
 DocType: Customer,Mention if non-standard receivable account,如需记账到非标准应收账款科目应提及
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Customer &gt; Customer Group &gt; Territory,客户&gt;客户组&gt;地区
 DocType: Bank,Plaid Access Token,格子访问令牌
 apps/erpnext/erpnext/hr/doctype/employee_benefit_application/employee_benefit_application.py,Please add the remaining benefits {0} to any of the existing component,请将其余好处{0}添加到任何现有组件
 DocType: Journal Entry Account,If Income or Expense,收入或支出
@@ -6685,8 +6688,6 @@
 apps/erpnext/erpnext/buying/utils.py,Please enter quantity for Item {0},请输入物料{0}数量
 DocType: Quality Procedure,Processes,流程
 DocType: Shift Type,First Check-in and Last Check-out,首次入住和最后退房
-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/regional/report/hsn_wise_summary_of_outward_supplies/hsn_wise_summary_of_outward_supplies.py,Total Taxable Amount,应纳税总额
 DocType: Employee External Work History,Employee External Work History,员工外部就职经历
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.py,Job card {0} created,已创建作业卡{0}
@@ -6723,6 +6724,7 @@
 apps/erpnext/erpnext/accounts/doctype/payment_terms_template/payment_terms_template.py,Combined invoice portion must equal 100%,合并费用清单部分必须等于100％
 DocType: Item Default,Default Expense Account,默认费用科目
 DocType: GST Account,CGST Account,CGST账户
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Item Code &gt; Item Group &gt; Brand,商品代码&gt;商品分组&gt;品牌
 apps/erpnext/erpnext/education/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py,Student Email ID,学生的电子邮件ID
 DocType: Employee,Notice (days),通告（天）
 DocType: POS Closing Voucher Invoices,POS Closing Voucher Invoices,销售pos终端关闭凭证费用清单
@@ -7366,6 +7368,7 @@
 DocType: Maintenance Visit,Maintenance Date,维护日期
 DocType: Purchase Invoice Item,Rejected Serial No,拒收序列号
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py,Year start date or end date is overlapping with {0}. To avoid please set company,新财年开始或结束日期与{0}重叠。请在公司主数据中设置
+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/selling/doctype/customer/customer.py,Please mention the Lead Name in Lead {0},请提及潜在客户名称{0}
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py,Start date should be less than end date for Item {0},物料{0}的开始日期必须小于结束日期
 DocType: Shift Type,Auto Attendance Settings,自动出勤设置
diff --git a/erpnext/translations/zh_tw.csv b/erpnext/translations/zh_tw.csv
index a5eed5c..2f8b6ea 100644
--- a/erpnext/translations/zh_tw.csv
+++ b/erpnext/translations/zh_tw.csv
@@ -147,7 +147,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py,Accountant,會計人員
 apps/erpnext/erpnext/stock/report/item_price_stock/item_price_stock.py,Selling Price List,賣價格表
 DocType: Patient,Tobacco Current Use,煙草當前使用
-apps/erpnext/erpnext/stock/report/item_price_stock/item_price_stock.py,Selling Rate,賣出率
+apps/erpnext/erpnext/selling/report/customer_wise_item_price/customer_wise_item_price.py,Selling Rate,賣出率
 apps/erpnext/erpnext/erpnext_integrations/doctype/plaid_settings/plaid_settings.js,Please save your document before adding a new account,請在添加新帳戶之前保存您的文檔
 DocType: Cost Center,Stock User,庫存用戶
 DocType: Soil Analysis,(Ca+Mg)/K,（鈣+鎂）/ K
@@ -180,7 +180,6 @@
 DocType: Packed Item,Parent Detail docname,家長可採用DocName細節
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py,"Reference: {0}, Item Code: {1} and Customer: {2}",參考：{0}，商品編號：{1}和顧客：{2}
 apps/erpnext/erpnext/accounts/report/consolidated_financial_statement/consolidated_financial_statement.py,{0} {1} is not present in the parent company,在母公司中不存在{0} {1}
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Supplier &gt; Supplier Type,供應商&gt;供應商類型
 apps/erpnext/erpnext/accounts/doctype/subscription/subscription.py,Trial Period End Date Cannot be before Trial Period Start Date,試用期結束日期不能在試用期開始日期之前
 apps/erpnext/erpnext/utilities/user_progress.py,Kg,公斤
 DocType: Tax Withholding Category,Tax Withholding Category,預扣稅類別
@@ -283,6 +282,7 @@
 DocType: Location,Location Name,地點名稱
 DocType: Quality Procedure Table,Responsible Individual,負責任的個人
 apps/erpnext/erpnext/hr/notification/training_scheduled/training_scheduled.html,Event Location,活動地點
+apps/erpnext/erpnext/selling/report/customer_wise_item_price/customer_wise_item_price.py,Available Stock,可用庫存
 DocType: Asset Settings,Asset Settings,資產設置
 DocType: Assessment Result,Grade,年級
 DocType: Restaurant Table,No of Seats,座位數
@@ -311,6 +311,7 @@
 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 \
 				Serial No.",無法通過序列號確保交貨，因為\項目{0}是否添加了確保交貨\序列號
+apps/erpnext/erpnext/education/doctype/instructor/instructor.py,Please setup Instructor Naming System in Education &gt; Education Settings,請在教育&gt;教育設置中設置教師命名系統
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py,At least one mode of payment is required for POS invoice.,付款中的至少一個模式需要POS發票。
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py,Batch no is required for batched item {0},批處理項{0}需要批次否
 DocType: Bank Statement Transaction Invoice Item,Bank Statement Transaction Invoice Item,銀行對賬單交易發票項目
@@ -795,7 +796,6 @@
 apps/erpnext/erpnext/healthcare/doctype/clinical_procedure_template/clinical_procedure_template.js,Change Item Code,更改物料代碼
 DocType: Vital Signs,Blood Pressure (systolic),血壓（收縮期）
 DocType: Item Price,Valid Upto,到...為止有效
-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: Training Event,Workshop,作坊
 DocType: Supplier Scorecard Scoring Standing,Warn Purchase Orders,警告採購訂單
 apps/erpnext/erpnext/utilities/user_progress.py,List a few of your customers. They could be organizations or individuals.,列出一些你的客戶。他們可以是組織或個人。
@@ -1539,7 +1539,6 @@
 DocType: Item Barcode,Item Barcode,商品條碼
 DocType: Delivery Trip,In Transit,運輸中
 DocType: Woocommerce Settings,Endpoints,端點
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Item Code &gt; Item Group &gt; Brand,商品代碼&gt;商品分組&gt;品牌
 DocType: Shopping Cart Settings,Show Configure Button,顯示配置按鈕
 DocType: Quality Inspection Reading,Reading 6,6閱讀
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js,Cannot {0} {1} {2} without any negative outstanding invoice,無法{0} {1} {2}沒有任何負面的優秀發票
@@ -1872,6 +1871,7 @@
 DocType: Cheque Print Template,Payer Settings,付款人設置
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js,No pending Material Requests found to link for the given items.,找不到針對給定項目鏈接的待處理物料請求。
 apps/erpnext/erpnext/public/js/utils/party.js,Select company first,首先選擇公司
+apps/erpnext/erpnext/accounts/general_ledger.py,Account: <b>{0}</b> is capital Work in progress and can not be updated by Journal Entry,帳戶： <b>{0}</b>是資金正在進行中，日記帳分錄無法更新
 apps/erpnext/erpnext/education/doctype/quiz/quiz.py,Compare List function takes on list arguments,比較List函數採用列表參數
 DocType: Item Attribute Value,"This will be appended to the Item Code of the variant. For example, if your abbreviation is ""SM"", and the item code is ""T-SHIRT"", the item code of the variant will be ""T-SHIRT-SM""",這將追加到變異的項目代碼。例如，如果你的英文縮寫為“SM”，而該項目的代碼是“T-SHIRT”，該變種的項目代碼將是“T-SHIRT-SM”
 DocType: Salary Slip,Net Pay (in words) will be visible once you save the Salary Slip.,薪資單一被儲存，淨付款就會被顯示出來。
@@ -2039,6 +2039,7 @@
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js,Item 2,項目2
 DocType: Pricing Rule,Validate Applied Rule,驗證應用規則
 DocType: QuickBooks Migrator,Authorization Endpoint,授權端點
+DocType: Employee Onboarding,Notify users by email,通過電子郵件通知用戶
 DocType: Travel Request,International,國際
 DocType: Training Event,Training Event,培訓活動
 DocType: Item,Auto re-order,自動重新排序
@@ -2594,7 +2595,6 @@
 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,一個同名的客戶已經存在
-DocType: Contract,Inactive,待用
 apps/erpnext/erpnext/hr/doctype/payroll_entry/payroll_entry.js,This will submit Salary Slips and create accrual Journal Entry. Do you want to proceed?,這將提交工資單，並創建權責發生製日記賬分錄。你想繼續嗎？
 DocType: Purchase Invoice,Total Net Weight,總淨重
 DocType: Purchase Order,Order Confirmation No,訂單確認號
@@ -2858,7 +2858,6 @@
 apps/erpnext/erpnext/accounts/party.py,Billing currency must be equal to either default company's currency or party account currency,帳單貨幣必須等於默認公司的貨幣或帳戶幣種
 DocType: Packing Slip,Indicates that the package is a part of this delivery (Only Draft),表示該包是這個交付的一部分（僅草案）
 apps/erpnext/erpnext/accounts/report/customer_ledger_summary/customer_ledger_summary.py,Closing Balance,結算餘額
-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/controllers/accounts_controller.py,Row {0}: Due Date cannot be before posting date,行{0}：到期日期不能在發布日期之前
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py,Quantity for Item {0} must be less than {1},項目{0}的數量必須小於{1}
 ,Sales Invoice Trends,銷售發票趨勢
@@ -3343,7 +3342,6 @@
 DocType: Stock Settings,Raise Material Request when stock reaches re-order level,當庫存到達需重新訂購水平時提高物料需求
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py,Full-time,全日制
 DocType: Payroll Entry,Employees,僱員
-apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py,Please setup numbering series for Attendance via Setup &gt; Numbering Series,請通過設置&gt;編號系列設置出勤編號系列
 DocType: Question,Single Correct Answer,單一正確答案
 DocType: Employee,Contact Details,聯絡方式
 DocType: C-Form,Received Date,接收日期
@@ -3927,6 +3925,7 @@
 DocType: Pricing Rule,Price or Product Discount,價格或產品折扣
 apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.py,For row {0}: Enter planned qty,對於行{0}：輸入計劃的數量
 DocType: Account,Income Account,收入帳戶
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Customer &gt; Customer Group &gt; Territory,客戶&gt;客戶組&gt;地區
 DocType: Payment Request,Amount in customer's currency,量客戶的貨幣
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js,Delivery,交貨
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.py,Assigning Structures...,分配結構......
@@ -3971,7 +3970,6 @@
 apps/erpnext/erpnext/setup/setup_wizard/operations/install_fixtures.py,Income Tax,所得稅
 DocType: HR Settings,Check Vacancies On Job Offer Creation,檢查創造就業機會的職位空缺
 apps/erpnext/erpnext/utilities/user_progress.py,Go to Letterheads,去信頭
-apps/erpnext/erpnext/education/doctype/instructor/instructor.py,Please setup Instructor Naming System in Education &gt; Education Settings,請在教育&gt;教育設置中設置教師命名系統
 apps/erpnext/erpnext/hr/doctype/employee_promotion/employee_promotion.js,Property already added,已添加屬性
 DocType: Item Supplier,Item Supplier,產品供應商
 apps/erpnext/erpnext/public/js/controllers/transaction.js,Please enter Item Code to get batch no,請輸入產品編號，以取得批號
@@ -4247,6 +4245,7 @@
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.js,Warning: Material Requested Qty is less than Minimum Order Qty,警告：物料需求的數量低於最少訂購量
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py,Account {0} is frozen,帳戶{0}被凍結
 DocType: Quiz Question,Quiz Question,測驗問題
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Supplier &gt; Supplier Type,供應商&gt;供應商類型
 DocType: Company,Legal Entity / Subsidiary with a separate Chart of Accounts belonging to the Organization.,法人/子公司與帳戶的獨立走勢屬於該組織。
 DocType: Payment Request,Mute Email,靜音電子郵件
 apps/erpnext/erpnext/setup/setup_wizard/data/industry_type.py,"Food, Beverage & Tobacco",食品、飲料＆煙草
@@ -4729,7 +4728,6 @@
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py,Cash In Hand,手頭現金
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py,Delivery warehouse required for stock item {0},需要的庫存項目交割倉庫{0}
 DocType: Packing Slip,The gross weight of the package. Usually net weight + packaging material weight. (for print),包裹的總重量。通常為淨重+包裝材料的重量。 （用於列印）
-apps/erpnext/erpnext/hr/doctype/employee/employee.py,Please setup Employee Naming System in Human Resource &gt; HR Settings,請在人力資源&gt;人力資源設置中設置員工命名系統
 DocType: Accounts Settings,Users with this role are allowed to set frozen accounts and create / modify accounting entries against frozen accounts,具有此角色的用戶可以設置凍結帳戶，並新增/修改對凍結帳戶的會計分錄
 ,Project Billing Summary,項目開票摘要
 DocType: Vital Signs,Cuts,削減
@@ -4959,6 +4957,7 @@
 apps/erpnext/erpnext/quality_management/doctype/quality_review/quality_review_list.js,No Action,沒有行動
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js,Valuation type charges can not marked as Inclusive,估值類型罪名不能標記為包容性
 DocType: POS Profile,Update Stock,庫存更新
+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/stock/doctype/packing_slip/packing_slip.js,Different UOM for items will lead to incorrect (Total) Net Weight value. Make sure that Net Weight of each item is in the same UOM.,不同計量單位的項目會導致不正確的（總）淨重值。確保每個項目的淨重是在同一個計量單位。
 DocType: Certification Application,Payment Details,付款詳情
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py,BOM Rate,BOM率
@@ -5058,6 +5057,8 @@
 apps/erpnext/erpnext/accounts/doctype/monthly_distribution/monthly_distribution.py,Percentage Allocation should be equal to 100%,百分比分配總和應該等於100%
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js,Please select Posting Date before selecting Party,在選擇之前，甲方請選擇發布日期
 apps/erpnext/erpnext/config/accounting.py,Payment Terms based on conditions,付款條款基於條件
+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: Program Enrollment,School House,學校議院
 DocType: Serial No,Out of AMC,出資產管理公司
 DocType: Opportunity,Opportunity Amount,機會金額
@@ -5249,6 +5250,7 @@
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py,Order/Quot %,訂單/報價％
 apps/erpnext/erpnext/config/healthcare.py,Record Patient Vitals,記錄患者維生素
 DocType: Fee Schedule,Institution,機構
+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: Asset,Partially Depreciated,部分貶抑
 DocType: Issue,Opening Time,開放時間
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py,From and To dates required,需要起始和到達日期
@@ -5448,6 +5450,7 @@
 DocType: Quality Procedure Process,Link existing Quality Procedure.,鏈接現有的質量程序。
 apps/erpnext/erpnext/config/hr.py,Loans,貸款
 DocType: Healthcare Service Unit,Healthcare Service Unit,醫療服務單位
+,Customer-wise Item Price,客戶明智的物品價格
 apps/erpnext/erpnext/public/js/financial_statements.js,Cash Flow Statement,現金流量表
 apps/erpnext/erpnext/manufacturing/doctype/production_plan/production_plan.py,No material request created,沒有創建重要請求
 apps/erpnext/erpnext/hr/doctype/loan_application/loan_application.py,Loan Amount cannot exceed Maximum Loan Amount of {0},貸款額不能超過最高貸款額度{0}
@@ -5689,6 +5692,7 @@
 apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py,Opening Value,開度值
 DocType: Salary Component,Formula,式
 apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py,Serial #,序列號
+apps/erpnext/erpnext/hr/doctype/employee/employee.py,Please setup Employee Naming System in Human Resource &gt; HR Settings,請在人力資源&gt;人力資源設置中設置員工命名系統
 DocType: Material Request Plan Item,Required Quantity,所需數量
 DocType: Lab Test Template,Lab Test Template,實驗室測試模板
 apps/erpnext/erpnext/accounts/doctype/accounting_period/accounting_period.py,Accounting Period overlaps with {0},會計期間與{0}重疊
@@ -5917,7 +5921,6 @@
 DocType: Request for Quotation Item,Project Name,專案名稱
 apps/erpnext/erpnext/regional/italy/utils.py,Please set the Customer Address,請設置客戶地址
 DocType: Customer,Mention if non-standard receivable account,提到如果不規範應收賬款
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Customer &gt; Customer Group &gt; Territory,客戶&gt;客戶組&gt;地區
 DocType: Bank,Plaid Access Token,格子訪問令牌
 apps/erpnext/erpnext/hr/doctype/employee_benefit_application/employee_benefit_application.py,Please add the remaining benefits {0} to any of the existing component,請將其餘好處{0}添加到任何現有組件
 DocType: Journal Entry Account,If Income or Expense,如果收入或支出
@@ -6158,8 +6161,6 @@
 DocType: Employee Tax Exemption Proof Submission,Tax Exemption Proofs,免稅證明
 apps/erpnext/erpnext/buying/utils.py,Please enter quantity for Item {0},請輸入項目{0}的量
 DocType: Shift Type,First Check-in and Last Check-out,首次入住和最後退房
-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/regional/report/hsn_wise_summary_of_outward_supplies/hsn_wise_summary_of_outward_supplies.py,Total Taxable Amount,應納稅總額
 DocType: Employee External Work History,Employee External Work History,員工對外工作歷史
 apps/erpnext/erpnext/manufacturing/doctype/work_order/work_order.py,Job card {0} created,已創建作業卡{0}
@@ -6193,6 +6194,7 @@
 apps/erpnext/erpnext/accounts/doctype/payment_terms_template/payment_terms_template.py,Combined invoice portion must equal 100%,合併發票部分必須等於100％
 DocType: Item Default,Default Expense Account,預設費用帳戶
 DocType: GST Account,CGST Account,CGST賬戶
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js,Item Code &gt; Item Group &gt; Brand,商品代碼&gt;商品分組&gt;品牌
 apps/erpnext/erpnext/education/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py,Student Email ID,學生的電子郵件ID
 DocType: POS Closing Voucher Invoices,POS Closing Voucher Invoices,POS關閉憑證發票
 DocType: Tax Rule,Sales Tax Template,銷售稅模板
@@ -6787,6 +6789,7 @@
 DocType: Maintenance Visit,Maintenance Date,維修日期
 DocType: Purchase Invoice Item,Rejected Serial No,拒絕序列號
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py,Year start date or end date is overlapping with {0}. To avoid please set company,新年的開始日期或結束日期與{0}重疊。為了避免請將公司
+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/selling/doctype/customer/customer.py,Please mention the Lead Name in Lead {0},請提及潛在客戶名稱{0}
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py,Start date should be less than end date for Item {0},項目{0}的開始日期必須小於結束日期
 DocType: Shift Type,Auto Attendance Settings,自動出勤設置